From bb7a7701b1a0e8fffe14dcebf5d5bac7f176c02a Mon Sep 17 00:00:00 2001 From: SaJH Date: Sat, 30 Aug 2025 00:45:02 +0900 Subject: Fixed #36431 -- Returned tuples for multi-column ForeignObject in values()/values_list(). Thanks Jacob Walls and Simon Charette for tests. Signed-off-by: SaJH --- django/db/models/sql/query.py | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) (limited to 'django/db/models/sql/query.py') diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py index 59d4b8f4da..e3186c4919 100644 --- a/django/db/models/sql/query.py +++ b/django/db/models/sql/query.py @@ -2269,8 +2269,21 @@ class Query(BaseExpression): join_info.joins, join_info.path, ) - for target in targets: - cols.append(join_info.transform_function(target, final_alias)) + if len(targets) > 1: + transformed_targets = [ + join_info.transform_function(target, final_alias) + for target in targets + ] + cols.append( + ColPairs( + final_alias if self.alias_cols else None, + [col.target for col in transformed_targets], + [col.output_field for col in transformed_targets], + join_info.final_field, + ) + ) + else: + cols.append(join_info.transform_function(targets[0], final_alias)) if cols: self.set_select(cols) except MultiJoin: -- cgit v1.3