mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-26 15:16:09 +00:00
Code Issues 32 Releases Wiki Activity

Send post_delete signals immediately

Browse Source 
In a normal relational construct, if you're listening for an event
that signals a child was deleted, you dont expect that the parent
was deleted already.

This change ensures that post_delete signals are fired immediately
after objects are deleted in the graph.
This commit is contained in:
David Cramer
2013-01-11 14:12:22 -08:00
parent 4720117a31
commit 272de9eb6b
2 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
django/db/models/deletion.py
View File

@@ -75,17 +75,17 @@ class Collector(object):
self.using = using
# Initially, {model: set([instances])}, later values become lists.
self.data = {}
self.field_updates = {} # {model: {(field, value): set([instances])}}
self.field_updates = {} # {model: {(field, value): set([instances])}}
# fast_deletes is a list of queryset-likes that can be deleted without
# fetching the objects into memory.
self.fast_deletes = []
self.fast_deletes = []
# Tracks deletion-order dependency for databases without transactions
# or ability to defer constraint checks. Only concrete model classes
# should be included, as the dependencies exist only between actual
# database tables; proxy models are represented here by their concrete
# parent.
self.dependencies = {} # {model: set([models])}
self.dependencies = {} # {model: set([models])}
def add(self, objs, source=None, nullable=False, reverse_dependency=False):
"""
@@ -262,6 +262,14 @@ class Collector(object):
self.data = SortedDict([(model, self.data[model])
for model in sorted_models])
def send_post_delete_signals(self, model, instances):
if model._meta.auto_created:
return
for obj in instances:
signals.post_delete.send(
sender=model, instance=obj, using=self.using
)
@force_managed
def delete(self):
# sort instance collections
@@ -300,13 +308,7 @@ class Collector(object):
query = sql.DeleteQuery(model)
pk_list = [obj.pk for obj in instances]
query.delete_batch(pk_list, self.using)
# send post_delete signals
for model, obj in self.instances_with_model():
if not model._meta.auto_created:
signals.post_delete.send(
sender=model, instance=obj, using=self.using
)
self.send_post_delete_signals(model, instances)
# update collected instances
for model, instances_for_fieldvalues in six.iteritems(self.field_updates):