Ticket #13432: one_to_one_multidb.diff

django/db/models/fields/related.py

@@ -222 +222 @@
             return getattr(instance, self.cache_name)
         except AttributeError:
             params = {'%s__pk' % self.related.field.name: instance._get_pk_val()}
-            db = router.db_for_read(instance.__class__, instance=instance)
+            db = router.db_for_read(self.related.model, instance=instance)
             rel_obj = self.related.model._base_manager.using(db).get(**params)
             setattr(instance, self.cache_name, rel_obj)
             return rel_obj

tests/regressiontests/multiple_database/tests.py

@@ -1310 +1310 @@
         management.call_command('dumpdata', 'auth', format='json', database='other')
         self.assertTrue('alice@example.com' in self.stdout.getvalue())
 
+class OneToOneProfileRouter(object):
+    def db_for_read(self, model, **hints):
+        return self._db_for_model(model)
+
+    def db_for_write(self, model, **hints):
+        return self._db_for_model(model)
+
+    def allow_syncdb(self, db, model):
+        return db == self._db_for_model(model)
+
+    def _db_for_model(self, model):
+        if model == UserProfile:
+            return 'other'
+        else:
+            return 'default'
+
+class OneToOneMultiDBTestCase(TestCase):
+    multi_db = True
+
+    def setUp(self):
+        self.old_routers = router.routers
+        router.routers = [OneToOneProfileRouter()]
+
+    def tearDown(self):
+        router.routers = self.old_routers
+
+    def test_one_to_one_multidb(self):
+        alice = User.objects.create_user('alice', 'alice@example.com')
+        alice_profile, created = UserProfile.objects.get_or_create(user=alice, flavor='chocolate')
+        alice = User.objects.get(username='alice')
+        try:
+            alice.userprofile
+        except UserProfile.DoesNotExist:
+            self.fail("alice's userprofile should be found on the 'other' database")
+
 class UserProfileTestCase(TestCase):
     def setUp(self):
         self.old_auth_profile_module = getattr(settings, 'AUTH_PROFILE_MODULE', None)