mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-29 00:26:07 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #17930 -- Allowed ORing (|) with sliced QuerySets.

Browse Source
This commit is contained in:
Ian Foote
2018-11-15 14:43:58 +00:00
committed by Tim Graham
parent cd40306854
commit e1fc07c047
2 changed files with 35 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
django/db/models/query.py
View File

@@ -327,8 +327,11 @@ class QuerySet:
return other
if isinstance(other, EmptyQuerySet):
return self
combined = self._chain()
query = self if self.query.can_filter() else self.model._base_manager.filter(pk__in=self.values('pk'))
combined = query._chain()
combined._merge_known_related_objects(other)
if not other.query.can_filter():
other = other.model._base_manager.filter(pk__in=other.values('pk'))
combined.query.combine(other.query, sql.OR)
return combined