From 7388d016805c6b5416aca224b0964a8a63fa0a3f Mon Sep 17 00:00:00 2001 From: Malcolm Tredinnick Date: Fri, 21 Mar 2008 11:42:00 +0000 Subject: queryset-refactor: Added support for cross-relation values() queries when extra(select=...) was present (previously, it only worked without extra()). Also, better error reporting for values() queries with bad field names. git-svn-id: http://code.djangoproject.com/svn/django/branches/queryset-refactor@7343 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/db/models/sql/query.py | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'django/db/models/sql') diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py index 6a68448bf1..370ef357b0 100644 --- a/django/db/models/sql/query.py +++ b/django/db/models/sql/query.py @@ -1191,6 +1191,11 @@ class Query(object): self.select.append((final_alias, col)) except MultiJoin: raise FieldError("Invalid field name: '%s'" % name) + except FieldError: + names = opts.get_all_field_names() + self.extra_select.keys() + names.sort() + raise FieldError("Cannot resolve keyword %r into field. " + "Choices are: %s" % (name, ", ".join(names))) def add_ordering(self, *ordering): """ -- cgit v1.3