Ticket #5390: related_manager.2.diff

db/models/signals.py

@@ -10 +10 @@
-post_delete = object()
-
-post_syncdb = object()
+
+m2m_add_items = object()
+
+m2m_remove_items = object()
+
+m2m_clear_items = object()

db/models/fields/related.py

@@ -2 +2 @@
-from django.db.models import signals, get_model
-from django.db.models.fields import AutoField, Field, IntegerField, PositiveIntegerField, PositiveSmallIntegerField, get_ul_class
-from django.db.models.related import RelatedObject
+from django.db.models import signals
+from django.dispatch import dispatcher
-from django.utils.text import capfirst
-from django.utils.translation import ugettext_lazy, string_concat, ungettext, ugettext as _
-from django.utils.functional import curry
@@ -339 +341 @@
-                existing_ids = set([row[0] for row in cursor.fetchall()])
-
-                # Add the ones that aren't there already
-
+
+
-                    cursor.execute("INSERT INTO %s (%s, %s) VALUES (%%s, %%s)" % \
-                        (self.join_table, source_col_name, target_col_name),
-                        [self._pk_val, obj_id])
+                        
+                added_objs = [obj for obj in objs if (isinstance(obj, self.model) and obj._get_pk_val() in new_ids) or obj in new_ids]
+                dispatcher.send(signal=signals.m2m_add_items, sender=self.model, added=added_objs,
+                    source_col_name=source_col_name, target_col_name=target_col_name, instance=self.instance)
+                        
-                transaction.commit_unless_managed()
-
-        def _remove_items(self, source_col_name, target_col_name, *objs):
@@ -365 +373 @@
-                    (self.join_table, source_col_name,
-                    target_col_name, ",".join(['%s'] * len(old_ids))),
-                    [self._pk_val] + list(old_ids))
+                dispatcher.send(signal=signals.m2m_remove_items, sender=self.model, added=objs,
+                    source_col_name=source_col_name, target_col_name=target_col_name, instance=self.instance)
-                transaction.commit_unless_managed()
-
-        def _clear_items(self, source_col_name):
@@ -373 +383 @@
-            cursor.execute("DELETE FROM %s WHERE %s = %%s" % \
-                (self.join_table, source_col_name),
-                [self._pk_val])
+            dispatcher.send(signal=signals.m2m_clear_items, sender=self.model,
+                source_col_name=source_col_name, instance=self.instance)
-            transaction.commit_unless_managed()
-
-    return ManyRelatedManager