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 --- tests/composite_pk/test_values.py | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'tests') 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) -- cgit v1.3