innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Fixed #29447 -- Made RelatedManager.set() pass bulk argument to clear().

This commit is contained in:
Alexandr Tatarinov 2018-06-23 23:39:22 +03:00 committed by Tim Graham
parent 6b3e17bab6
commit 7410618528
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -35,6 +35,7 @@ answer newbie questions, and generally made Django that much better:
Aleksi Häkli <aleksi.hakli@iki.fi> Aleksi Häkli <aleksi.hakli@iki.fi>
Alexander Dutton <dev@alexdutton.co.uk> Alexander Dutton <dev@alexdutton.co.uk>
Alexander Myodov <alex@myodov.com> Alexander Myodov <alex@myodov.com>
Alexandr Tatarinov <tatarinov1997@gmail.com>
Alex Couper <http://alexcouper.com/> Alex Couper <http://alexcouper.com/>
Alex Dedul Alex Dedul
Alex Gaynor <alex.gaynor@gmail.com> Alex Gaynor <alex.gaynor@gmail.com>

2
django/db/models/fields/related_descriptors.py
View File

@ -708,7 +708,7 @@ def create_reverse_many_to_one_manager(superclass, rel):
db = router.db_for_write(self.model, instance=self.instance) db = router.db_for_write(self.model, instance=self.instance)
with transaction.atomic(using=db, savepoint=False): with transaction.atomic(using=db, savepoint=False):
if clear: if clear:
self.clear() self.clear(bulk=bulk)
self.add(*objs, bulk=bulk) self.add(*objs, bulk=bulk)
else: else:
old_objs = set(self.using(db).all()) old_objs = set(self.using(db).all())

5
tests/many_to_one_null/tests.py
View File

@ -85,6 +85,11 @@ class ManyToOneNullTests(TestCase):
['<Article: Fourth>', '<Article: Second>', '<Article: Third>'] ['<Article: Fourth>', '<Article: Second>', '<Article: Third>']
) )
def test_set_clear_non_bulk(self):
# 2 queries for clear(), 1 for add(), and 1 to select objects.
with self.assertNumQueries(4):
self.r.article_set.set([self.a], bulk=False, clear=True)
def test_assign_clear_related_set(self): def test_assign_clear_related_set(self):
# Use descriptor assignment to allocate ForeignKey. Null is legal, so # Use descriptor assignment to allocate ForeignKey. Null is legal, so
# existing members of the set that are not in the assignment set are # existing members of the set that are not in the assignment set are