summaryrefslogtreecommitdiff
path: root/django/db/models/sql/compiler.py
diff options
context:
space:
mode:
authorMariusz Felisiak <felisiak.mariusz@gmail.com>2022-06-24 07:29:58 +0200
committerMariusz Felisiak <felisiak.mariusz@gmail.com>2022-06-27 06:21:31 +0200
commit44ffd8d06fabc07d8333f31439e8dd39ea87329b (patch)
tree5e43183077ab0fe592ba7012435cb4301f055d31 /django/db/models/sql/compiler.py
parent6f63e0ce8e36fbdb2d0c4dfd77ed3cf02e467f49 (diff)
downloaddjango-44ffd8d06fabc07d8333f31439e8dd39ea87329b.tar.gz
Fixed #33796 -- Fixed ordered combined queryset crash when used in subquery on PostgreSQL and MySQL.
Thanks Shai Berger for the report. Regression in 30a01441347d5a2146af2944b29778fa0834d4be.
Diffstat (limited to 'django/db/models/sql/compiler.py')
-rw-r--r--django/db/models/sql/compiler.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/django/db/models/sql/compiler.py b/django/db/models/sql/compiler.py
index 9c7bd8ea1a..461e1ae156 100644
--- a/django/db/models/sql/compiler.py
+++ b/django/db/models/sql/compiler.py
@@ -548,6 +548,11 @@ class SQLCompiler:
or not features.supports_slicing_ordering_in_compound
):
part_sql = "({})".format(part_sql)
+ elif (
+ self.query.subquery
+ and features.supports_slicing_ordering_in_compound
+ ):
+ part_sql = "({})".format(part_sql)
parts += ((part_sql, part_args),)
except EmptyResultSet:
# Omit the empty queryset with UNION and with DIFFERENCE if the