diff options
| author | Amr Anwar <amranwar945@gmail.com> | 2018-03-19 09:58:50 -0400 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2018-03-19 21:05:59 -0400 |
| commit | 9123fd75caa595c018d4121575cbada80226b4f2 (patch) | |
| tree | 209cca5b52f5e6eb8a90c817a3641bd6eb4c396c | |
| parent | 80cd6fd55af80218d24fd8ce9bb93b7704e939df (diff) | |
[2.0.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
| -rw-r--r-- | django/db/models/sql/compiler.py | 3 | ||||
| -rw-r--r-- | docs/releases/1.11.12.txt | 4 | ||||
| -rw-r--r-- | docs/releases/2.0.4.txt | 5 | ||||
| -rw-r--r-- | tests/queries/test_qs_combinators.py | 11 |
4 files changed, 21 insertions, 2 deletions
diff --git a/django/db/models/sql/compiler.py b/django/db/models/sql/compiler.py index 72a6537e05..fa3f4fb739 100644 --- a/django/db/models/sql/compiler.py +++ b/django/db/models/sql/compiler.py @@ -411,7 +411,8 @@ class SQLCompiler: # If the columns list is limited, then all combined queries # must have the same columns list. Set the selects defined on # the query on all combined queries, if not already set. - if not compiler.query.values_select and self.query.values_select: + if (not compiler.query.values_select and not compiler.query.annotations and + self.query.values_select): compiler.query.set_values(self.query.values_select) parts += (compiler.as_sql(),) except EmptyResultSet: diff --git a/docs/releases/1.11.12.txt b/docs/releases/1.11.12.txt index aa0035a3c3..64130c065e 100644 --- a/docs/releases/1.11.12.txt +++ b/docs/releases/1.11.12.txt @@ -9,4 +9,6 @@ Django 1.11.12 fixes a bug in 1.11.11. Bugfixes ======== -* ... +* Fixed a regression in Django 1.11.8 where combining two annotated + ``values_list()`` querysets with ``union()``, ``difference()``, or + ``intersection()`` crashed due to mismatching columns (:ticket:`29229`). diff --git a/docs/releases/2.0.4.txt b/docs/releases/2.0.4.txt index e38c16ed1d..6614808990 100644 --- a/docs/releases/2.0.4.txt +++ b/docs/releases/2.0.4.txt @@ -21,3 +21,8 @@ Bugfixes * Fixed ``PasswordResetConfirmView`` crash when using a user model with a ``UUIDField`` primary key and the reset URL contains an encoded primary key value that decodes to a non-UUID (:ticket:`29206`). + value that decodes to an invalid UUID (:ticket:`29206`). + +* Fixed a regression in Django 1.11.8 where combining two annotated + ``values_list()`` querysets with ``union()``, ``difference()``, or + ``intersection()`` crashed due to mismatching columns (:ticket:`29229`). diff --git a/tests/queries/test_qs_combinators.py b/tests/queries/test_qs_combinators.py index 8026bf227d..e2ec18c034 100644 --- a/tests/queries/test_qs_combinators.py +++ b/tests/queries/test_qs_combinators.py @@ -119,6 +119,17 @@ class QuerySetSetOperationTests(TestCase): reserved_name = qs1.union(qs1).values_list('name', 'order', 'id').get() self.assertEqual(reserved_name[:2], ('a', 2)) + def test_union_with_two_annotated_values_list(self): + qs1 = Number.objects.filter(num=1).annotate( + count=Value(0, IntegerField()), + ).values_list('num', 'count') + qs2 = Number.objects.filter(num=2).values('pk').annotate( + count=F('num'), + ).annotate( + num=Value(1, IntegerField()), + ).values_list('num', 'count') + self.assertCountEqual(qs1.union(qs2), [(1, 0), (2, 1)]) + def test_count_union(self): qs1 = Number.objects.filter(num__lte=1).values('num') qs2 = Number.objects.filter(num__gte=2, num__lte=3).values('num') |