Ticket #14948: django-1.2-router_related_accessor-2.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

tests/regressiontests/multiple_database/tests.py

@@ -1698 +1698 @@
     def tearDown(self):
         router.routers = self.old_routers
 
-    def test_attribute_error(self):
+    def test_attribute_error_read(self):
         "Check that the AttributeError from AttributeErrorRouter bubbles up"
+        router.routers = []
+        b = Book.objects.create(title="Pro Django",
+                                published=datetime.date(2008, 12, 16))
+        router.routers = [AttributeErrorRouter()]
+        self.assertRaises(AttributeError, Book.objects.get, pk=b.pk)
+
+    def test_attribute_error_save(self):
+        "Check that the AttributeError from AttributeErrorRouter bubbles up"
         dive = Book()
         dive.title="Dive into Python"
         dive.published = datetime.date(2009, 5, 4)
         self.assertRaises(AttributeError, dive.save)
 
+    def test_attribute_error_delete(self):
+        "Check that the AttributeError from AttributeErrorRouter bubbles up"
+        router.routers = []
+        b = Book.objects.create(title="Pro Django",
+                                published=datetime.date(2008, 12, 16))
+        p = Person.objects.create(name="Marty Alchin")
+        b.authors = [p]
+        b.editor = p
+        router.routers = [AttributeErrorRouter()]
+        self.assertRaises(AttributeError, b.delete)
+
+    def test_attribute_error_m2m(self):
+        "Check that the AttributeError from AttributeErrorRouter bubbles up"
+        router.routers = []
+        b = Book.objects.create(title="Pro Django",
+                                published=datetime.date(2008, 12, 16))
+        p = Person.objects.create(name="Marty Alchin")
+        router.routers = [AttributeErrorRouter()]
+        self.assertRaises(AttributeError, setattr, b, 'authors', [p])
+
 class ModelMetaRouter(object):
     "A router to ensure model arguments are real model classes"
     def db_for_write(self, model, **hints):
         if not hasattr(model, '_meta'):
             raise ValueError
 
-class RouterM2MThroughTestCase(TestCase):
+class RouterThroughTestCase(TestCase):
     multi_db = True
 
     def setUp(self):
@@ -1732 +1760 @@
         b.authors.remove(p)
         # test clear
         b.authors.clear()
+        # test setattr
+        b.authors = [p]
+        # test _collect_sub_objects
+        b.delete()
+
+    def test_fk_through(self):
+        person = Person.objects.create(name='Bob')
+        pet = Pet.objects.create(owner=person, name='Wart')
+        # test _collect_sub_objects
+        person.delete()