Changeset 7150

Timestamp:

02/23/08 02:36:41 (4 months ago)

Author:

mtredinnick

Message:

Fixed #3689, #5223 -- Fixed "1st of January" comparisons for SQLite without breaking the other backends.

Based on a patch from raminf and tests from Nebojsa Djordjevic.

Files:

• django/trunk/django/db/models/fields/__init__.py (modified) (1 diff)
• django/trunk/tests/regressiontests/datatypes/models.py (modified) (1 diff)

django/trunk/django/db/models/fields/__init__.py

@@ -229 +229 @@
-            except ValueError:
-                raise ValueError("The __year lookup type requires an integer argument")
-
+
+
+
+
+
-        raise TypeError("Field has invalid lookup: %s" % lookup_type)
-

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

@@ -57 +57 @@
->>> d3.consumed_at
-datetime.datetime(2007, 4, 20, 16, 19, 59)
+
+# Year boundary tests (ticket #3689)
+
+>>> d = Donut(name='Date Test 2007', baked_date=datetime.datetime(year=2007, month=12, day=31), consumed_at=datetime.datetime(year=2007, month=12, day=31, hour=23, minute=59, second=59))
+>>> d.save()
+>>> d1 = Donut(name='Date Test 2006', baked_date=datetime.datetime(year=2006, month=1, day=1), consumed_at=datetime.datetime(year=2006, month=1, day=1))
+>>> d1.save()
+
+>>> Donut.objects.filter(baked_date__year=2007)
+[<Donut: Date Test 2007>]
+
+>>> Donut.objects.filter(baked_date__year=2006)
+[<Donut: Date Test 2006>]
+
+>>> Donut.objects.filter(consumed_at__year=2007).order_by('name')
+[<Donut: Apple Fritter>, <Donut: Date Test 2007>]
+
+>>> Donut.objects.filter(consumed_at__year=2006)
+[<Donut: Date Test 2006>]
+
+>>> Donut.objects.filter(consumed_at__year=2005)
+[]
+
+>>> Donut.objects.filter(consumed_at__year=2008)
+[]
+
-"""}