diff options
| -rw-r--r-- | django/db/models/sql/compiler.py | 6 | ||||
| -rw-r--r-- | docs/releases/2.1.1.txt | 5 | ||||
| -rw-r--r-- | tests/queries/test_qs_combinators.py | 7 |
3 files changed, 17 insertions, 1 deletions
diff --git a/django/db/models/sql/compiler.py b/django/db/models/sql/compiler.py index 8b0fd1da46..27b8cc343b 100644 --- a/django/db/models/sql/compiler.py +++ b/django/db/models/sql/compiler.py @@ -411,7 +411,11 @@ class SQLCompiler: # 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: - compiler.query.set_values((*self.query.values_select, *self.query.annotation_select)) + compiler.query.set_values(( + *self.query.extra_select, + *self.query.values_select, + *self.query.annotation_select, + )) parts += (compiler.as_sql(),) except EmptyResultSet: # Omit the empty queryset with UNION and with DIFFERENCE if the diff --git a/docs/releases/2.1.1.txt b/docs/releases/2.1.1.txt index 07912eead2..759d24c391 100644 --- a/docs/releases/2.1.1.txt +++ b/docs/releases/2.1.1.txt @@ -41,3 +41,8 @@ Bugfixes * Fixed admin change view crash for view-only users if the form has an extra form field (:ticket:`29682`). + +* Fixed a regression in Django 2.0.5 where ``QuerySet.values()`` or + ``values_list()`` after combining querysets with ``extra()`` with + ``union()``, ``difference()``, or ``intersection()`` crashed due to + mismatching columns (:ticket:`29694`). diff --git a/tests/queries/test_qs_combinators.py b/tests/queries/test_qs_combinators.py index 8b02ab308b..f1785dd783 100644 --- a/tests/queries/test_qs_combinators.py +++ b/tests/queries/test_qs_combinators.py @@ -130,6 +130,13 @@ class QuerySetSetOperationTests(TestCase): ).values_list('num', 'count') self.assertCountEqual(qs1.union(qs2), [(1, 0), (2, 1)]) + def test_union_with_extra_and_values_list(self): + qs1 = Number.objects.filter(num=1).extra( + select={'count': 0}, + ).values_list('num', 'count') + qs2 = Number.objects.filter(num=2).extra(select={'count': 1}) + self.assertCountEqual(qs1.union(qs2), [(1, 0), (2, 1)]) + def test_union_with_values_list_on_annotated_and_unannotated(self): ReservedName.objects.create(name='rn1', order=1) qs1 = Number.objects.annotate( |