mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-03-05 15:02:31 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #28900 -- Propagated all selected fields to combinator queries.

Browse Source 
Previously, only the selected column aliases would be propagated and
annotations were ignored.
This commit is contained in:
Simon Charette 2023-03-30 01:23:12 -04:00 committed by Sarah Boyce
parent 65ad4ade74
commit 6d220963fa
3 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
django/db/models/sql/compiler.py
View File

@ -591,20 +591,15 @@ class SQLCompiler:
# generate valid SQL. # generate valid SQL.
compiler.elide_empty = False compiler.elide_empty = False
parts = () parts = ()
selected = self.query.selected
for compiler in compilers: for compiler in compilers:
try: try:
# If the columns list is limited, then all combined queries # If the columns list is limited, then all combined queries
# must have the same columns list. Set the selects defined on # must have the same columns list. Set the selects defined on
# the query on all combined queries, if not already set. # the query on all combined queries, if not already set.
if not compiler.query.values_select and self.query.values_select: if selected is not None and compiler.query.selected is None:
compiler.query = compiler.query.clone() compiler.query = compiler.query.clone()
compiler.query.set_values( compiler.query.set_values(selected)
(
*self.query.extra_select,
*self.query.values_select,
*self.query.annotation_select,
)
)
part_sql, part_args = compiler.as_sql(with_col_aliases=True) part_sql, part_args = compiler.as_sql(with_col_aliases=True)
if compiler.query.combinator: if compiler.query.combinator:
# Wrap in a subquery if wrapping in parentheses isn't # Wrap in a subquery if wrapping in parentheses isn't

6
tests/queries/test_qs_combinators.py
View File

@ -282,11 +282,7 @@ class QuerySetSetOperationTests(TestCase):
) )
.values_list("num", "count") .values_list("num", "count")
) )
qs2 = ( qs2 = Number.objects.filter(num=2).extra(select={"count": 1})
Number.objects.filter(num=2)
.extra(select={"count": 1})
.values_list("num", "count")
)
self.assertCountEqual(qs1.union(qs2), [(1, 0), (2, 1)]) self.assertCountEqual(qs1.union(qs2), [(1, 0), (2, 1)])
def test_union_with_values_list_on_annotated_and_unannotated(self): def test_union_with_values_list_on_annotated_and_unannotated(self):

10
tests/queries/tests.py
View File

@ -1375,6 +1375,16 @@ class Queries1Tests(TestCase):
self.assertCountEqual(items_after, [self.i2, self.i3, self.i4]) self.assertCountEqual(items_after, [self.i2, self.i3, self.i4])
self.assertCountEqual(items_before, items_after) self.assertCountEqual(items_before, items_after)
def test_union_values_subquery(self):
items = Item.objects.filter(creator=OuterRef("pk"))
item_authors = Author.objects.annotate(is_creator=Exists(items)).order_by()
reports = Report.objects.filter(creator=OuterRef("pk"))
report_authors = Author.objects.annotate(is_creator=Exists(reports)).order_by()
all_authors = item_authors.union(report_authors).order_by("is_creator")
self.assertEqual(
list(all_authors.values_list("is_creator", flat=True)), [False, True]
)
class Queries2Tests(TestCase): class Queries2Tests(TestCase):
@classmethod @classmethod