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: diff --git a/docs/releases/5.2.6.txt b/docs/releases/5.2.6.txt index c5d79894ff..69646c8e10 100644 --- a/docs/releases/5.2.6.txt +++ b/docs/releases/5.2.6.txt @@ -10,4 +10,6 @@ Django 5.2.6 fixes a security issue with severity "high" and several bugs in Bugfixes ======== -* ... +* Fixed a bug where using ``QuerySet.values()`` or ``values_list()`` with a + ``ForeignObject`` composed of multiple fields returned incorrect results + instead of tuples of the referenced fields (:ticket:`36431`). diff --git a/tests/composite_pk/test_values.py b/tests/composite_pk/test_values.py index 03a9a85496..6df8d417b5 100644 --- a/tests/composite_pk/test_values.py +++ b/tests/composite_pk/test_values.py @@ -3,7 +3,7 @@ from uuid import UUID from django.test import TestCase -from .models import Post, Tenant, User +from .models import Comment, Post, Tenant, User class CompositePKValuesTests(TestCase): @@ -210,3 +210,17 @@ class CompositePKValuesTests(TestCase): {"pk": self.user_3.pk, "id": self.user_3.id}, ), ) + + def test_foreign_object_values(self): + Comment.objects.create(id=1, user=self.user_1, integer=42) + testcases = { + "all": Comment.objects.all(), + "exclude_user_email": Comment.objects.exclude(user__email__endswith="net"), + } + for name, queryset in testcases.items(): + with self.subTest(name=name): + values = list(queryset.values("user", "integer")) + self.assertEqual( + values[0]["user"], (self.user_1.tenant_id, self.user_1.id) + ) + self.assertEqual(values[0]["integer"], 42)