From b97af5e696b235876c1a1c8d8a704580f2aeabc2 Mon Sep 17 00:00:00 2001 From: Simon Charette Date: Wed, 2 Apr 2025 18:53:36 -0400 Subject: [5.2.x] Fixed #36288 -- Addressed improper handling of duplicates in values_list(). Now that selected aliases are stored in sql.Query.selected: dict[str, Any] the values_list() method must ensures that duplicate field name references are assigned unique aliases. Refs #28900. Regression in 65ad4ade74dc9208b9d686a451cd6045df0c9c3a. Thanks Claude for the report. Backport of 21f8be76d43aa1ee5ae41c1e0a428cfea1f231c1 from main. --- tests/composite_pk/test_values.py | 12 ++++++------ tests/queries/tests.py | 6 ++++++ 2 files changed, 12 insertions(+), 6 deletions(-) (limited to 'tests') diff --git a/tests/composite_pk/test_values.py b/tests/composite_pk/test_values.py index a3c7a589cc..03a9a85496 100644 --- a/tests/composite_pk/test_values.py +++ b/tests/composite_pk/test_values.py @@ -128,18 +128,18 @@ class CompositePKValuesTests(TestCase): self.assertSequenceEqual( User.objects.values_list("pk", "pk").order_by("pk"), ( - (self.user_1.pk,), - (self.user_2.pk,), - (self.user_3.pk,), + (self.user_1.pk, self.user_1.pk), + (self.user_2.pk, self.user_2.pk), + (self.user_3.pk, self.user_3.pk), ), ) with self.subTest('User.objects.values_list("pk", "id", "pk", "id")'): self.assertSequenceEqual( User.objects.values_list("pk", "id", "pk", "id").order_by("pk"), ( - (self.user_1.pk, self.user_1.id), - (self.user_2.pk, self.user_2.id), - (self.user_3.pk, self.user_3.id), + (self.user_1.pk, self.user_1.id, self.user_1.pk, self.user_1.id), + (self.user_2.pk, self.user_2.id, self.user_2.pk, self.user_2.id), + (self.user_3.pk, self.user_3.id, self.user_3.pk, self.user_3.id), ), ) diff --git a/tests/queries/tests.py b/tests/queries/tests.py index c429a93af3..38b0a5ddfa 100644 --- a/tests/queries/tests.py +++ b/tests/queries/tests.py @@ -2668,6 +2668,12 @@ class ValuesQuerysetTests(TestCase): qs = qs.values_list("num", flat=True) self.assertSequenceEqual(qs, [72]) + def test_duplicate_values_list(self): + value = Number.objects.values_list("num", "num").get() + self.assertEqual(value, (72, 72)) + value = Number.objects.values_list(F("num"), F("num")).get() + self.assertEqual(value, (72, 72)) + def test_extra_values(self): # testing for ticket 14930 issues qs = Number.objects.extra( -- cgit v1.3