From 44ffd8d06fabc07d8333f31439e8dd39ea87329b Mon Sep 17 00:00:00 2001 From: Mariusz Felisiak Date: Fri, 24 Jun 2022 07:29:58 +0200 Subject: Fixed #33796 -- Fixed ordered combined queryset crash when used in subquery on PostgreSQL and MySQL. Thanks Shai Berger for the report. Regression in 30a01441347d5a2146af2944b29778fa0834d4be. --- django/db/models/sql/compiler.py | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'django/db/models/sql') 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 -- cgit v1.3