summaryrefslogtreecommitdiff
path: root/django/db/models/sql
diff options
context:
space:
mode:
authorHasan Ramezani <hasan.r67@gmail.com>2020-09-17 08:26:06 +0200
committerGitHub <noreply@github.com>2020-09-17 08:26:06 +0200
commita046bcadbee2dc0e6c889f82c08b5a21a32359ad (patch)
treee1c15de11f45244802e039e486b39ebf98320c9a /django/db/models/sql
parent981a072dd4dec586f8fc606712ed9a2ef116eeee (diff)
Fixed #31916 -- Fixed combined queryset crash when combining with ordered combined querysets.
Diffstat (limited to 'django/db/models/sql')
-rw-r--r--django/db/models/sql/compiler.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/db/models/sql/compiler.py b/django/db/models/sql/compiler.py
index 208f0ddf73..2fedef62fc 100644
--- a/django/db/models/sql/compiler.py
+++ b/django/db/models/sql/compiler.py
@@ -359,7 +359,7 @@ class SQLCompiler:
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 and self.select:
src = resolved.get_source_expressions()[0]
expr_src = expr.get_source_expressions()[0]
# Relabel order by columns to raw numbers if this is a combined