Ticket #13513: collect_sub_objects.patch

db/models/base.py

@@ -544 +544 @@
 
     save_base.alters_data = True
 
-    def _collect_sub_objects(self, seen_objs, parent=None, nullable=False):
+    def _collect_sub_objects(self, seen_objs, using=None, parent=None, nullable=False):
         """
         Recursively populates seen_objs with all objects related to this
         object.
@@ -553 +553 @@
             [(model_class, {pk_val: obj, pk_val: obj, ...}),
              (model_class, {pk_val: obj, pk_val: obj, ...}), ...]
         """
+        using = using or router.db_for_write(self.__class__, instance=self)
+
         pk_val = self._get_pk_val()
         if seen_objs.add(self.__class__, pk_val, self,
                          type(parent), parent, nullable):
@@ -592 +594 @@
                 reverse_field_name = related.field.m2m_reverse_field_name()
                 nullable = opts.get_field(reverse_field_name).null
                 filters = {reverse_field_name: self}
-                for sub_obj in related.field.rel.through._base_manager.filter(**filters):
+                for sub_obj in related.field.rel.through._base_manager.using(using).filter(**filters):
                     sub_obj._collect_sub_objects(seen_objs, self, nullable)
 
         for f in self._meta.many_to_many:
@@ -601 +603 @@
                 field_name = f.m2m_field_name()
                 nullable = opts.get_field(field_name).null
                 filters = {field_name: self}
-                for sub_obj in f.rel.through._base_manager.filter(**filters):
+                for sub_obj in f.rel.through._base_manager.using(using).filter(**filters):
                     sub_obj._collect_sub_objects(seen_objs, self, nullable)
             else:
                 # m2m-ish but with no through table? GenericRelation: cascade delete
@@ -627 +629 @@
 
     def delete(self, using=None):
         using = using or router.db_for_write(self.__class__, instance=self)
-        connection = connections[using]
+
         assert self._get_pk_val() is not None, "%s object can't be deleted because its %s attribute is set to None." % (self._meta.object_name, self._meta.pk.attname)
 
         # Find all the objects than need to be deleted.
         seen_objs = CollectedObjects()
-        self._collect_sub_objects(seen_objs)
+        self._collect_sub_objects(seen_objs, using)
 
         # Actually delete the objects.
         delete_objects(seen_objs, using)