[soc2009/multidb] Correct the handling of raw and defered fields with multi-db.

git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11926 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 6 insertions, 2 deletions

diff --git a/django/db/models/query.py b/django/db/models/query.py
index f67e9fb288..73b514c13a 100644
--- a/django/db/models/query.py
+++ b/django/db/models/query.py
@@ -1154,9 +1154,11 @@ class RawQuerySet(object):
     Provides an iterator which converts the results of raw SQL queries into
     annotated model instances.
     """
-    def __init__(self, query, model=None, query_obj=None, params=None, translations=None):
+    def __init__(self, query, model=None, query_obj=None, params=None,
+        translations=None, using=None):
         self.model = model
-        self.query = query_obj or sql.RawQuery(sql=query, connection=connection, params=params)
+        self.using = using
+        self.query = query_obj or sql.RawQuery(sql=query, connection=connections[using], params=params)
         self.params = params or ()
         self.translations = translations or {}
 
@@ -1230,6 +1232,8 @@ class RawQuerySet(object):
 
         for field, value in annotations:
             setattr(instance, field, value)
+        
+        instance._state.db = self.using
 
         return instance