diff options
| author | Carl Meyer <carl@oddbird.net> | 2011-01-25 03:14:28 +0000 |
|---|---|---|
| committer | Carl Meyer <carl@oddbird.net> | 2011-01-25 03:14:28 +0000 |
| commit | 227c5e80dbff2b731a1cba8c4dd94c00526a3e76 (patch) | |
| tree | 1b890c586370158597c5afa9109a21df7b89f861 /django/db/models/sql | |
| parent | 7c888a7aa945352193303b557cbf654957e0dd45 (diff) | |
Fixed #11319 - Added lookup support for ForeignKey.to_field. Also reverted no-longer-needed model formsets workaround for lack of such support from r10756. Thanks Russell and Alex for review.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15303 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/db/models/sql')
| -rw-r--r-- | django/db/models/sql/query.py | 7 |
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) |