summaryrefslogtreecommitdiff
path: root/django/contrib
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/contrib
parent61d7ae31cf286277ddefaf8006597be40388d2ee (diff)
Fixed #22819 -- Renamed output_type -> output_field in query expression API.
Thanks jorgecarleitao for the suggestion.
Diffstat (limited to 'django/contrib')
-rw-r--r--django/contrib/gis/db/models/lookups.py6
-rw-r--r--django/contrib/postgres/fields/array.py4
2 files changed, 5 insertions, 5 deletions
diff --git a/django/contrib/gis/db/models/lookups.py b/django/contrib/gis/db/models/lookups.py
index 8f803a73c1..9552881c6c 100644
--- a/django/contrib/gis/db/models/lookups.py
+++ b/django/contrib/gis/db/models/lookups.py
@@ -57,13 +57,13 @@ class GISLookup(Lookup):
if not geo_fld:
raise ValueError('No geographic field found in expression.')
self.rhs.srid = geo_fld.srid
- db_type = self.lhs.output_type.db_type(connection=connection)
- params = self.lhs.output_type.get_db_prep_lookup(
+ db_type = self.lhs.output_field.db_type(connection=connection)
+ params = self.lhs.output_field.get_db_prep_lookup(
self.lookup_name, self.rhs, connection=connection)
lhs_sql, lhs_params = self.process_lhs(qn, connection)
# lhs_params not currently supported.
assert not lhs_params
data = (lhs_sql, db_type)
spatial_sql, spatial_params = connection.ops.spatial_lookup_sql(
- data, self.lookup_name, self.rhs, self.lhs.output_type, qn)
+ data, self.lookup_name, self.rhs, self.lhs.output_field, qn)
return spatial_sql, spatial_params + params
diff --git a/django/contrib/postgres/fields/array.py b/django/contrib/postgres/fields/array.py
index 7a37267400..a33af7be64 100644
--- a/django/contrib/postgres/fields/array.py
+++ b/django/contrib/postgres/fields/array.py
@@ -195,7 +195,7 @@ class ArrayLenTransform(Transform):
lookup_name = 'len'
@property
- def output_type(self):
+ def output_field(self):
return IntegerField()
def as_sql(self, qn, connection):
@@ -218,7 +218,7 @@ class IndexTransform(Transform):
return '%s[%s]' % (lhs, self.index), params
@property
- def output_type(self):
+ def output_field(self):
return self.base_field