Changeset 9336

Timestamp:

11/05/08 11:51:11 (2 months ago)

Author:

jbronn

Message:

Fixed #9364 -- now uses the appropriate database table for inherited GeometryFields; now uses the SpatialBackend booleans in tests.

Files:

• django/trunk/django/contrib/gis/db/models/query.py (modified) (2 diffs)
• django/trunk/django/contrib/gis/tests/geoapp/models.py (modified) (1 diff)
• django/trunk/django/contrib/gis/tests/geoapp/tests.py (modified) (17 diffs)

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

@@ -606 +606 @@
-        if aggregate: self.query.aggregate = True
-
-
-
+
+
+
-            # If so, it'll have to be added to the select related information
-            # (e.g., if 'location__point' was given as the field name).
@@ -614 +615 @@
-            rel_table, rel_col = self.query.related_select_cols[self.query.related_select_fields.index(geo_field)]
-            return self.query._field_column(geo_field, rel_table)
+        elif not geo_field in opts.local_fields:
+            # This geographic field is inherited from another model, so we have to
+            # use the db table for the _parent_ model instead.
+            tmp_fld, parent_model, direct, m2m = opts.get_field_by_name(geo_field.name)
+            return self.query._field_column(geo_field, parent_model._meta.db_table)
-        else:
-            return self.query._field_column(geo_field)

django/trunk/django/contrib/gis/tests/geoapp/models.py

@@ -17 +17 @@
-    def __unicode__(self): return self.name
-
+# This is an inherited model from City
+class PennsylvaniaCity(City):
+    county = models.CharField(max_length=30)
+    objects = models.GeoManager() # TODO: This should be implicitly inherited.
+
-class State(models.Model):
-    name = models.CharField(max_length=30)

django/trunk/django/contrib/gis/tests/geoapp/tests.py

@@ -1 +1 @@
-import os, unittest
-
+PennsylvaniaCity, 
-from django.contrib.gis import gdal
-from django.contrib.gis.db.backend import SpatialBackend
-from django.contrib.gis.geos import *
-from django.contrib.gis.measure import Distance
-, oracle, postgis
+
-
-# TODO: Some tests depend on the success/failure of previous tests, these should
@@ -18 +18 @@
-        "Testing geographic initial SQL."
-        if DISABLE: return
-
+SpatialBackend.
-            # Oracle doesn't allow strings longer than 4000 characters
-            # in SQL files, and I'm stumped on how to use Oracle BFILE's
@@ -39 +39 @@
-
-        # Oracle cannot handle NULL geometry values w/certain queries.
-
+SpatialBackend.
-        else: n_state = 3
-        self.assertEqual(n_state, State.objects.count())
@@ -148 +148 @@
-        ptown2 = City.objects.gml(precision=9).get(name='Pueblo')
-
-
+SpatialBackend.
-            # No precision parameter for Oracle :-/
-            import re
@@ -168 +168 @@
-        # Asserting the result of the transform operation with the values in
-        #  the pre-transformed points.  Oracle does not have the 3084 SRID.
-
+SpatialBackend.
-            h = City.objects.transform(htown.srid).get(name='Houston')
-            self.assertEqual(3084, h.point.srid)
@@ -215 +215 @@
-        self.assertEqual(7, qs1.count())
-
-
+SpatialBackend.
-            # TODO: Do NULL columns bork queries on PostGIS?  The following
-            # error is encountered:
@@ -232 +232 @@
-        #  and Oklahoma City because 'contained' only checks on the
-        #  _bounding box_ of the Geometries.
-
+SpatialBackend.
-            qs = City.objects.filter(point__contained=texas.mpoly)
-            self.assertEqual(3, qs.count())
@@ -260 +260 @@
-
-        # OK City is contained w/in bounding box of Texas.
-
+SpatialBackend.
-            qs = Country.objects.filter(mpoly__bbcontains=okcity.point)
-            self.assertEqual(1, len(qs))
@@ -273 +273 @@
-
-        # Oracle doesn't have SRID 3084, using 41157.
-
+SpatialBackend.
-            # San Antonio in 'Texas 4205, Southern Zone (1983, meters)' (SRID 41157)
-            # Used the following Oracle SQL to get this value:
@@ -288 +288 @@
-        # `ST_Intersects`, so contains is used instead.
-        nad_pnt = fromstr(nad_wkt, srid=nad_srid)
-
+SpatialBackend.
-            tx = Country.objects.get(mpoly__contains=nad_pnt) 
-        else:
@@ -330 +330 @@
-
-        # Saving another commonwealth w/a NULL geometry.
-
+SpatialBackend.
-            # TODO: Fix saving w/NULL geometry on Oracle.
-            State(name='Northern Mariana Islands', poly=None).save()
@@ -399 +399 @@
-
-        # Relate works differently for the different backends.
-
+SpatialBackend.
-            contains_mask = 'T*T***FF*'
-            within_mask = 'T*F**F***'
-            intersects_mask = 'T********'
-
+SpatialBackend.
-            contains_mask = 'contains'
-            within_mask = 'inside'
@@ -418 +418 @@
-
-        # Testing intersection relation mask.
-
+SpatialBackend.
-            self.assertEqual('Texas', Country.objects.get(mpoly__relate=(pnt1, intersects_mask)).name)
-            self.assertEqual('Texas', Country.objects.get(mpoly__relate=(pnt2, intersects_mask)).name)
@@ -480 +480 @@
-        if DISABLE: return
-        qs = State.objects.exclude(poly__isnull=True).centroid()
-
+SpatialBackend.
-        else: tol = 0.000000001
-        for s in qs:
@@ -537 +537 @@
-            # Oracle will return 1 for the number of geometries on non-collections,
-            # whereas PostGIS will return None.
-
+SpatialBackend.
-            else: self.assertEqual(1, c.num_geom)
-
@@ -544 +544 @@
-        if DISABLE: return
-        for c in Country.objects.num_points(): self.assertEqual(c.mpoly.num_points, c.num_points)
-
+SpatialBackend.
-            # Oracle cannot count vertices in Point geometries.
-            for c in City.objects.num_points(): self.assertEqual(1, c.num_points)
@@ -558 +558 @@
-            self.assertEqual(c.mpoly.sym_difference(geom), c.sym_difference)
-            self.assertEqual(c.mpoly.union(geom), c.union)
+
+    def test26_inherited_geofields(self):
+        "Test GeoQuerySet methods on inherited Geometry fields."
+        # Creating a Pennsylvanian city.
+        mansfield = PennsylvaniaCity.objects.create(name='Mansfield', county='Tioga', point='POINT(-77.071445 41.823881)')
+
+        # All transformation SQL will need to be performed on the
+        # _parent_ table.
+        qs = PennsylvaniaCity.objects.transform(32128)
+        
+        self.assertEqual(1, qs.count())
+        for pc in qs: self.assertEqual(32128, pc.point.srid)
-
-from test_feeds import GeoFeedTest