Author: ccahoon
Date: 2009-06-12 22:28:41 -0500 (Fri, 12 Jun 2009)
New Revision: 10993
Modified:
django/branches/soc2009/http-wsgi-improvements/django/contrib/gis/db/models/sql/where.py
django/branches/soc2009/http-wsgi-improvements/django/contrib/gis/tests/relatedapp/models.py
django/branches/soc2009/http-wsgi-improvements/django/contrib/gis/tests/relatedapp/tests.py
Log:
Fixed #11087 -- Fixed the `Count` annotation when used with `GeoManager`.
Thanks to dgouldin for ticket and initial patch.
Modified:
django/branches/soc2009/http-wsgi-improvements/django/contrib/gis/db/models/sql/where.py
===================================================================
---
django/branches/soc2009/http-wsgi-improvements/django/contrib/gis/db/models/sql/where.py
2009-06-13 03:28:25 UTC (rev 10992)
+++
django/branches/soc2009/http-wsgi-improvements/django/contrib/gis/db/models/sql/where.py
2009-06-13 03:28:41 UTC (rev 10993)
@@ -35,7 +35,7 @@
return super(WhereNode, self).add(data, connector)
obj, lookup_type, value = data
- alias, col, field = obj.alias, obj.col, obj.field
+ col, field = obj.col, obj.field
if not hasattr(field, "geom_type"):
# Not a geographic field, so call `WhereNode.add`.
@@ -76,7 +76,7 @@
# the `get_geo_where_clause` to construct the appropriate
# spatial SQL when `make_atom` is called.
annotation = GeoAnnotation(field, value, where)
- return super(WhereNode, self).add(((alias, col, field.db_type()),
lookup_type, annotation, params), connector)
+ return super(WhereNode, self).add(((obj.alias, col,
field.db_type()), lookup_type, annotation, params), connector)
def make_atom(self, child, qn):
obj, lookup_type, value_annot, params = child
Modified:
django/branches/soc2009/http-wsgi-improvements/django/contrib/gis/tests/relatedapp/models.py
===================================================================
---
django/branches/soc2009/http-wsgi-improvements/django/contrib/gis/tests/relatedapp/models.py
2009-06-13 03:28:25 UTC (rev 10992)
+++
django/branches/soc2009/http-wsgi-improvements/django/contrib/gis/tests/relatedapp/models.py
2009-06-13 03:28:41 UTC (rev 10993)
@@ -32,3 +32,13 @@
border2 = models.PolygonField(srid=2276)
objects = models.GeoManager()
def __unicode__(self): return self.name
+
+# These use the GeoManager but do not have any geographic fields.
+class Author(models.Model):
+ name = models.CharField(max_length=100)
+ objects = models.GeoManager()
+
+class Book(models.Model):
+ title = models.CharField(max_length=100)
+ author = models.ForeignKey(Author, related_name='books')
+ objects = models.GeoManager()
Modified:
django/branches/soc2009/http-wsgi-improvements/django/contrib/gis/tests/relatedapp/tests.py
===================================================================
---
django/branches/soc2009/http-wsgi-improvements/django/contrib/gis/tests/relatedapp/tests.py
2009-06-13 03:28:25 UTC (rev 10992)
+++
django/branches/soc2009/http-wsgi-improvements/django/contrib/gis/tests/relatedapp/tests.py
2009-06-13 03:28:41 UTC (rev 10993)
@@ -1,10 +1,10 @@
import os, unittest
from django.contrib.gis.geos import *
from django.contrib.gis.db.backend import SpatialBackend
-from django.contrib.gis.db.models import F, Extent, Union
+from django.contrib.gis.db.models import Count, Extent, F, Union
from django.contrib.gis.tests.utils import no_mysql, no_oracle, no_spatialite
from django.conf import settings
-from models import City, Location, DirectoryEntry, Parcel
+from models import City, Location, DirectoryEntry, Parcel, Book, Author
cities = (('Aurora', 'TX', -97.516111, 33.058333),
('Roswell', 'NM', -104.528056, 33.387222),
@@ -196,8 +196,8 @@
# ID values do not match their City ID values.
loc1 = Location.objects.create(point='POINT (-95.363151 29.763374)')
loc2 = Location.objects.create(point='POINT (-96.801611 32.782057)')
- dallas = City.objects.create(name='Dallas', location=loc2)
- houston = City.objects.create(name='Houston', location=loc1)
+ dallas = City.objects.create(name='Dallas', state='TX', location=loc2)
+ houston = City.objects.create(name='Houston', state='TX',
location=loc1)
# The expected ID values -- notice the last two location IDs
# are out of order. We want to make sure that the related
@@ -231,6 +231,32 @@
q = pickle.loads(q_str)
self.assertEqual(GeoQuery, q.__class__)
+ def test12_count(self):
+ "Testing `Count` aggregate use with the `GeoManager`. See #11087."
+ # Creating a new City, 'Fort Worth', that uses the same location
+ # as Dallas.
+ dallas = City.objects.get(name='Dallas')
+ ftworth = City.objects.create(name='Fort Worth', state='TX',
location=dallas.location)
+
+ # Count annotation should be 2 for the Dallas location now.
+ loc =
Location.objects.annotate(num_cities=Count('city')).get(id=dallas.location.id)
+ self.assertEqual(2, loc.num_cities)
+
+ # Creating some data for the Book/Author non-geo models that
+ # use GeoManager. See #11087.
+ tp = Author.objects.create(name='Trevor Paglen')
+ Book.objects.create(title='Torture Taxi', author=tp)
+ Book.objects.create(title='I Could Tell You But Then You Would Have to
be Destroyed by Me', author=tp)
+ Book.objects.create(title='Blank Spots on the Map', author=tp)
+ wp = Author.objects.create(name='William Patry')
+ Book.objects.create(title='Patry on Copyright', author=wp)
+
+ # Should only be one author (Trevor Paglen) returned by this query, and
+ # the annotation should have 3 for the number of books.
+ qs =
Author.objects.annotate(num_books=Count('books')).filter(num_books__gt=1)
+ self.assertEqual(1, len(qs))
+ self.assertEqual(3, qs[0].num_books)
+
# TODO: Related tests for KML, GML, and distance lookups.
def suite():
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to django-updates@googlegroups.com
To unsubscribe from this group, send email to
django-updates+unsubscr...@googlegroups.com
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en
-~----------~----~----~----~------~----~------~--~---
