summaryrefslogtreecommitdiff
path: root/django/db/models/sql/datastructures.py
diff options
context:
space:
mode:
authorRussell Keith-Magee <russell@keith-magee.com>2009-12-22 15:18:51 +0000
committerRussell Keith-Magee <russell@keith-magee.com>2009-12-22 15:18:51 +0000
commitff60c5f9de3e8690d1e86f3e9e3f7248a15397c8 (patch)
treea4cb0ebdd55fcaf8c8855231b6ad3e1a7bf45bee /django/db/models/sql/datastructures.py
parent7ef212af149540aa2da577a960d0d87029fd1514 (diff)
Fixed #1142 -- Added multiple database support.
This monster of a patch is the result of Alex Gaynor's 2009 Google Summer of Code project. Congratulations to Alex for a job well done. Big thanks also go to: * Justin Bronn for keeping GIS in line with the changes, * Karen Tracey and Jani Tiainen for their help testing Oracle support * Brett Hoerner, Jon Loyens, and Craig Kimmerer for their feedback. * Malcolm Treddinick for his guidance during the GSoC submission process. * Simon Willison for driving the original design process * Cal Henderson for complaining about ponies he wanted. ... and everyone else too numerous to mention that helped to bring this feature into fruition. git-svn-id: http://code.djangoproject.com/svn/django/trunk@11952 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/db/models/sql/datastructures.py')
-rw-r--r--django/db/models/sql/datastructures.py12
1 files changed, 4 insertions, 8 deletions
diff --git a/django/db/models/sql/datastructures.py b/django/db/models/sql/datastructures.py
index 4d53999c79..92d64e15dd 100644
--- a/django/db/models/sql/datastructures.py
+++ b/django/db/models/sql/datastructures.py
@@ -29,22 +29,18 @@ class Date(object):
"""
Add a date selection column.
"""
- def __init__(self, col, lookup_type, date_sql_func):
+ 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)