From 181e3bd71c0f578a1214523be1f7969393d98892 Mon Sep 17 00:00:00 2001 From: Jacob Walls Date: Sat, 9 Aug 2025 00:04:22 -0400 Subject: [PATCH] Refs #36210 -- Corrected output_field comparison in Subquery.resolve_expression(). Regression in fd569dd45bf0746378faf7f65172497f21ed27f0. --- django/db/models/expressions.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/django/db/models/expressions.py b/django/db/models/expressions.py index 8a2ee1ef64..0d47366d2c 100644 --- a/django/db/models/expressions.py +++ b/django/db/models/expressions.py @@ -1804,7 +1804,9 @@ class Subquery(BaseExpression, Combinable): self.output_field except AttributeError: 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 resolved.query return resolved