mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-27 15:46:10 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #36407 -- Ensured default value is cast in Case expressions used in ORDER BY clause.

Browse Source 
Thanks to deceze for the report. Thanks to Sarah Boyce for the test.
Thanks to Simon Charette for the investigation and review.
This commit is contained in:
ontowhee
2025-05-22 11:06:28 -07:00
committed by Sarah Boyce
parent 51923c576a
commit 68c9f7e0b7
2 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
django/db/models/expressions.py
View File

@@ -1711,14 +1711,24 @@ class Case(SQLiteNumericMixin, Expression):
except EmptyResultSet:
continue
except FullResultSet:
default_sql, default_params = compiler.compile(case.result)
default = case.result
break
case_parts.append(case_sql)
sql_params.extend(case_params)
else:
default_sql, default_params = compiler.compile(self.default)
if not case_parts:
return default_sql, default_params
default = self.default
if case_parts:
default_sql, default_params = compiler.compile(default)
else:
if (
isinstance(default, Value)
and (output_field := default._output_field_or_none) is not None
):
from django.db.models.functions import Cast
default = Cast(default, output_field)
return compiler.compile(default)
case_joiner = case_joiner or self.case_joiner
template_params["cases"] = case_joiner.join(case_parts)
template_params["default"] = default_sql