Ticket #11814: multidb-0.1.patch

django/contrib/gis/db/models/sql/where.py

@@ -78 +78 @@
             annotation = GeoAnnotation(field, value, where)
             return super(WhereNode, self).add(((obj.alias, col, field.db_type()), lookup_type, annotation, params), connector)
 
-    def make_atom(self, child, qn):
+    def make_atom(self, child, qn, connection):
         obj, lookup_type, value_annot, params = child
 
         if isinstance(value_annot, GeoAnnotation):
@@ -94 +94 @@
         else:
             # If not a GeometryField, call the `make_atom` from the 
             # base class.
-            return super(GeoWhereNode, self).make_atom(child, qn)
+            return super(GeoWhereNode, self).make_atom(child, qn, connection)
 
     @classmethod
     def _check_geo_field(cls, opts, lookup):

django/contrib/gis/db/models/sql/query.py

@@ -98 +98 @@
                         aliases.add(r)
                         col_aliases.add(col[1])
                 else:
-                    result.append(col.as_sql(quote_func=qn))
+                    result.append(col.as_sql(qn=qn))
 
                     if hasattr(col, 'alias'):
                         aliases.add(col.alias)
@@ -112 +112 @@
 
         result.extend([
                 '%s%s' % (
-                    self.get_extra_select_format(alias) % aggregate.as_sql(quote_func=qn),
+                    self.get_extra_select_format(alias) % aggregate.as_sql(qn=qn, connection=self.connection),
                     alias is not None and ' AS %s' % alias or ''
                     )
                 for alias, aggregate in self.aggregate_select.items()