1
0
mirror of https://github.com/django/django.git synced 2025-10-31 09:41:08 +00:00

Fixed #19816 -- Pre-evaluate querysets used in direct relation assignments.

Since assignments on M2M or reverse FK descriptors is composed of a `clear()`,
followed by an `add()`, `clear()` could potentially affect the value of the
assigned queryset before the `add()` step; pre-evaluating it solves the problem.

This patch fixes the issue for ForeignRelatedObjectsDescriptor,
ManyRelatedObjectsDescriptor, and ReverseGenericRelatedObjectsDescriptor.
It completes 6cb6e1 which addressed ReverseManyRelatedObjectsDescriptor.
This commit is contained in:
Loic Bistuer
2014-03-27 19:32:48 +08:00
parent 2f3e1fe323
commit 20399083f4
6 changed files with 66 additions and 19 deletions

View File

@@ -86,6 +86,18 @@ class ManyToOneNullTests(TestCase):
self.assertQuerysetEqual(Article.objects.filter(reporter__isnull=True),
['<Article: First>', '<Article: Fourth>'])
def test_assign_with_queryset(self):
# Ensure that querysets used in reverse FK assignments are pre-evaluated
# so their value isn't affected by the clearing operation in
# ForeignRelatedObjectsDescriptor.__set__. Refs #19816.
self.r2.article_set = [self.a2, self.a3]
qs = self.r2.article_set.filter(id=self.a2.id)
self.r2.article_set = qs
self.assertEqual(1, self.r2.article_set.count())
self.assertEqual(1, qs.count())
def test_clear_efficiency(self):
r = Reporter.objects.create()
for _ in range(3):