innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Fixed #30572 -- Prevented values()/values_list() on combined queryset from mutating the list of columns in querysets.

This commit is contained in:
Mariusz Felisiak 2019-06-19 10:44:53 +02:00 committed by GitHub
parent a7038adbd0
commit 14d026cccb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -426,6 +426,7 @@ class SQLCompiler:
# 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 not compiler.query.values_select and self.query.values_select:
compiler.query = compiler.query.clone()
compiler.query.set_values(( compiler.query.set_values((
*self.query.extra_select, *self.query.extra_select,
*self.query.values_select, *self.query.values_select,

3
tests/queries/test_qs_combinators.py
View File

@ -123,6 +123,9 @@ class QuerySetSetOperationTests(TestCase):
self.assertEqual(reserved_name['order'], 2) self.assertEqual(reserved_name['order'], 2)
reserved_name = qs1.union(qs1).values_list('name', 'order', 'id').get() reserved_name = qs1.union(qs1).values_list('name', 'order', 'id').get()
self.assertEqual(reserved_name[:2], ('a', 2)) self.assertEqual(reserved_name[:2], ('a', 2))
# List of columns can be changed.
reserved_name = qs1.union(qs1).values_list('order').get()
self.assertEqual(reserved_name, (2,))
def test_union_with_two_annotated_values_list(self): def test_union_with_two_annotated_values_list(self):
qs1 = Number.objects.filter(num=1).annotate( qs1 = Number.objects.filter(num=1).annotate(