Mariusz Felisiak
f89b11b879
[1.11.x] Fixed #29286 -- Fixed column mismatch crash with QuerySet.values() or values_list() after combining an annotated and unannotated queryset with union(), difference(), or intersection().
...
Regression in a0c03c62a8ac586e5be5b21393c925afa581efaf.
Thanks Tim Graham and Carlton Gibson for reviews.
Backport of 0b66c3b442875627fa6daef4ac1e90900d74290b from master.
2018-04-13 12:54:32 +02:00
Amr Anwar
c5bb472095
[1.11.x] Fixed #29229 -- Fixed column mismatch crash when combining two annotated values_list() querysets with union(), difference(), or intersection().
...
Regression in 7316720603821ebb64dfe8fa592ba6edcef5f3e.
Backport of a0c03c62a8ac586e5be5b21393c925afa581efaf from master
2018-03-19 21:06:40 -04:00
Mariusz Felisiak
6731672060
[1.11.x] Fixed #28781 -- Added QuerySet.values()/values_list() support for union(), difference(), and intersection().
...
Thanks Tim Graham for the review.
Backport of 2d3cc94284674638c334670903d49565039d77ae from master
2017-11-12 14:33:41 +01:00
Florian Apolloner
9350f77c69
[1.11.x] Fixed #28399 -- Fixed QuerySet.count() for union(), difference(), and intersection() queries.
...
Backport of adab280cefb15659c39558ac26ea392b0a1e456c from master
2017-07-15 09:10:42 -04:00
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 ca74e563500e291480f1976b58fcd34aac768dca 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 9bca0d0b38d941fe7f3842cb2259d018823ed25e 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 82175ead723f8fa3f9271fbd4b24275097029aab 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
