summaryrefslogtreecommitdiff
path: root/django/db/models/sql
diff options
context:
space:
mode:
Diffstat (limited to 'django/db/models/sql')
-rw-r--r--django/db/models/sql/query.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py
index 1c58a24d45..e028800d72 100644
--- a/django/db/models/sql/query.py
+++ b/django/db/models/sql/query.py
@@ -1364,7 +1364,12 @@ class Query(object):
table = opts.db_table
from_col = local_field.column
to_col = field.column
- target = opts.pk
+ # In case of a recursive FK, use the to_field for
+ # reverse lookups as well
+ if orig_field.model is local_field.model:
+ target = opts.get_field(field.rel.field_name)
+ else:
+ target = opts.pk
orig_opts._join_cache[name] = (table, from_col, to_col,
opts, target)