p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed #31474 -- Made QuerySet.delete() not return the number of deleted objects if it's zero.

This commit is contained in:
Hasan Ramezani 2020-04-18 18:31:17 +02:00 committed by Mariusz Felisiak
parent c86201b6ed
commit 35a67b3731
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -408,7 +408,8 @@ class Collector:
# fast deletes # fast deletes
for qs in self.fast_deletes: for qs in self.fast_deletes:
count = qs._raw_delete(using=self.using) count = qs._raw_delete(using=self.using)
deleted_counter[qs.model._meta.label] += count if count:
deleted_counter[qs.model._meta.label] += count
# update fields # update fields
for model, instances_for_fieldvalues in self.field_updates.items(): for model, instances_for_fieldvalues in self.field_updates.items():
@ -426,7 +427,8 @@ class Collector:
query = sql.DeleteQuery(model) query = sql.DeleteQuery(model)
pk_list = [obj.pk for obj in instances] pk_list = [obj.pk for obj in instances]
count = query.delete_batch(pk_list, self.using) count = query.delete_batch(pk_list, self.using)
deleted_counter[model._meta.label] += count if count:
deleted_counter[model._meta.label] += count
if not model._meta.auto_created: if not model._meta.auto_created:
for obj in instances: for obj in instances:

7
tests/delete/tests.py
View File

@ -522,11 +522,10 @@ class DeletionTests(TestCase):
existed_objs = { existed_objs = {
R._meta.label: R.objects.count(), R._meta.label: R.objects.count(),
HiddenUser._meta.label: HiddenUser.objects.count(), HiddenUser._meta.label: HiddenUser.objects.count(),
A._meta.label: A.objects.count(),
MR._meta.label: MR.objects.count(),
HiddenUserProfile._meta.label: HiddenUserProfile.objects.count(), HiddenUserProfile._meta.label: HiddenUserProfile.objects.count(),
} }
deleted, deleted_objs = R.objects.all().delete() deleted, deleted_objs = R.objects.all().delete()
self.assertCountEqual(deleted_objs.keys(), existed_objs.keys())
for k, v in existed_objs.items(): for k, v in existed_objs.items():
self.assertEqual(deleted_objs[k], v) self.assertEqual(deleted_objs[k], v)
@ -550,13 +549,13 @@ class DeletionTests(TestCase):
existed_objs = { existed_objs = {
R._meta.label: R.objects.count(), R._meta.label: R.objects.count(),
HiddenUser._meta.label: HiddenUser.objects.count(), HiddenUser._meta.label: HiddenUser.objects.count(),
A._meta.label: A.objects.count(),
MR._meta.label: MR.objects.count(), MR._meta.label: MR.objects.count(),
HiddenUserProfile._meta.label: HiddenUserProfile.objects.count(), HiddenUserProfile._meta.label: HiddenUserProfile.objects.count(),
M.m2m.through._meta.label: M.m2m.through.objects.count(), M.m2m.through._meta.label: M.m2m.through.objects.count(),
} }
deleted, deleted_objs = r.delete() deleted, deleted_objs = r.delete()
self.assertEqual(deleted, sum(existed_objs.values())) self.assertEqual(deleted, sum(existed_objs.values()))
self.assertCountEqual(deleted_objs.keys(), existed_objs.keys())
for k, v in existed_objs.items(): for k, v in existed_objs.items():
self.assertEqual(deleted_objs[k], v) self.assertEqual(deleted_objs[k], v)
@ -694,7 +693,7 @@ class FastDeleteTests(TestCase):
with self.assertNumQueries(1): with self.assertNumQueries(1):
self.assertEqual( self.assertEqual(
User.objects.filter(avatar__desc='missing').delete(), User.objects.filter(avatar__desc='missing').delete(),
(0, {'delete.User': 0}) (0, {}),
) )
def test_fast_delete_combined_relationships(self): def test_fast_delete_combined_relationships(self):