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

Fixed #30093 -- Fixed ordering of combined queryset ordered by F expressions.

This commit is contained in:
Sergey Fedoseev 2019-01-14 20:28:11 +05:00 committed by Tim Graham
parent b2c598e30d
commit b86bb47818
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -339,8 +339,9 @@ class SQLCompiler:
seen = set() seen = set()
for expr, is_ref in order_by: for expr, is_ref in order_by:
resolved = expr.resolve_expression(self.query, allow_joins=True, reuse=None)
if self.query.combinator: if self.query.combinator:
src = expr.get_source_expressions()[0] src = resolved.get_source_expressions()[0]
# Relabel order by columns to raw numbers if this is a combined # Relabel order by columns to raw numbers if this is a combined
# query; necessary since the columns can't be referenced by the # query; necessary since the columns can't be referenced by the
# fully qualified name and the simple column names may collide. # fully qualified name and the simple column names may collide.
@ -350,12 +351,10 @@ class SQLCompiler:
elif col_alias: elif col_alias:
continue continue
if src == sel_expr: if src == sel_expr:
expr.set_source_expressions([RawSQL('%d' % (idx + 1), ())]) resolved.set_source_expressions([RawSQL('%d' % (idx + 1), ())])
break break
else: else:
raise DatabaseError('ORDER BY term does not match any column in the result set.') raise DatabaseError('ORDER BY term does not match any column in the result set.')
resolved = expr.resolve_expression(
self.query, allow_joins=True, reuse=None)
sql, params = self.compile(resolved) sql, params = self.compile(resolved)
# Don't add the same column twice, but the order direction is # Don't add the same column twice, but the order direction is
# not taken into account so we strip it. When this entire method # not taken into account so we strip it. When this entire method

5
tests/queries/test_qs_combinators.py
View File

@ -110,6 +110,11 @@ class QuerySetSetOperationTests(TestCase):
qs2 = Number.objects.filter(num__gte=2, num__lte=3) qs2 = Number.objects.filter(num__gte=2, num__lte=3)
self.assertNumbersEqual(qs1.union(qs2).order_by('-num'), [3, 2, 1, 0]) self.assertNumbersEqual(qs1.union(qs2).order_by('-num'), [3, 2, 1, 0])
def test_ordering_by_f_expression(self):
qs1 = Number.objects.filter(num__lte=1)
qs2 = Number.objects.filter(num__gte=2, num__lte=3)
self.assertNumbersEqual(qs1.union(qs2).order_by(F('num').desc()), [3, 2, 1, 0])
def test_union_with_values(self): def test_union_with_values(self):
ReservedName.objects.create(name='a', order=2) ReservedName.objects.create(name='a', order=2)
qs1 = ReservedName.objects.all() qs1 = ReservedName.objects.all()