Commit Graph

4 Commits

Author SHA1 Message Date
Mariusz Felisiak 346b46a274 [1.11.x] Fixed #28378 -- Fixed union() and difference() when combining with a queryset raising EmptyResultSet.
Thanks Jon Dufresne for the report. Thanks Tim Graham and Simon Charette
for the reviews.

Backport of ca74e56350 from master
2017-07-10 20:50:50 +02:00
Mariusz Felisiak b72298de75 [1.11.x] Added test for intersection() when combining with a queryset raising EmptyResultSet.
Backport of 9bca0d0b38 from master
2017-07-10 20:49:15 +02:00
Mariusz Felisiak 44e29ea1e9 [1.11.x] Fixed #28293 -- Fixed union(), intersection(), and difference() when combining with an EmptyQuerySet.
Thanks Jon Dufresne for the report and Tim Graham for the review.

Backport of 82175ead72 from master
2017-06-13 08:33:26 +02:00
Florian Apolloner 84c1826ded Fixed #27718 -- Added QuerySet.union(), intersection(), difference().
Thanks Mariusz Felisiak for review and Oracle assistance.
Thanks Tim Graham for review and writing docs.
2017-01-14 08:32:07 -05:00