1
0
mirror of https://github.com/django/django.git synced 2025-10-25 22:56:12 +00:00

[soc2009/multidb] Updated DateQuery to work correctly with multiple databases

git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@10943 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Alex Gaynor
2009-06-07 23:56:42 +00:00
parent f57bc92842
commit 1653ffb571
5 changed files with 17 additions and 12 deletions

View File

@@ -29,22 +29,20 @@ class Date(object):
"""
Add a date selection column.
"""
def __init__(self, col, lookup_type, date_sql_func):
as_sql_takes_connection = True
def __init__(self, col, lookup_type):
self.col = col
self.lookup_type = lookup_type
self.date_sql_func = date_sql_func
def relabel_aliases(self, change_map):
c = self.col
if isinstance(c, (list, tuple)):
self.col = (change_map.get(c[0], c[0]), c[1])
def as_sql(self, quote_func=None):
if not quote_func:
quote_func = lambda x: x
def as_sql(self, qn, connection):
if isinstance(self.col, (list, tuple)):
col = '%s.%s' % tuple([quote_func(c) for c in self.col])
col = '%s.%s' % tuple([qn(c) for c in self.col])
else:
col = self.col
return self.date_sql_func(self.lookup_type, col)
return connection.ops.date_trunc_sql(self.lookup_type, col)