Ticket #11741: django-gis.diff

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

@@ -87 +87 @@
                 # will be populated in the GeoFieldSQL object returned by the
                 # GeometryField.
                 alias, col, db_type = obj
-                gwc = get_geo_where_clause(alias, col, lookup_type, value_annot)
+                gwc = get_geo_where_clause(alias, col, lookup_type, value_annot, qn)
                 return gwc % value_annot.where, params
             else:
                 raise TypeError('Invalid lookup type: %r' % lookup_type)

django/contrib/gis/db/backend/postgis/query.py

@@ -10 +10 @@
 from django.contrib.gis.measure import Distance
 from django.contrib.gis.db.backend.util import SpatialOperation, SpatialFunction
 
-qn = connection.ops.quote_name
-
 # Get the PostGIS version information.
 # To avoid the need to do a database query to determine the PostGIS version
 # each time the server starts up, one can optionally specify a
@@ -250 +248 @@
     else: return exactly_two(val)
 
 #### The `get_geo_where_clause` function for PostGIS. ####
-def get_geo_where_clause(table_alias, name, lookup_type, geo_annot):
+def get_geo_where_clause(table_alias, name, lookup_type, geo_annot, qn=connection.ops.quote_name):
     "Returns the SQL WHERE clause for use in PostGIS SQL construction."
     # Getting the quoted field as `geo_col`.
     geo_col = '%s.%s' % (qn(table_alias), qn(name))