Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed #17497 -- Corrected FieldError message in add_fields()

The erroneous message was user visible in values_list() calls.

Thanks to ojii for report and review, and to antoviaque for the patch.
  • Loading branch information...
commit fcad6c48f07bdc6346c065849a87f0f02afb6f94 1 parent aeda55e
@akaariai akaariai authored
View
13 django/db/models/sql/query.py
@@ -1655,10 +1655,15 @@ def add_fields(self, field_names, allow_m2m=True):
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 error
+ # from the model on which the lookup failed.
+ raise
+ else:
+ names = sorted(opts.get_all_field_names() + self.extra.keys()
+ + self.aggregate_select.keys())
+ raise FieldError("Cannot resolve keyword %r into field. "
+ "Choices are: %s" % (name, ", ".join(names)))
self.remove_inherited_models()
def add_ordering(self, *ordering):
View
14 tests/modeltests/many_to_one/tests.py
@@ -3,7 +3,7 @@
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 django.utils.translation import ugettext_lazy
@@ -424,3 +424,15 @@ def test_create_relation_with_ugettext_lazy(self):
notlazy = unicode(lazy)
article = reporter.article_set.get()
self.assertEqual(article.headline, notlazy)
+
+ 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')
Please sign in to comment.
Something went wrong with that request. Please try again.