Changeset 7699

Timestamp:

06/19/08 01:00:13 (5 months ago)

Author:

jbronn

Message:

gis: Fixed spatial aggregates when an ordering was specified (thanks ingenieroariel); added bboverlaps to MySQL lookup types for API consistency.

Files:

• django/branches/gis/django/contrib/gis/db/backend/mysql/query.py (modified) (1 diff)
• django/branches/gis/django/contrib/gis/db/models/query.py (modified) (2 diffs)
• django/branches/gis/django/contrib/gis/db/models/sql/query.py (modified) (1 diff)
• django/branches/gis/django/contrib/gis/tests/geoapp/tests.py (modified) (1 diff)

django/branches/gis/django/contrib/gis/db/backend/mysql/query.py

@@ -20 +20 @@
-MYSQL_GIS_FUNCTIONS = {
-    'bbcontains' : 'MBRContains', # For consistency w/PostGIS API
-
+
+
-    'contains' : 'MBRContains',
-    'disjoint' : 'MBRDisjoint',

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

@@ -602 +602 @@
-        ForeignKey relation to the current model.
-        """
+        # If this is an aggregate spatial query, the flag needs to be
+        # set on the `GeoQuery` object of this queryset.
+        if aggregate: self.query.aggregate = True
+
-        # Is this operation going to be on a related geographic field?
-        if not geo_field in self.model._meta.fields:
@@ -608 +612 @@
-            self.query.add_select_related([field_name])
-            self.query.pre_sql_setup()
-            # Can't non-aggregate and aggregate selections together.
-            if aggregate: self.query.aggregate = True 
-            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)

django/branches/gis/django/contrib/gis/db/models/sql/query.py

@@ -148 +148 @@
-        return result, aliases
-
+    def get_ordering(self):
+        """
+        This routine is overridden to disable ordering for aggregate
+        spatial queries.
+        """
+        if not self.aggregate:
+            return super(GeoQuery, self).get_ordering()
+        else:
+            return ()
+
-    def resolve_columns(self, row, fields=()):
-        """

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

@@ -432 +432 @@
-        qs = City.objects.filter(point__within=tx)
-        self.assertRaises(TypeError, qs.unionagg, 'name')
-
-
+
+
+
+
+
-        tol = 0.00001
-        if SpatialBackend.oracle: