mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-26 07:06:08 +00:00
Code Issues 32 Releases Wiki Activity

[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

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11075 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Alex Gaynor
2009-06-19 00:21:38 +00:00
parent 99fdf66600
commit 64eec4a120
7 changed files with 11 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
django/db/models/sql/query.py
View File

@@ -729,10 +729,7 @@ class BaseQuery(object):
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)