Ticket #13315: 13315.2.diff

django/contrib/gis/db/backend/__init__.py

@@ +1 @@
+from django.db import connection
+
+if hasattr(connection.ops, 'spatial_version'):
+    from warnings import warn
+    warn('The `django.contrib.gis.db.backend` module was refactored and '
+         'renamed to `django.contrib.gis.db.backends` in 1.2.  '
+         'All functionality of `SpatialBackend` '
+         'has been moved to the `ops` attribute of the spatial database '
+         'backend.  A `SpatialBackend` alias is provided here for '
+         'backwards-compatibility, but will be removed in 1.3.')
+    SpatialBackend = connection.ops
+

django/contrib/gis/db/backends/spatialite/operations.py

@@ -55 +55 @@
     valid_aggregates = dict([(k, None) for k in ('Extent', 'Union')])
 
     Adapter = SpatiaLiteAdapter
+    Adaptor = Adapter # Backwards-compatibility alias.
 
     area = 'Area'
     centroid = 'Centroid'

django/contrib/gis/db/backends/mysql/operations.py

@@ -13 +13 @@
     from_text = 'GeomFromText'
 
     Adapter = WKTAdapter
+    Adaptor = Adapter # Backwards-compatibility alias.
 
     geometry_functions = {
         'bbcontains' : 'MBRContains', # For consistency w/PostGIS API

django/contrib/gis/db/backends/oracle/operations.py

@@ -75 +75 @@
     valid_aggregates = dict([(a, None) for a in ('Union', 'Extent')])
 
     Adapter = OracleSpatialAdapter
+    Adaptor = Adapter # Backwards-compatibility alias.
 
     area = 'SDO_GEOM.SDO_AREA'
     gml= 'SDO_UTIL.TO_GMLGEOMETRY'

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

@@ -66 +66 @@
                              ('Collect', 'Extent', 'Extent3D', 'MakeLine', 'Union')])
 
     Adapter = PostGISAdapter
+    Adaptor = Adapter # Backwards-compatibility alias.
 
     def __init__(self, connection):
         super(PostGISOperations, self).__init__(connection)

django/contrib/gis/models.py

@@ +1 @@
+from django.db import connection
+
+if (hasattr(connection.ops, 'spatial_version') and
+    not connection.ops.mysql):
+    # Getting the `SpatialRefSys` and `GeometryColumns`
+    # models for the default spatial backend.  These
+    # aliases are provided for backwards-compatibility.
+    SpatialRefSys = connection.ops.spatial_ref_sys()
+    GeometryColumns = connection.ops.geometry_columns()