summaryrefslogtreecommitdiff
path: root/django/db/models/sql
diff options
context:
space:
mode:
authorMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2008-03-21 11:42:00 +0000
committerMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2008-03-21 11:42:00 +0000
commit7388d016805c6b5416aca224b0964a8a63fa0a3f (patch)
tree9e71abfb620c659088b9d4ab115562480a22212f /django/db/models/sql
parente401ff8ff83d2435428d4ac9a89b5dfc3e67d616 (diff)
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
Diffstat (limited to 'django/db/models/sql')
-rw-r--r--django/db/models/sql/query.py5
1 files changed, 5 insertions, 0 deletions
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):
"""