12 Commits

Author	SHA1	Message	Date
Mariusz Felisiak	0b66c3b442	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 a0c03c62a8. Thanks Tim Graham and Carlton Gibson for reviews.	2018-04-13 12:15:52 +02:00
Astral	a0c03c62a8	Fixed #29229 -- Fixed column mismatch crash when combining two annotated values_list() querysets with union(), difference(), or intersection(). ... Regression in 7316720603821ebb64dfe8fa592ba6edcef5f3e.	2018-03-19 21:05:43 -04:00
Mariusz Felisiak	2d3cc94284	Fixed #28781 -- Added QuerySet.values()/values_list() support for union(), difference(), and intersection(). ... Thanks Tim Graham for the review.	2017-11-12 14:28:11 +01:00
Florian Apolloner	adab280cef	Fixed #28399 -- Fixed QuerySet.count() for union(), difference(), and intersection() queries.	2017-07-15 08:20:12 -04:00
Mariusz Felisiak	ca74e56350	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.	2017-07-10 20:40:08 +02:00
Mariusz Felisiak	9bca0d0b38	Added test for intersection() when combining with a queryset raising EmptyResultSet.	2017-07-10 20:40:08 +02:00
Mariusz Felisiak	82175ead72	Fixed #28293 -- Fixed union(), intersection(), and difference() when combining with an EmptyQuerySet. ... Thanks Jon Dufresne for the report and Tim Graham for the review.	2017-06-13 08:16:16 +02:00
Mariusz Felisiak	054a44d6f0	Used NotSupportedError instead of DatabaseError in SQLCompiler.as_sql().	2017-04-10 12:49:27 -04:00
Vytis Banaitis	8838d4dd49	Refs #23919 -- Replaced kwargs.pop() with keyword-only arguments.	2017-02-01 11:41:56 -05:00
Tim Graham	d170c63351	Refs #23919 -- Removed misc references to Python 2.	2017-01-21 20:02:00 -05:00
Claude Paroz	d7b9aaa366	Refs #23919 -- Removed encoding preambles and future imports	2017-01-18 09:55:19 +01: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