mirror of
https://github.com/django/django.git
synced 2025-03-13 19:00:45 +00:00
Fixed #35099 -- Prevented mutating queryset when combining with & and | operators.
Thanks Alan for the report. Co-authored-by: Mariusz Felisiak <felisiak.mariusz@gmail.com>
This commit is contained in:
parent
6ee37ada32
commit
d79fba7d8e
@ -696,6 +696,7 @@ class Query(BaseExpression):
|
|||||||
# except if the alias is the base table since it must be present in the
|
# except if the alias is the base table since it must be present in the
|
||||||
# query on both sides.
|
# query on both sides.
|
||||||
initial_alias = self.get_initial_alias()
|
initial_alias = self.get_initial_alias()
|
||||||
|
rhs = rhs.clone()
|
||||||
rhs.bump_prefix(self, exclude={initial_alias})
|
rhs.bump_prefix(self, exclude={initial_alias})
|
||||||
|
|
||||||
# Work out how to relabel the rhs aliases, if necessary.
|
# Work out how to relabel the rhs aliases, if necessary.
|
||||||
|
@ -1357,6 +1357,24 @@ class Queries1Tests(TestCase):
|
|||||||
)
|
)
|
||||||
self.assertSequenceEqual(Note.objects.exclude(negate=True), [self.n3])
|
self.assertSequenceEqual(Note.objects.exclude(negate=True), [self.n3])
|
||||||
|
|
||||||
|
def test_combining_does_not_mutate(self):
|
||||||
|
all_authors = Author.objects.all()
|
||||||
|
authors_with_report = Author.objects.filter(
|
||||||
|
Exists(Report.objects.filter(creator__pk=OuterRef("id")))
|
||||||
|
)
|
||||||
|
authors_without_report = all_authors.exclude(pk__in=authors_with_report)
|
||||||
|
items_before = Item.objects.filter(creator__in=authors_without_report)
|
||||||
|
self.assertCountEqual(items_before, [self.i2, self.i3, self.i4])
|
||||||
|
# Combining querysets doesn't mutate them.
|
||||||
|
all_authors | authors_with_report
|
||||||
|
all_authors & authors_with_report
|
||||||
|
|
||||||
|
authors_without_report = all_authors.exclude(pk__in=authors_with_report)
|
||||||
|
items_after = Item.objects.filter(creator__in=authors_without_report)
|
||||||
|
|
||||||
|
self.assertCountEqual(items_after, [self.i2, self.i3, self.i4])
|
||||||
|
self.assertCountEqual(items_before, items_after)
|
||||||
|
|
||||||
|
|
||||||
class Queries2Tests(TestCase):
|
class Queries2Tests(TestCase):
|
||||||
@classmethod
|
@classmethod
|
||||||
|
Loading…
x
Reference in New Issue
Block a user