Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Fixed #11087 -- Fixed the `Count` annotation when used with `GeoManag…

…er`. Thanks to dgouldin for ticket and initial patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@10912 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit be907bcdcbea7d95b5adefdcc9fd6c4d8cbfafe0 1 parent 1ed5d8f
Justin Bronn authored June 03, 2009
4  django/contrib/gis/db/models/sql/where.py
@@ -35,7 +35,7 @@ def add(self, data, connector):
35 35
             return super(WhereNode, self).add(data, connector)
36 36
 
37 37
         obj, lookup_type, value = data
38  
-        alias, col, field = obj.alias, obj.col, obj.field
  38
+        col, field = obj.col, obj.field
39 39
 
40 40
         if not hasattr(field, "geom_type"):
41 41
             # Not a geographic field, so call `WhereNode.add`.
@@ -76,7 +76,7 @@ def add(self, data, connector):
76 76
             # the `get_geo_where_clause` to construct the appropriate
77 77
             # spatial SQL when `make_atom` is called.
78 78
             annotation = GeoAnnotation(field, value, where)
79  
-            return super(WhereNode, self).add(((alias, col, field.db_type()), lookup_type, annotation, params), connector)
  79
+            return super(WhereNode, self).add(((obj.alias, col, field.db_type()), lookup_type, annotation, params), connector)
80 80
 
81 81
     def make_atom(self, child, qn):
82 82
         obj, lookup_type, value_annot, params = child
10  django/contrib/gis/tests/relatedapp/models.py
@@ -32,3 +32,13 @@ class Parcel(models.Model):
32 32
     border2 = models.PolygonField(srid=2276)
33 33
     objects = models.GeoManager()
34 34
     def __unicode__(self): return self.name
  35
+
  36
+# These use the GeoManager but do not have any geographic fields.
  37
+class Author(models.Model):
  38
+    name = models.CharField(max_length=100)
  39
+    objects = models.GeoManager()
  40
+
  41
+class Book(models.Model):
  42
+    title = models.CharField(max_length=100)
  43
+    author = models.ForeignKey(Author, related_name='books')
  44
+    objects = models.GeoManager()
34  django/contrib/gis/tests/relatedapp/tests.py
... ...
@@ -1,10 +1,10 @@
1 1
 import os, unittest
2 2
 from django.contrib.gis.geos import *
3 3
 from django.contrib.gis.db.backend import SpatialBackend
4  
-from django.contrib.gis.db.models import F, Extent, Union
  4
+from django.contrib.gis.db.models import Count, Extent, F, Union
5 5
 from django.contrib.gis.tests.utils import no_mysql, no_oracle, no_spatialite
6 6
 from django.conf import settings
7  
-from models import City, Location, DirectoryEntry, Parcel
  7
+from models import City, Location, DirectoryEntry, Parcel, Book, Author
8 8
 
9 9
 cities = (('Aurora', 'TX', -97.516111, 33.058333),
10 10
           ('Roswell', 'NM', -104.528056, 33.387222),
@@ -196,8 +196,8 @@ def test09_pk_relations(self):
196 196
         # ID values do not match their City ID values.
197 197
         loc1 = Location.objects.create(point='POINT (-95.363151 29.763374)')
198 198
         loc2 = Location.objects.create(point='POINT (-96.801611 32.782057)')
199  
-        dallas = City.objects.create(name='Dallas', location=loc2)
200  
-        houston = City.objects.create(name='Houston', location=loc1)
  199
+        dallas = City.objects.create(name='Dallas', state='TX', location=loc2)
  200
+        houston = City.objects.create(name='Houston', state='TX', location=loc1)
201 201
 
202 202
         # The expected ID values -- notice the last two location IDs
203 203
         # are out of order.  We want to make sure that the related
@@ -231,6 +231,32 @@ def test11_geoquery_pickle(self):
231 231
         q = pickle.loads(q_str)
232 232
         self.assertEqual(GeoQuery, q.__class__)
233 233
 
  234
+    def test12_count(self):
  235
+        "Testing `Count` aggregate use with the `GeoManager`. See #11087."
  236
+        # Creating a new City, 'Fort Worth', that uses the same location
  237
+        # as Dallas.
  238
+        dallas = City.objects.get(name='Dallas')
  239
+        ftworth = City.objects.create(name='Fort Worth', state='TX', location=dallas.location)
  240
+        
  241
+        # Count annotation should be 2 for the Dallas location now.
  242
+        loc = Location.objects.annotate(num_cities=Count('city')).get(id=dallas.location.id)
  243
+        self.assertEqual(2, loc.num_cities)
  244
+
  245
+        # Creating some data for the Book/Author non-geo models that
  246
+        # use GeoManager.  See #11087.
  247
+        tp = Author.objects.create(name='Trevor Paglen')
  248
+        Book.objects.create(title='Torture Taxi', author=tp)
  249
+        Book.objects.create(title='I Could Tell You But Then You Would Have to be Destroyed by Me', author=tp)
  250
+        Book.objects.create(title='Blank Spots on the Map', author=tp)
  251
+        wp = Author.objects.create(name='William Patry')
  252
+        Book.objects.create(title='Patry on Copyright', author=wp)
  253
+        
  254
+        # Should only be one author (Trevor Paglen) returned by this query, and
  255
+        # the annotation should have 3 for the number of books.
  256
+        qs = Author.objects.annotate(num_books=Count('books')).filter(num_books__gt=1)
  257
+        self.assertEqual(1, len(qs))
  258
+        self.assertEqual(3, qs[0].num_books)
  259
+
234 260
     # TODO: Related tests for KML, GML, and distance lookups.
235 261
 
236 262
 def suite():

0 notes on commit be907bc

Please sign in to comment.
Something went wrong with that request. Please try again.