Changeset 7512 for django/branches/gis/django/contrib/gis/db/backend/__init__.py

Timestamp:

05/01/08 13:17:50 (8 months ago)

Author:

jbronn

Message:

gis: Fixed #7126 (with tests); moved GeoQuery and GeoWhereNode into sql submodule; the GeoQuerySet.transform may now be used on geometry fields related via foreign key.

Files:

• django/branches/gis/django/contrib/gis/db/backend/__init__.py (modified) (3 diffs)

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

@@ -3 +3 @@
-
- Specifically, this module will import the correct routines and modules
-
+ to interface with the spatial database
- 
+ Some of the more important classes and routines from the spatial backend
+ include:
+
- (1) `GeoBackEndField`, a base class needed for GeometryField.
-
-
+
+
+
-     spatial backend.
-"""
-from django.conf import settings
-from django.db.models.sql.query import QUERY_TERMS
-from django.db.models.sql.where import WhereNode
-from django.contrib.gis.db.backend.util import gqn
-
@@ -62 +65 @@
-    raise NotImplementedError('No Geographic Backend exists for %s' % settings.DATABASE_ENGINE)
-
-class GeoWhereNode(WhereNode):
-    """
-    The GeoWhereNode calls the `get_geo_where_clause` from the appropriate
-    spatial backend in order to construct correct spatial SQL.
-    """
-    def make_atom(self, child, qn):
-        table_alias, name, field, lookup_type, value = child
-        if hasattr(field, '_geom'):
-            if lookup_type in GIS_TERMS:
-                # Getting the geographic where clause; substitution parameters
-                # will be populated in the GeoFieldSQL object returned by the
-                # GeometryField.
-                gwc = get_geo_where_clause(lookup_type, table_alias, field, value)
-                where, params = field.get_db_prep_lookup(lookup_type, value)
-                return gwc % tuple(where), params
-            else:
-                raise TypeError('Invalid lookup type: %r' % lookup_type)
-        else:
-            # If not a GeometryField, call the `make_atom` from the 
-            # base class.
-            return super(GeoWhereNode, self).make_atom(child, qn)
-
-class SpatialBackend(object):
-    "A container for properties of the SpatialBackend."
@@ -107 +88 @@
-    limited_where = LIMITED_WHERE
-
+    # Shortcut booleans.
+    mysql = SPATIAL_BACKEND == 'mysql'
+    oracle = SPATIAL_BACKEND == 'oracle'
+    postgis = SPATIAL_BACKEND == 'postgis'
+
-    # Class for the backend field.
-    Field = GeoBackendField