Ticket #17497: valueslisterrormessage.diff

django/db/models/sql/query.py

@@ -1666 +1666 @@
         except MultiJoin:
             raise FieldError("Invalid field name: '%s'" % name)
         except FieldError:
-            names = opts.get_all_field_names() + self.extra.keys() + self.aggregate_select.keys()
-            names.sort()
-            raise FieldError("Cannot resolve keyword %r into field. "
-                    "Choices are: %s" % (name, ", ".join(names)))
+            if name.find(LOOKUP_SEP) != -1:
+                # For lookups spanning over relationships, show the choices 
+                # from the model on which the lookup failed 
+                raise
+            else:
+                names = opts.get_all_field_names() + self.extra.keys() + self.aggregate_select.keys()
+                names.sort()
+                raise FieldError("Cannot resolve keyword %r into field. "
+                                 "Choices are: %s" % (name, ", ".join(names)))
         self.remove_inherited_models()
 
     def add_ordering(self, *ordering):

tests/modeltests/many_to_one/tests.py

@@ -3 +3 @@
 from copy import deepcopy
 from datetime import datetime
 
-from django.core.exceptions import MultipleObjectsReturned
+from django.core.exceptions import MultipleObjectsReturned, FieldError
 from django.test import TestCase
 
 from .models import Article, Reporter
@@ -412 +412 @@
 
         # Same as each other
         self.assertTrue(r1.article_set.__class__ is r2.article_set.__class__)
+
+    def test_values_list_exception(self):
+        expected_message = "Cannot resolve keyword 'notafield' into field. Choices are: %s"
+
+        self.assertRaisesMessage(FieldError, 
+                                 expected_message % ', '.join(Reporter._meta.get_all_field_names()), 
+                                 Article.objects.values_list, 
+                                 'reporter__notafield')
+        self.assertRaisesMessage(FieldError, 
+                                 expected_message % ', '.join(['EXTRA',] + Article._meta.get_all_field_names()), 
+                                 Article.objects.extra(select={'EXTRA': 'EXTRA_SELECT'}).values_list, 
+                                 'notafield')