Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed #13309 -- Ensure that delete() deletes everything it should del…

…ete(). Thanks to craig.kimerer@gmail.com for the report.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@12941 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 040c18b17e854459c9eff39a4dbbacf6b5460f31 1 parent 7b47609
@freakboy3742 freakboy3742 authored
View
3  django/db/models/query.py
@@ -429,13 +429,14 @@ def delete(self):
# Delete objects in chunks to prevent the list of related objects from
# becoming too long.
seen_objs = None
+ del_itr = iter(del_query)
while 1:
# Collect a chunk of objects to be deleted, and then all the
# objects that are related to the objects that are to be deleted.
# The chunking *isn't* done by slicing the del_query because we
# need to maintain the query cache on del_query (see #12328)
seen_objs = CollectedObjects(seen_objs)
- for i, obj in izip(xrange(CHUNK_SIZE), del_query):
+ for i, obj in izip(xrange(CHUNK_SIZE), del_itr):
obj._collect_sub_objects(seen_objs)
if not seen_objs:
View
8 tests/regressiontests/delete_regress/tests.py
@@ -106,3 +106,11 @@ def test_fk_to_m2m_through(self):
self.assertEquals(PlayedWith.objects.count(), 0)
# first two asserts just sanity checks, this is the kicker:
self.assertEquals(PlayedWithNote.objects.count(), 0)
+
+class LargeDeleteTests(TestCase):
+ def test_large_deletes(self):
+ "Regression for #13309 -- if the number of objects > chunk size, deletion still occurs"
+ for x in range(300):
+ track = Book.objects.create(pagecount=x+100)
+ Book.objects.all().delete()
+ self.assertEquals(Book.objects.count(), 0)
Please sign in to comment.
Something went wrong with that request. Please try again.