summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
Diffstat (limited to 'django')
-rw-r--r--django/db/models/sql/query.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py
index ef3f5220fb..7d24701438 100644
--- a/django/db/models/sql/query.py
+++ b/django/db/models/sql/query.py
@@ -509,8 +509,10 @@ class Query(object):
pieces = name.split(LOOKUP_SEP)
if not alias:
alias = self.get_initial_alias()
- field, target, opts, joins = self.setup_joins(pieces, opts, alias,
- False)
+ result = self.setup_joins(pieces, opts, alias, False, False)
+ if isinstance(result, int):
+ raise FieldError("Cannot order by many-valued field: '%s'" % name)
+ field, target, opts, joins = result
alias = joins[-1][-1]
col = target.column