Author: mtredinnick
Date: 2008-08-29 17:29:38 -0500 (Fri, 29 Aug 2008)
New Revision: 8724

Modified:
   django/trunk/django/db/models/query.py
   django/trunk/tests/regressiontests/queries/models.py
Log:
Fixed a typo from the refactoring in [8455]. With bonus test, too. Thanks, vung.


Modified: django/trunk/django/db/models/query.py
===================================================================
--- django/trunk/django/db/models/query.py      2008-08-29 21:48:40 UTC (rev 
8723)
+++ django/trunk/django/db/models/query.py      2008-08-29 22:29:38 UTC (rev 
8724)
@@ -737,7 +737,7 @@
         self.query.select = []
         field = self.model._meta.get_field(self._field_name, 
many_to_many=False)
         assert isinstance(field, DateField), "%r isn't a DateField." \
-                % field_name
+                % field.name
         self.query.add_date_select(field, self._kind, self._order)
         if field.null:
             self.query.add_filter(('%s__isnull' % field.name, False))

Modified: django/trunk/tests/regressiontests/queries/models.py
===================================================================
--- django/trunk/tests/regressiontests/queries/models.py        2008-08-29 
21:48:40 UTC (rev 8723)
+++ django/trunk/tests/regressiontests/queries/models.py        2008-08-29 
22:29:38 UTC (rev 8724)
@@ -901,6 +901,12 @@
 >>> qs = Item.objects.dates('created', 'month')
 >>> _ = pickle.loads(pickle.dumps(qs))
 
+Bug #8683 -- raise proper error when a DateQuerySet gets passed a wrong type 
of field
+>>> Item.objects.dates('name', 'month')
+Traceback (most recent call last):
+...
+AssertionError: 'name' isn't a DateField.
+
 Bug #8597: regression tests for case-insensitive comparisons
 >>> _ = Item.objects.create(name="a_b", created=datetime.datetime.now(), 
 >>> creator=a2, note=n1)
 >>> _ = Item.objects.create(name="x%y", created=datetime.datetime.now(), 
 >>> creator=a2, note=n1)


--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups 
"Django updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at 
http://groups.google.com/group/django-updates?hl=en
-~----------~----~----~----~------~----~------~--~---

Reply via email to