diff options
| author | Sergey Fedoseev <fedoseev.sergey@gmail.com> | 2019-01-14 20:28:11 +0500 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2019-01-14 10:28:11 -0500 |
| commit | b86bb47818e159e8db7e524ed8ef055b569ea111 (patch) | |
| tree | fd6a2148c2bd15058fe50f6a7796d4ba8ea238de /django/db/models/sql | |
| parent | b2c598e30de9fd5d46e87a4b6dd4dd84ca2b1826 (diff) | |
Fixed #30093 -- Fixed ordering of combined queryset ordered by F expressions.
Diffstat (limited to 'django/db/models/sql')
| -rw-r--r-- | django/db/models/sql/compiler.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/django/db/models/sql/compiler.py b/django/db/models/sql/compiler.py index 30fb1418ab..3e04a801e9 100644 --- a/django/db/models/sql/compiler.py +++ b/django/db/models/sql/compiler.py @@ -339,8 +339,9 @@ class SQLCompiler: seen = set() for expr, is_ref in order_by: + resolved = expr.resolve_expression(self.query, allow_joins=True, reuse=None) 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 # query; necessary since the columns can't be referenced by the # fully qualified name and the simple column names may collide. @@ -350,12 +351,10 @@ class SQLCompiler: elif col_alias: continue if src == sel_expr: - expr.set_source_expressions([RawSQL('%d' % (idx + 1), ())]) + resolved.set_source_expressions([RawSQL('%d' % (idx + 1), ())]) break else: 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) # Don't add the same column twice, but the order direction is # not taken into account so we strip it. When this entire method |