1
0
mirror of https://github.com/django/django.git synced 2025-08-21 01:09:13 +00:00

Refs #36210 -- Corrected output_field comparison in Subquery.resolve_expression().

Regression in fd569dd45bf0746378faf7f65172497f21ed27f0.
This commit is contained in:
Jacob Walls 2025-08-09 00:04:22 -04:00 committed by Sarah Boyce
parent fa804d0d14
commit 181e3bd71c

View File

@ -1804,7 +1804,9 @@ class Subquery(BaseExpression, Combinable):
self.output_field self.output_field
except AttributeError: except AttributeError:
return resolved.query return resolved.query
if self.output_field and self.output_field != resolved.query.output_field: if self.output_field and type(self.output_field) is not type(
resolved.query.output_field
):
return ExpressionWrapper(resolved.query, output_field=self.output_field) return ExpressionWrapper(resolved.query, output_field=self.output_field)
return resolved.query return resolved.query
return resolved return resolved