mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-08-08 04:48:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fixed #1142 -- Added multiple database support.

Browse source 
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
This commit is contained in:
Russell Keith-Magee 2009-12-22 15:18:51 +00:00
parent 7ef212af14
commit ff60c5f9de
231 changed files with 7860 additions and 5668 deletions
Download patch file Download diff file Expand all files Collapse all files

4
django/db/models/query_utils.py
View file

@ -134,7 +134,7 @@ class QueryWrapper(object):
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):
@ -187,7 +187,7 @@ class DeferredAttribute(object):
cls = self.model_ref()
data = instance.__dict__
if data.get(self.field_name, self) is self:
data[self.field_name] = cls._base_manager.filter(pk=instance.pk).values_list(self.field_name, flat=True).get()
data[self.field_name] = cls._base_manager.filter(pk=instance.pk).values_list(self.field_name, flat=True).using(instance._state.db).get()
return data[self.field_name]
def __set__(self, instance, value):