Ticket #12587: related_multiple_db.diff

usr/local/django-trunk/django/db/models/fields/related.py

@@ -197 +197 @@
             return getattr(instance, self.cache_name)
         except AttributeError:
             params = {'%s__pk' % self.related.field.name: instance._get_pk_val()}
-            rel_obj = self.related.model._base_manager.using(instance._state.db).get(**params)
+            #rel_obj = self.related.model._base_manager.using(instance._state.db).get(**params)
+            rel_obj = self.related.model._base_manager.using(self.related.model._default_manager.db).get(**params)
             setattr(instance, self.cache_name, rel_obj)
             return rel_obj
 
@@ -260 +261 @@
             # If the related manager indicates that it should be used for
             # related fields, respect that.
             rel_mgr = self.field.rel.to._default_manager
-            using = instance._state.db or DEFAULT_DB_ALIAS
+            #using = instance._state.db or DEFAULT_DB_ALIAS
+            using = rel_mgr.db or DEFAULT_DB_ALIAS
             if getattr(rel_mgr, 'use_for_related_fields', False):
                 rel_obj = rel_mgr.using(using).get(**params)
             else: