mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-09-20 17:30:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fixed #28293 -- Fixed union(), intersection(), and difference() when combining with an EmptyQuerySet.

Browse source 
Thanks Jon Dufresne for the report and Tim Graham for the review.
This commit is contained in:
Mariusz Felisiak 2017-06-13 08:16:16 +02:00 • committed by GitHub
parent 9dc83c356d
commit 82175ead72
4 changed files with 42 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

13
django/db/models/query.py
View file

@ -818,12 +818,25 @@ class QuerySet:
return clone
def union(self, *other_qs, all=False):
# If the query is an EmptyQuerySet, combine all nonempty querysets.
if isinstance(self, EmptyQuerySet):
qs = [q for q in other_qs if not isinstance(q, EmptyQuerySet)]
return qs[0]._combinator_query('union', *qs[1:], all=all) if qs else self
return self._combinator_query('union', *other_qs, all=all)
def intersection(self, *other_qs):
# If any query is an EmptyQuerySet, return it.
if isinstance(self, EmptyQuerySet):
return self
for other in other_qs:
if isinstance(other, EmptyQuerySet):
return other
return self._combinator_query('intersection', *other_qs)
def difference(self, *other_qs):
# If the query is an EmptyQuerySet, return it.
if isinstance(self, EmptyQuerySet):
return self
return self._combinator_query('difference', *other_qs)
def select_for_update(self, nowait=False, skip_locked=False):