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

jacobtylerwalls · sarahboyce · commit 181e3bd71c0f · 2025-08-11T10:22:04.000+02:00
Regression in fd569dd.
diff --git a/django/db/models/expressions.py b/django/db/models/expressions.py
@@ -1804,7 +1804,9 @@ def resolve_expression(self, *args, **kwargs):
                 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
