Author: Alex
Date: 2009-06-18 19:21:38 -0500 (Thu, 18 Jun 2009)
New Revision: 11075
Modified:
django/branches/soc2009/multidb/django/db/models/query_utils.py
django/branches/soc2009/multidb/django/db/models/sql/aggregates.py
django/branches/soc2009/multidb/django/db/models/sql/datastructures.py
django/branches/soc2009/multidb/django/db/models/sql/expressions.py
django/branches/soc2009/multidb/django/db/models/sql/query.py
django/branches/soc2009/multidb/django/db/models/sql/subqueries.py
django/branches/soc2009/multidb/django/db/models/sql/where.py
Log:
[soc2009/multidb] Removed the as_sql_takes_connection option from various
classes, it was originally just to allow the tests to pass while the code base
was being migrated, it was not meant to remain
Modified: django/branches/soc2009/multidb/django/db/models/query_utils.py
===================================================================
--- django/branches/soc2009/multidb/django/db/models/query_utils.py
2009-06-18 23:42:00 UTC (rev 11074)
+++ django/branches/soc2009/multidb/django/db/models/query_utils.py
2009-06-19 00:21:38 UTC (rev 11075)
@@ -132,7 +132,7 @@
def __init__(self, sql, params):
self.data = sql, params
- def as_sql(self, qn=None):
+ def as_sql(self, qn=None, connection=None):
return self.data
class Q(tree.Node):
Modified: django/branches/soc2009/multidb/django/db/models/sql/aggregates.py
===================================================================
--- django/branches/soc2009/multidb/django/db/models/sql/aggregates.py
2009-06-18 23:42:00 UTC (rev 11074)
+++ django/branches/soc2009/multidb/django/db/models/sql/aggregates.py
2009-06-19 00:21:38 UTC (rev 11075)
@@ -21,7 +21,6 @@
is_ordinal = False
is_computed = False
sql_template = '%(function)s(%(field)s)'
- as_sql_takes_connection = True
def __init__(self, col, source=None, is_summary=False, **extra):
"""Instantiate an SQL aggregate
@@ -77,10 +76,7 @@
"Return the aggregate, rendered as SQL."
if hasattr(self.col, 'as_sql'):
- if getattr(self.col, 'as_sql_takes_connection', False):
- field_name = self.col.as_sql(qn, connection)
- else:
- field_name = self.col.as_sql(qn)
+ field_name = self.col.as_sql(qn, connection)
elif isinstance(self.col, (list, tuple)):
field_name = '.'.join([qn(c) for c in self.col])
else:
Modified: django/branches/soc2009/multidb/django/db/models/sql/datastructures.py
===================================================================
--- django/branches/soc2009/multidb/django/db/models/sql/datastructures.py
2009-06-18 23:42:00 UTC (rev 11074)
+++ django/branches/soc2009/multidb/django/db/models/sql/datastructures.py
2009-06-19 00:21:38 UTC (rev 11075)
@@ -29,8 +29,6 @@
"""
Add a date selection column.
"""
- as_sql_takes_connection = True
-
def __init__(self, col, lookup_type):
self.col = col
self.lookup_type = lookup_type
Modified: django/branches/soc2009/multidb/django/db/models/sql/expressions.py
===================================================================
--- django/branches/soc2009/multidb/django/db/models/sql/expressions.py
2009-06-18 23:42:00 UTC (rev 11074)
+++ django/branches/soc2009/multidb/django/db/models/sql/expressions.py
2009-06-19 00:21:38 UTC (rev 11075)
@@ -3,8 +3,6 @@
from django.db.models.sql.constants import LOOKUP_SEP
class SQLEvaluator(object):
- as_sql_takes_connection = True
-
def __init__(self, expression, query, allow_joins=True):
self.expression = expression
self.opts = query.get_meta()
@@ -78,9 +76,6 @@
def evaluate_leaf(self, node, qn, connection):
col = self.cols[node]
if hasattr(col, 'as_sql'):
- if getattr(col, 'as_sql_takes_connection', False):
- return col.as_sql(qn, connection), ()
- else:
- return col.as_sql(qn)
+ return col.as_sql(qn, connection), ()
else:
return '%s.%s' % (qn(col[0]), qn(col[1])), ()
Modified: django/branches/soc2009/multidb/django/db/models/sql/query.py
===================================================================
--- django/branches/soc2009/multidb/django/db/models/sql/query.py
2009-06-18 23:42:00 UTC (rev 11074)
+++ django/branches/soc2009/multidb/django/db/models/sql/query.py
2009-06-19 00:21:38 UTC (rev 11075)
@@ -729,10 +729,7 @@
aliases.add(r)
col_aliases.add(col[1])
else:
- if getattr(col, 'as_sql_takes_connection', False):
- result.append(col.as_sql(qn, self.connection))
- else:
- result.append(col.as_sql(qn))
+ result.append(col.as_sql(qn, self.connection))
if hasattr(col, 'alias'):
aliases.add(col.alias)
Modified: django/branches/soc2009/multidb/django/db/models/sql/subqueries.py
===================================================================
--- django/branches/soc2009/multidb/django/db/models/sql/subqueries.py
2009-06-18 23:42:00 UTC (rev 11074)
+++ django/branches/soc2009/multidb/django/db/models/sql/subqueries.py
2009-06-19 00:21:38 UTC (rev 11075)
@@ -144,10 +144,7 @@
values, update_params = [], []
for name, val, placeholder in self.values:
if hasattr(val, 'as_sql'):
- if getattr(val, 'as_sql_takes_connection', False):
- sql, params = val.as_sql(qn, self.connection)
- else:
- sql, params = val.as_sql(qn)
+ sql, params = val.as_sql(qn, self.connection)
values.append('%s = %s' % (qn(name), sql))
update_params.extend(params)
elif val is not None:
@@ -421,7 +418,6 @@
An AggregateQuery takes another query as a parameter to the FROM
clause and only selects the elements in the provided list.
"""
- as_sql_takes_connection = True
def add_subquery(self, query):
self.subquery, self.sub_params = query.as_sql(with_col_aliases=True)
Modified: django/branches/soc2009/multidb/django/db/models/sql/where.py
===================================================================
--- django/branches/soc2009/multidb/django/db/models/sql/where.py
2009-06-18 23:42:00 UTC (rev 11074)
+++ django/branches/soc2009/multidb/django/db/models/sql/where.py
2009-06-19 00:21:38 UTC (rev 11075)
@@ -32,7 +32,6 @@
relabel_aliases() methods.
"""
default = AND
- as_sql_takes_connection = True
def add(self, data, connector):
"""
@@ -89,10 +88,7 @@
for child in self.children:
try:
if hasattr(child, 'as_sql'):
- if getattr(child, 'as_sql_takes_connection', False):
- sql, params = child.as_sql(qn=qn,
connection=connection)
- else:
- sql, params = child.as_sql(qn=qn)
+ sql, params = child.as_sql(qn=qn, connection=connection)
else:
# A leaf node in the tree.
sql, params = self.make_atom(child, qn, connection)
@@ -152,22 +148,15 @@
field_sql = self.sql_for_columns(lvalue, qn, connection)
else:
# A smart object with an as_sql() method.
- if getattr(lvalue, 'as_sql_takes_connection', False):
- field_sql = lvalue.as_sql(qn, connection)
- else:
- field_sql = lvalue.as_sql(qn)
+ field_sql = lvalue.as_sql(qn, connection)
-
if value_annot is datetime.datetime:
cast_sql = connection.ops.datetime_cast_sql()
else:
cast_sql = '%s'
if hasattr(params, 'as_sql'):
- if getattr(params, 'as_sql_takes_connection', False):
- extra, params = params.as_sql(qn, connection)
- else:
- extra, params = params.as_sql(qn)
+ extra, params = params.as_sql(qn, connection)
cast_sql = ''
else:
extra = ''
@@ -242,7 +231,8 @@
"""
A node that matches everything.
"""
- def as_sql(self, qn=None):
+
+ def as_sql(self, qn=None, connection=None):
raise FullResultSet
def relabel_aliases(self, change_map, node=None):
@@ -252,7 +242,7 @@
"""
A node that matches nothing.
"""
- def as_sql(self, qn=None):
+ def as_sql(self, qn=None, connection=None):
raise EmptyResultSet
def relabel_aliases(self, change_map, node=None):
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to django-updates@googlegroups.com
To unsubscribe from this group, send email to
django-updates+unsubscr...@googlegroups.com
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en
-~----------~----~----~----~------~----~------~--~---
