Changeset 7739

Timestamp:

06/25/08 08:38:06 (2 months ago)

Author:

russellm

Message:

Fixed #7155 -- Corrected DateQuerySet? to handle nullable fields. Thanks to fcaprioli@alice.it for the original report and patch, and to Jeremy Dunck for the test case.

Files:

• django/trunk/django/db/models/query.py (modified) (1 diff)
• django/trunk/tests/regressiontests/queries/models.py (modified) (3 diffs)

django/trunk/django/db/models/query.py

@@ -691 +691 @@
-        self.query.add_date_select(self._field.column, self._kind, self._order)
-        if self._field.null:
-Tru
+Fals
-
-    def _clone(self, klass=None, setup=False, **kwargs):

django/trunk/tests/regressiontests/queries/models.py

@@ -46 +46 @@
-    name = models.CharField(max_length=10)
-    created = models.DateTimeField()
+    modified = models.DateTimeField(blank=True, null=True)
-    tags = models.ManyToManyField(Tag, blank=True, null=True)
-    creator = models.ForeignKey(Author)
@@ -175 +176 @@
->>> time3 = datetime.datetime(2007, 12, 20, 22, 25, 0)
->>> time4 = datetime.datetime(2007, 12, 20, 21, 0, 0)
-
+modified=time1, 
->>> i1.save()
->>> i1.tags = [t1, t2]
@@ -627 +628 @@
->>> Item.objects.dates('created', 'day').extra(select={'a': 1})
-[datetime.datetime(2007, 12, 19, 0, 0), datetime.datetime(2007, 12, 20, 0, 0)]
+
+Bug #7155 -- nullable dates
+>>> Item.objects.dates('modified', 'day')
+[datetime.datetime(2007, 12, 19, 0, 0)]
-
-Test that parallel iterators work.