p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed #31767 -- Fixed QuerySet.none() on combined queryset.

This commit is contained in:
Mariusz Felisiak 2020-07-07 12:15:05 +02:00 committed by GitHub
parent cb0da637a6
commit ae8338daf3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
django/db/models/sql/query.py
View File

@ -305,6 +305,7 @@ class Query(BaseExpression):
obj.annotation_select_mask = None obj.annotation_select_mask = None
else: else:
obj.annotation_select_mask = self.annotation_select_mask.copy() obj.annotation_select_mask = self.annotation_select_mask.copy()
obj.combined_queries = tuple(query.clone() for query in self.combined_queries)
# _annotation_select_cache cannot be copied, as doing so breaks the # _annotation_select_cache cannot be copied, as doing so breaks the
# (necessary) state in which both annotations and # (necessary) state in which both annotations and
# _annotation_select_cache point to the same underlying objects. # _annotation_select_cache point to the same underlying objects.
@ -1777,6 +1778,8 @@ class Query(BaseExpression):
def set_empty(self): def set_empty(self):
self.where.add(NothingNode(), AND) self.where.add(NothingNode(), AND)
for query in self.combined_queries:
query.set_empty()
def is_empty(self): def is_empty(self):
return any(isinstance(c, NothingNode) for c in self.where.children) return any(isinstance(c, NothingNode) for c in self.where.children)

7
tests/queries/test_qs_combinators.py
View File

@ -51,6 +51,13 @@ class QuerySetSetOperationTests(TestCase):
self.assertEqual(len(list(qs1.union(qs2, all=True))), 20) self.assertEqual(len(list(qs1.union(qs2, all=True))), 20)
self.assertEqual(len(list(qs1.union(qs2))), 10) self.assertEqual(len(list(qs1.union(qs2))), 10)
def test_union_none(self):
qs1 = Number.objects.filter(num__lte=1)
qs2 = Number.objects.filter(num__gte=8)
qs3 = qs1.union(qs2)
self.assertSequenceEqual(qs3.none(), [])
self.assertNumbersEqual(qs3, [0, 1, 8, 9], ordered=False)
@skipUnlessDBFeature('supports_select_intersection') @skipUnlessDBFeature('supports_select_intersection')
def test_intersection_with_empty_qs(self): def test_intersection_with_empty_qs(self):
qs1 = Number.objects.all() qs1 = Number.objects.all()