diff options
| author | Tim Graham <timograham@gmail.com> | 2014-06-17 11:57:16 -0400 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2014-06-17 12:06:12 -0400 |
| commit | aa10f57d9460f121dea2ec2635e478ed02cc18b5 (patch) | |
| tree | e788ec11791952b48a27c981d87374138d7274b3 /django/db/models/sql/query.py | |
| parent | 57a770b8e586399926311d86639c6789a1563253 (diff) | |
[1.7.x] Fixed #22819 -- Renamed output_type -> output_field in query expression API.
Thanks jorgecarleitao for the suggestion.
Backport of 95cc0e15b4 from master
Diffstat (limited to 'django/db/models/sql/query.py')
| -rw-r--r-- | django/db/models/sql/query.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py index 6421f38796..c29b08556f 100644 --- a/django/db/models/sql/query.py +++ b/django/db/models/sql/query.py @@ -1102,7 +1102,7 @@ class Query(object): raise FieldError( "Unsupported lookup '%s' for %s or join on the field not " "permitted." % - (lookup, lhs.output_type.__class__.__name__)) + (lookup, lhs.output_field.__class__.__name__)) lookups = lookups[1:] def build_filter(self, filter_expr, branch_negated=False, current_negated=False, @@ -1190,7 +1190,7 @@ class Query(object): raise FieldError( "Join on field '%s' not permitted. Did you " "misspell '%s' for the lookup type?" % - (col.output_type.name, lookups[0])) + (col.output_field.name, lookups[0])) if len(lookups) > 1: raise FieldError("Nested lookup '%s' not supported." % LOOKUP_SEP.join(lookups)) |