diff options
| author | Simon Charette <charette.s@gmail.com> | 2025-01-20 22:36:47 -0500 |
|---|---|---|
| committer | Sarah Boyce <42296566+sarahboyce@users.noreply.github.com> | 2025-01-22 08:58:23 +0100 |
| commit | 1df0f998ae8d1626adaa9b807a43e4cbdfc590e2 (patch) | |
| tree | 92c8454bede2c8c3cb4cdf9b85f2890a0f448dd5 /django | |
| parent | e306687a3a5507d59365ba9bf545010e5fd4b2a8 (diff) | |
[5.2.x] Fixed #36117 -- Raised ValueError when providing composite expressions to case / when.
Remove redundant Case and When.resolve_expression to delegate composite
expression support to BaseExpression.
Thanks Jacob Tyler Walls for the report and test.
Backport of 00c690efbc0b10f67924687f24a7b30397bf47d9 from main.
Diffstat (limited to 'django')
| -rw-r--r-- | django/db/models/expressions.py | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/django/db/models/expressions.py b/django/db/models/expressions.py index 50b62a6d38..ad8f8e6650 100644 --- a/django/db/models/expressions.py +++ b/django/db/models/expressions.py @@ -1577,20 +1577,6 @@ class When(Expression): # We're only interested in the fields of the result expressions. return [self.result._output_field_or_none] - def resolve_expression( - self, query=None, allow_joins=True, reuse=None, summarize=False, for_save=False - ): - c = self.copy() - c.is_summary = summarize - if hasattr(c.condition, "resolve_expression"): - c.condition = c.condition.resolve_expression( - query, allow_joins, reuse, summarize, False - ) - c.result = c.result.resolve_expression( - query, allow_joins, reuse, summarize, for_save - ) - return c - def as_sql(self, compiler, connection, template=None, **extra_context): connection.ops.check_expression_support(self) template_params = extra_context @@ -1658,20 +1644,6 @@ class Case(SQLiteNumericMixin, Expression): def set_source_expressions(self, exprs): *self.cases, self.default = exprs - def resolve_expression( - self, query=None, allow_joins=True, reuse=None, summarize=False, for_save=False - ): - c = self.copy() - c.is_summary = summarize - for pos, case in enumerate(c.cases): - c.cases[pos] = case.resolve_expression( - query, allow_joins, reuse, summarize, for_save - ) - c.default = c.default.resolve_expression( - query, allow_joins, reuse, summarize, for_save - ) - return c - def copy(self): c = super().copy() c.cases = c.cases[:] |