From 994dc6d8a1bae717baa236b65e11cf91ce181c53 Mon Sep 17 00:00:00 2001 From: Jacob Walls Date: Wed, 14 May 2025 22:49:52 -0400 Subject: Fixed #36392 -- Raised ValueError when subquery referencing composite pk selects too many columns. --- django/db/models/sql/query.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'django/db/models/sql') diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py index 4d31c36175..92a09c5840 100644 --- a/django/db/models/sql/query.py +++ b/django/db/models/sql/query.py @@ -1227,7 +1227,10 @@ class Query(BaseExpression): @property def _subquery_fields_len(self): if self.has_select_fields: - return len(self.selected) + return sum( + len(self.model._meta.pk_fields) if field == "pk" else 1 + for field in self.selected + ) return len(self.model._meta.pk_fields) def resolve_expression(self, query, *args, **kwargs): -- cgit v1.3