summaryrefslogtreecommitdiff
path: root/django/db/models/sql/datastructures.py
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2014-06-17 11:57:16 -0400
committerTim Graham <timograham@gmail.com>2014-06-17 11:57:16 -0400
commit95cc0e15b45dd0986bdfd9fa3fedee4550c744c8 (patch)
treeb6ef1a366cb8c4c76bb16a264da0b938d51a61d6 /django/db/models/sql/datastructures.py
parent61d7ae31cf286277ddefaf8006597be40388d2ee (diff)
Fixed #22819 -- Renamed output_type -> output_field in query expression API.
Thanks jorgecarleitao for the suggestion.
Diffstat (limited to 'django/db/models/sql/datastructures.py')
-rw-r--r--django/db/models/sql/datastructures.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/django/db/models/sql/datastructures.py b/django/db/models/sql/datastructures.py
index f47e25208c..f9c9c259de 100644
--- a/django/db/models/sql/datastructures.py
+++ b/django/db/models/sql/datastructures.py
@@ -12,7 +12,7 @@ class Col(object):
return "%s.%s" % (qn(self.alias), qn(self.target.column)), []
@property
- def output_type(self):
+ def output_field(self):
return self.source
def relabeled_clone(self, relabels):
@@ -22,10 +22,10 @@ class Col(object):
return [(self.alias, self.target.column)]
def get_lookup(self, name):
- return self.output_type.get_lookup(name)
+ return self.output_field.get_lookup(name)
def get_transform(self, name):
- return self.output_type.get_transform(name)
+ return self.output_field.get_transform(name)
def prepare(self):
return self