From 9760e262f85ae57df39abe2799eff48a82b14474 Mon Sep 17 00:00:00 2001 From: Iuri de Silvio Date: Thu, 8 Apr 2021 16:31:45 -0300 Subject: Fixed #32627 -- Fixed QuerySet.values()/values_list() crash on combined querysets ordered by unannotated columns. --- django/db/models/sql/compiler.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'django/db/models/sql') diff --git a/django/db/models/sql/compiler.py b/django/db/models/sql/compiler.py index 11ad4fde90..e311b7998a 100644 --- a/django/db/models/sql/compiler.py +++ b/django/db/models/sql/compiler.py @@ -347,10 +347,16 @@ class SQLCompiler: continue if not self.query.extra or col not in self.query.extra: - # 'col' is of the form 'field' or 'field1__field2' or - # '-field1__field2__field', etc. - order_by.extend(self.find_ordering_name( - field, self.query.get_meta(), default_order=asc)) + if self.query.combinator and self.select: + # Don't use the first model's field because other + # combinated queries might define it differently. + order_by.append((OrderBy(F(col), descending=descending), False)) + else: + # 'col' is of the form 'field' or 'field1__field2' or + # '-field1__field2__field', etc. + order_by.extend(self.find_ordering_name( + field, self.query.get_meta(), default_order=asc, + )) else: if col not in self.query.extra_select: order_by.append(( -- cgit v1.3