innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Fixed a typo from the refactoring in [8455]. With bonus test, too. Thanks, vung. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@8724 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Malcolm Tredinnick 2008-08-29 22:29:38 +00:00
parent 38362a1276
commit 51836756d0
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/db/models/query.py
View File

@ -737,7 +737,7 @@ class DateQuerySet(QuerySet):
self.query.select = [] self.query.select = []
field = self.model._meta.get_field(self._field_name, many_to_many=False) field = self.model._meta.get_field(self._field_name, many_to_many=False)
assert isinstance(field, DateField), "%r isn't a DateField." \ assert isinstance(field, DateField), "%r isn't a DateField." \
% field_name % field.name
self.query.add_date_select(field, self._kind, self._order) self.query.add_date_select(field, self._kind, self._order)
if field.null: if field.null:
self.query.add_filter(('%s__isnull' % field.name, False)) self.query.add_filter(('%s__isnull' % field.name, False))

6
tests/regressiontests/queries/models.py
View File

@ -901,6 +901,12 @@ Pickling of DateQuerySets used to fail
>>> qs = Item.objects.dates('created', 'month') >>> qs = Item.objects.dates('created', 'month')
>>> _ = pickle.loads(pickle.dumps(qs)) >>> _ = 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 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="a_b", created=datetime.datetime.now(), creator=a2, note=n1)
>>> _ = Item.objects.create(name="x%y", created=datetime.datetime.now(), creator=a2, note=n1) >>> _ = Item.objects.create(name="x%y", created=datetime.datetime.now(), creator=a2, note=n1)