Ticket #14060: 14060.1.diff

django/contrib/gis/db/models/fields.py

@@ -94 +94 @@
         # Is this a geography rather than a geometry column?
         self.geography = geography
 
-        # Oracle-specific private attributes for creating the entrie in
+        # Oracle-specific private attributes for creating the entry in
         # `USER_SDO_GEOM_METADATA`
         self._extent = kwargs.pop('extent', (-180.0, -90.0, 180.0, 90.0))
         self._tolerance = kwargs.pop('tolerance', 0.05)
@@ -237 +237 @@
             elif isinstance(value, SQLEvaluator):
                 params = []
             else:
-                params = [connection.ops.Adapter(value)]
+                params = [connection.ops.Adapter(value, geography=self.geography)]
 
             return params
         else:

django/contrib/gis/db/backends/adapter.py

@@ -3 +3 @@
     This provides an adaptor for Geometries sent to the
     MySQL and Oracle database backends.
     """
-    def __init__(self, geom):
+    def __init__(self, geom, **kwargs):
         self.wkt = geom.wkt
         self.srid = geom.srid
 

django/contrib/gis/db/backends/postgis/adapter.py

@@ -6 +6 @@
 from psycopg2.extensions import ISQLQuote
 
 class PostGISAdapter(object):
-    def __init__(self, geom):
+    def __init__(self, geom, geography=False, **kwargs):
         "Initializes on the geometry."
         # Getting the WKB (in string form, to allow easy pickling of
         # the adaptor) and the SRID from the geometry.
         self.ewkb = str(geom.ewkb)
         self.srid = geom.srid
+        self.geography = geography
 
     def __conform__(self, proto):
         # Does the given protocol conform to what Psycopg2 expects?
@@ -29 +30 @@
     def getquoted(self):
         "Returns a properly quoted string for use in PostgreSQL/PostGIS."
         # Want to use WKB, so wrap with psycopg2 Binary() to quote properly.
-        return 'ST_GeomFromEWKB(E%s)' % Binary(self.ewkb)
+        if self.geography:
+            return 'ST_GeogFromWKB(E%s)' % Binary(self.ewkb)
+        else:
+            return 'ST_GeomFromEWKB(E%s)' % Binary(self.ewkb)
 
     def prepare_database_save(self, unused):
         return self

django/contrib/gis/tests/geogapp/tests.py

@@ -72 +72 @@
             self.assertEqual(num_poly, len(c.mpoly))
             self.assertEqual(name, c.name)
             self.assertEqual(state, c.state)
+
+    def test06_geography_adapter(self):
+        # Try to get Victoria by equivalence comparison.
+        c = City.objects.get(point="POINT (-123.305196 48.462611)")