summaryrefslogtreecommitdiff
path: root/django/db/models/query.py
diff options
context:
space:
mode:
authorRussell Keith-Magee <russell@keith-magee.com>2010-03-15 13:15:01 +0000
committerRussell Keith-Magee <russell@keith-magee.com>2010-03-15 13:15:01 +0000
commit2d57300f5298c0dc88789fb24922f423e34e9149 (patch)
tree81f4a4f794ee6c68cff1817a4e2faf7543b6ee38 /django/db/models/query.py
parentd8c9d21c33ce08f7e90e5996d4da9d8d25d5f8c4 (diff)
Fixed #12953 -- Ensure that deletion cascades through generic relations. Also cleans up the special-casing of generic relations in the deleted object discovery process. Thanks to carljm for the report and patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12790 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/db/models/query.py')
-rw-r--r--django/db/models/query.py2
1 files changed, 0 insertions, 2 deletions
diff --git a/django/db/models/query.py b/django/db/models/query.py
index 5c7d08fb39..f6b4419d27 100644
--- a/django/db/models/query.py
+++ b/django/db/models/query.py
@@ -1278,8 +1278,6 @@ def delete_objects(seen_objs, using):
signals.pre_delete.send(sender=cls, instance=instance)
pk_list = [pk for pk,instance in items]
- del_query = sql.DeleteQuery(cls)
- del_query.delete_batch_related(pk_list, using=using)
update_query = sql.UpdateQuery(cls)
for field, model in cls._meta.get_fields_with_model():