summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorJannis Leidel <jannis@leidel.info>2011-06-28 10:16:18 +0000
committerJannis Leidel <jannis@leidel.info>2011-06-28 10:16:18 +0000
commitdbffffa7dc95fc62cbecfd00284bde62ee796f48 (patch)
treed481cff58c0a77044407d99d0ccbe5a50004d842 /django
parentf54135fa4dc9fd45d86ea2944191d58e00725779 (diff)
Fixed #5535 -- Allow using an explicit foreign key in get() calls. Thanks, Michal Petrucha.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16473 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django')
-rw-r--r--django/db/models/sql/query.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py
index 99663b646b..110e3179d5 100644
--- a/django/db/models/sql/query.py
+++ b/django/db/models/sql/query.py
@@ -1068,8 +1068,9 @@ class Query(object):
try:
field, target, opts, join_list, last, extra_filters = self.setup_joins(
- parts, opts, alias, True, allow_many, can_reuse=can_reuse,
- negate=negate, process_extras=process_extras)
+ parts, opts, alias, True, allow_many, allow_explicit_fk=True,
+ can_reuse=can_reuse, negate=negate,
+ process_extras=process_extras)
except MultiJoin, e:
self.split_exclude(filter_expr, LOOKUP_SEP.join(parts[:e.level]),
can_reuse)