Ticket #12086: 12086.patch

django/contrib/sessions/tests.py

@@ -51 +51 @@
 # Submitting an invalid session key (either by guessing, or if the db has
 # removed the key) results in a new key being generated.
 >>> Session.objects.filter(pk=db_session.session_key).delete()
+1
 >>> db_session = DatabaseSession(db_session.session_key)
 >>> db_session.save()
 >>> DatabaseSession('1').get('cat')
@@ -126 +127 @@
 True
 
 >>> Session.objects.filter(pk=file_session.session_key).delete()
+0
 >>> file_session = FileSession(file_session.session_key)
 >>> file_session.save()
 
@@ -189 +191 @@
 True
 
 >>> Session.objects.filter(pk=cache_session.session_key).delete()
+0
 >>> cache_session = CacheSession(cache_session.session_key)
 >>> cache_session.save()
 >>> cache_session.delete(cache_session.session_key)

django/db/models/query.py

@@ -428 +428 @@
         # Delete objects in chunks to prevent the list of related objects from
         # becoming too long.
         seen_objs = None
+        count = 0
         while 1:
             # Collect all the objects to be deleted in this chunk, and all the
             # objects that are related to the objects that are to be deleted.
             seen_objs = CollectedObjects(seen_objs)
             for object in del_query[:CHUNK_SIZE]:
                 object._collect_sub_objects(seen_objs)
+                count += 1
 
             if not seen_objs:
                 break
@@ -441 +443 @@
 
         # Clear the result cache, in case this QuerySet gets reused.
         self._result_cache = None
+        return count
     delete.alters_data = True
 
     def update(self, **kwargs):

docs/topics/db/queries.txt

@@ -729 +729 @@
     e.delete()
 
 You can also delete objects in bulk. Every ``QuerySet`` has a ``delete()``
-method, which deletes all members of that ``QuerySet``.
+method, which deletes all members of that ``QuerySet`` and returns the number of
+items deleted.
 
 For example, this deletes all ``Entry`` objects with a ``pub_date`` year of
 2005::
 
-    Entry.objects.filter(pub_date__year=2005).delete()
+    >>> Entry.objects.filter(pub_date__year=2005).delete()
+    42
 
 Keep in mind that this will, whenever possible, be executed purely in
 SQL, and so the ``delete()`` methods of individual object instances

tests/modeltests/basic/models.py

@@ -365 +365 @@
 >>> Article.objects.all()
 [<Article: Area woman programs in Python>, <Article: Second article>, <Article: Third article>, <Article: Article 6>, <Article: Default headline>, <Article: Fourth article>, <Article: Article 7>, <Article: Updated article 8>]
 >>> Article.objects.filter(id__lte=4).delete()
+4
 >>> Article.objects.all()
 [<Article: Article 6>, <Article: Default headline>, <Article: Article 7>, <Article: Updated article 8>]
 """}

tests/modeltests/generic_relations/models.py

@@ -167 +167 @@
 [(u'clearish', <ContentType: mineral>, 1), (u'fatty', <ContentType: animal>, 1), (u'salty', <ContentType: vegetable>, 2), (u'shiny', <ContentType: animal>, 1)]
 
 >>> TaggedItem.objects.filter(tag='fatty').delete()
-
+1
 >>> ctype = ContentType.objects.get_for_model(lion)
 >>> Animal.objects.filter(tags__content_type=ctype)
 [<Animal: Platypus>]
@@ -197 +197 @@
 # Filtering and deleting works
 >>> subjective = ["cooler"]
 >>> tiger.comparisons.filter(comparative__in=subjective).delete()
+2
 >>> Comparison.objects.all()
 [<Comparison: cheetah is faster than tiger>, <Comparison: tiger is stronger than cheetah>]
 

tests/modeltests/many_to_many/models.py

@@ -243 +243 @@
 
 # Bulk delete some Publications - references to deleted publications should go
 >>> Publication.objects.filter(title__startswith='Science').delete()
+2
 >>> Publication.objects.all()
 [<Publication: Highlights for Children>, <Publication: The Python Journal>]
 >>> Article.objects.all()
@@ -255 +256 @@
 >>> print q
 [<Article: Django lets you build Web apps easily>]
 >>> q.delete()
+1
 
 # After the delete, the QuerySet cache needs to be cleared, and the referenced objects should be gone
 >>> print q

tests/modeltests/many_to_one/models.py

@@ -292 +292 @@
 
 # You can delete using a JOIN in the query.
 >>> Reporter.objects.filter(article__headline__startswith='This').delete()
+3
 >>> Reporter.objects.all()
 []
 >>> Article.objects.all()

tests/modeltests/proxy_models/models.py

@@ -264 +264 @@
 # Manager tests.
 
 >>> Person.objects.all().delete()
+5
 >>> _ = Person.objects.create(name="fred")
 >>> _ = Person.objects.create(name="wilma")
 >>> _ = Person.objects.create(name="barney")

tests/regressiontests/custom_managers_regress/models.py

@@ -56 +56 @@
 Deleting related objects should also not be distracted by a restricted manager
 on the related object. This is a regression test for #2698.
 >>> RestrictedModel.plain_manager.all().delete()
+1
 >>> for name, public in (('one', True), ('two', False), ('three', False)):
 ...     _ = RestrictedModel.objects.create(name=name, is_public=public, related=related)
 

tests/regressiontests/m2m_through_regress/models.py

@@ -126 +126 @@
 # one for each end of the m2m, plus the through model.
 
 >>> User.objects.all().delete()
+3
 >>> UserMembership.objects.all().delete()
+0
 >>> frank.delete()
 >>> rock.delete()
 >>> jim.delete()

tests/regressiontests/model_inheritance_regress/models.py

@@ -239 +239 @@
 
 # This should delete both Restuarants, plus the related places, plus the ItalianRestaurant.
 >>> Restaurant.objects.all().delete()
-
+2
 >>> Place.objects.get(pk=ident)
 Traceback (most recent call last):
 ...

tests/regressiontests/model_regress/models.py

@@ -159 +159 @@
 # The idea is that all these creations and saving should work without crashing.
 # It's not rocket science.
 >>> Article.objects.all().delete()
+2
 >>> dt1 = datetime.datetime(2008, 8, 31, 16, 20, tzinfo=tzinfo.FixedOffset(600))
 >>> dt2 = datetime.datetime(2008, 8, 31, 17, 20, tzinfo=tzinfo.FixedOffset(600))
 >>> obj = Article.objects.create(headline="A headline", pub_date=dt1, article_text="foo")