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

Use date_extract_sql() for DateFields 

Refs #21821
This commit is contained in:
Anssi Kääriäinen 2014-01-20 05:02:29 +02:00
parent b86321e9a4
commit 1c360dbbf5
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
django/db/models/lookups.py
View File

@ -281,12 +281,15 @@ default_lookups['range'] = Range
class DateLookup(BuiltinLookup): class DateLookup(BuiltinLookup):
def process_lhs(self, qn, connection, lhs=None): def process_lhs(self, qn, connection, lhs=None):
from django.db.models import DateTimeField
lhs, params = super(DateLookup, self).process_lhs(qn, connection, lhs) lhs, params = super(DateLookup, self).process_lhs(qn, connection, lhs)
if isinstance(self.lhs.output_type, DateTimeField):
tzname = timezone.get_current_timezone_name() if settings.USE_TZ else None tzname = timezone.get_current_timezone_name() if settings.USE_TZ else None
sql, tz_params = connection.ops.datetime_extract_sql(self.extract_type, lhs, tzname) sql, tz_params = connection.ops.datetime_extract_sql(self.extract_type, lhs, tzname)
return connection.ops.lookup_cast(self.lookup_name) % sql, tz_params return connection.ops.lookup_cast(self.lookup_name) % sql, tz_params
else:
return connection.ops.date_extract_sql(self.lookup_name, lhs), []
def get_rhs_op(self, connection, rhs): def get_rhs_op(self, connection, rhs):
return '= %s' % rhs return '= %s' % rhs