Fixed #12479 -- Pass in connection argument to as_sql in `GeoSQLCom…

…piler.get_columns`. Thanks, jpwatts, for bug report and initial patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@12083 bcc190cf-cafb-0310-a4f2-bffc1f526a37
django · Jan 4, 2010 · 89ded97 · 89ded97
1 parent b9d698e
commit 89ded97
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/django/contrib/gis/db/models/sql/compiler.py b/django/contrib/gis/db/models/sql/compiler.py
@@ -55,8 +55,8 @@ def get_columns(self, with_aliases=False):
                         aliases.add(r)
                         col_aliases.add(col[1])
                 else:
-                    result.append(col.as_sql(qn=qn))
-
+                    result.append(col.as_sql(qn, self.connection))
+                    
                     if hasattr(col, 'alias'):
                         aliases.add(col.alias)
                         col_aliases.add(col.alias)
@@ -70,7 +70,7 @@ def get_columns(self, with_aliases=False):
         max_name_length = self.connection.ops.max_name_length()
         result.extend([
                 '%s%s' % (
-                    self.get_extra_select_format(alias) % aggregate.as_sql(qn=qn, connection=self.connection),
+                    self.get_extra_select_format(alias) % aggregate.as_sql(qn, self.connection),
                     alias is not None
                         and ' AS %s' % qn(truncate_name(alias, max_name_length))
                         or ''