Ticket #14948: django-1.2-router_related_accessor.patch

django/db/models/base.py

@@ -612 +612 @@
 
         for related in self._meta.get_all_related_many_to_many_objects():
             if related.field.rel.through:
-                db = router.db_for_write(related.field.rel.through.__class__, instance=self)
+                db = router.db_for_write(related.field.rel.through, instance=self)
                 opts = related.field.rel.through._meta
                 reverse_field_name = related.field.m2m_reverse_field_name()
                 nullable = opts.get_field(reverse_field_name).null
@@ -622 +622 @@
 
         for f in self._meta.many_to_many:
             if f.rel.through:
-                db = router.db_for_write(f.rel.through.__class__, instance=self)
+                db = router.db_for_write(f.rel.through, instance=self)
                 opts = f.rel.through._meta
                 field_name = f.m2m_field_name()
                 nullable = opts.get_field(field_name).null

django/db/models/fields/related.py

@@ -553 +553 @@
                         raise TypeError("'%s' instance expected" % self.model._meta.object_name)
                     else:
                         new_ids.add(obj)
-                db = router.db_for_write(self.through.__class__, instance=self.instance)
+                db = router.db_for_write(self.through, instance=self.instance)
                 vals = self.through._default_manager.using(db).values_list(target_field_name, flat=True)
                 vals = vals.filter(**{
                     source_field_name: self._pk_val,
@@ -601 +601 @@
                         instance=self.instance, reverse=self.reverse,
                         model=self.model, pk_set=old_ids)
                 # Remove the specified objects from the join table
-                db = router.db_for_write(self.through.__class__, instance=self.instance)
+                db = router.db_for_write(self.through, instance=self.instance)
                 self.through._default_manager.using(db).filter(**{
                     source_field_name: self._pk_val,
                     '%s__in' % target_field_name: old_ids
@@ -621 +621 @@
                 signals.m2m_changed.send(sender=rel.through, action="pre_clear",
                     instance=self.instance, reverse=self.reverse,
                     model=self.model, pk_set=None)
-            db = router.db_for_write(self.through.__class__, instance=self.instance)
+            db = router.db_for_write(self.through, instance=self.instance)
             self.through._default_manager.using(db).filter(**{
                 source_field_name: self._pk_val
             }).delete()

tests/regressiontests/multiple_database/tests.py

@@ -4 +4 @@
 from StringIO import StringIO
 
 from django.conf import settings
-from django.contrib.auth.models import User
+from django.contrib.auth.models import User, Group
 from django.core import management
 from django.db import connections, router, DEFAULT_DB_ALIAS
 from django.db.utils import ConnectionRouter
@@ -973 +973 @@
     def db_for_write(self, model, **hints):
         return 'writer'
 
+class FaultyRouter(object):
+    # a miss configured router
+    def db_for_write(self, model, **hints):
+        raise AttributeError
+
 class RouterTestCase(TestCase):
     multi_db = True
 
@@ -1575 +1580 @@
         command_output = new_io.getvalue().strip()
         self.assertTrue('"email": "alice@example.com",' in command_output)
 
+    def test_related_accessor(self):
+        "Check that related accessors validate the through model"
+        user = User.objects.create_user('alice', 'alice@example.com')
+        group = Group.objects.create(name='Users')
+        user.groups = [group]
+        self.assertEquals(Group.objects.using('other').filter(user=user).count(), 1)
+
+    def test_faulty_router(self):
+        "Check that a faulty routers exceptions are raised"
+        user = User.objects.create_user('alice', 'alice@example.com')
+        group = Group.objects.create(name='Users')
+        router.routers = [FaultyRouter(), AuthRouter()]
+        self.assertRaises(AttributeError, User.objects.create_user, 'bob', 'bob@example.com')
+        self.assertRaises(AttributeError, setattr, user, 'groups', [group])
+
 _missing = object()
 class UserProfileTestCase(TestCase):
     def setUp(self):