diff options
| author | Marc Tamlyn <marc.tamlyn@gmail.com> | 2015-02-14 19:37:12 +0000 |
|---|---|---|
| committer | Marc Tamlyn <marc.tamlyn@gmail.com> | 2015-02-20 11:46:57 +0000 |
| commit | c54d73ae01cd787315ba030da17e266c49f386b3 (patch) | |
| tree | ca3f1ddf19fffe2be65b16c81853176571758f5d /django/db/models/sql/query.py | |
| parent | 82f39bfb1ac9a4e9c67cb26259bc689947f4c6d0 (diff) | |
[1.8.x] Fixed #24343 -- Ensure db converters are used for foreign keys.
Joint effort between myself, Josh, Anssi and Shai.
Conflicts:
django/db/models/query.py
tests/model_fields/models.py
Backport of 4755f8fc25331c739a6f932cc8aba0cc9e62e352 from master.
Diffstat (limited to 'django/db/models/sql/query.py')
| -rw-r--r-- | django/db/models/sql/query.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py index f99b58b84f..344b298688 100644 --- a/django/db/models/sql/query.py +++ b/django/db/models/sql/query.py @@ -1542,7 +1542,7 @@ class Query(object): # database from tripping over IN (...,NULL,...) selects and returning # nothing col = query.select[0] - select_field = col.field + select_field = col.target alias = col.alias if self.is_nullable(select_field): lookup_class = select_field.get_lookup('isnull') |