Ticket #9596: dj_date_lookup_c_3.patch

django/db/models/sql/where.py

@@ -160 +160 @@
                 return ('%s IN %s' % (field_sql, extra), params)
             return ('%s IN (%s)' % (field_sql, ', '.join(['%s'] * len(params))),
                     params)
-        elif lookup_type in ('range', 'year'):
+        elif lookup_type in ('range', 'year', 'date'):
             return ('%s BETWEEN %%s and %%s' % field_sql, params)
         elif lookup_type in ('month', 'day'):
             return ('%s = %%s' % connection.ops.date_extract_sql(lookup_type,

django/db/models/sql/constants.py

@@ -4 +4 @@
 QUERY_TERMS = dict([(x, None) for x in (
     'exact', 'iexact', 'contains', 'icontains', 'gt', 'gte', 'lt', 'lte', 'in',
     'startswith', 'istartswith', 'endswith', 'iendswith', 'range', 'year',
-    'month', 'day', 'isnull', 'search', 'regex', 'iregex',
+    'month', 'day', 'isnull', 'search', 'regex', 'iregex', 'date',
     )])
 
 # Size of each "chunk" for get_iterator calls.

django/db/models/fields/__init__.py

@@ -212 +212 @@
             return ["%%%s" % connection.ops.prep_for_like_query(value)]
         elif lookup_type == 'isnull':
             return []
+        elif lookup_type == 'date':
+            return self.get_db_prep_lookup('range', (datetime.datetime.combine(value, datetime.time.min),
+                                                     datetime.datetime.combine(value, datetime.time.max)))
         elif lookup_type == 'year':
             try:
                 value = int(value)

tests/modeltests/lookup/models.py

@@ -383 +383 @@
 [<Article: barfoobaz>, <Article: baz>, <Article: bazbaRFOO>, <Article: foobarbaz>, <Article: foobaz>]
 >>> Article.objects.filter(headline__iregex=r'b.*ar')
 [<Article: bar>, <Article: barfoobaz>, <Article: bazbaRFOO>, <Article: foobar>, <Article: foobarbaz>]
+
+# The __date lookup tests for datetime equality without the time
+>>> for a in Article.objects.all():
+...     a.delete()
+... 
+>>> a17 = Article(pub_date=datetime(2008, 11, 14), headline="a17")
+>>> a17.save()
+>>> a18 = Article(pub_date=datetime(2008, 11, 14, 23, 59, 59), headline="a18")
+>>> a18.save()
+>>> a19 = Article(pub_date=datetime(2008, 11, 15), headline="a19")
+>>> a19.save()
+>>> for i in xrange(4):
+...     print Article.objects.filter(pub_date__date=datetime(2008, 11, (13+i), i))
+... 
+[]
+[<Article: a18>, <Article: a17>]
+[<Article: a19>]
+[]
 """}
 
 

docs/ref/models/querysets.txt

@@ -1156 +1156 @@
 You can use ``range`` anywhere you can use ``BETWEEN`` in SQL -- for dates,
 numbers and even characters.
 
+date
+~~~~
+
+Tests datetime fields for date equality, disregarding time.
+
+Example::
+
+    yesterday = datetime.date.today() - datetime.timedelta(1)
+    Entry.objects.filter(pub_datetime__date = yesterday)
+
+SQL equivalent::
+
+    SELECT ... WHERE pub_datetime BETWEEN '2008-11-12 00:00:00' and '2008-11-12 23:59:59';
+
 year
 ~~~~