From aeb7639951944c3a4cceb1d9598fa19dc8aaa5ea Mon Sep 17 00:00:00 2001 From: Justin Bronn Date: Mon, 18 Aug 2008 02:59:25 +0000 Subject: [PATCH] Fixed `GeoQuery.get_columns()` to be compatible with the changes in r8426. git-svn-id: http://code.djangoproject.com/svn/django/trunk@8431 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/contrib/gis/db/models/sql/query.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/django/contrib/gis/db/models/sql/query.py b/django/contrib/gis/db/models/sql/query.py index b4892e3c15..f3e9fb25ca 100644 --- a/django/contrib/gis/db/models/sql/query.py +++ b/django/contrib/gis/db/models/sql/query.py @@ -55,7 +55,7 @@ class GeoQuery(sql.Query): """ qn = self.quote_name_unless_alias qn2 = self.connection.ops.quote_name - result = ['(%s) AS %s' % (self.get_extra_select_format(alias) % col, qn2(alias)) + result = ['(%s) AS %s' % (self.get_extra_select_format(alias) % col[0], qn2(alias)) for alias, col in self.extra_select.iteritems()] aliases = set(self.extra_select.keys()) if with_aliases: