From cb13792938f2c887134eb6b5164d89f8d8f9f1bd Mon Sep 17 00:00:00 2001 From: Simon Charette Date: Sat, 25 Mar 2023 15:22:45 -0400 Subject: Fixed #34437 -- Made values() resolving error mention selected annotations. While the add_fields() call from set_values() does trigger validation it does so after annotations are masked resulting in them being excluded from the choices of valid options surfaced through a FieldError. --- tests/annotations/tests.py | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'tests/annotations') diff --git a/tests/annotations/tests.py b/tests/annotations/tests.py index e0cdbf1e0b..f1260b4192 100644 --- a/tests/annotations/tests.py +++ b/tests/annotations/tests.py @@ -33,6 +33,7 @@ from django.db.models.functions import ( Lower, Trim, ) +from django.db.models.sql.query import get_field_names_from_opts from django.test import TestCase, skipUnlessDBFeature from django.test.utils import register_lookup @@ -465,6 +466,16 @@ class NonAggregateAnnotationTestCase(TestCase): ) ) + def test_values_wrong_annotation(self): + expected_message = ( + "Cannot resolve keyword 'annotation_typo' into field. Choices are: %s" + ) + article_fields = ", ".join( + ["annotation"] + sorted(get_field_names_from_opts(Book._meta)) + ) + with self.assertRaisesMessage(FieldError, expected_message % article_fields): + Book.objects.annotate(annotation=Value(1)).values_list("annotation_typo") + def test_decimal_annotation(self): salary = Decimal(10) ** -Employee._meta.get_field("salary").decimal_places Employee.objects.create( -- cgit v1.3