summaryrefslogtreecommitdiff
path: root/django/db/models/sql/aggregates.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 12:06:12 -0400
commitaa10f57d9460f121dea2ec2635e478ed02cc18b5 (patch)
treee788ec11791952b48a27c981d87374138d7274b3 /django/db/models/sql/aggregates.py
parent57a770b8e586399926311d86639c6789a1563253 (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/aggregates.py')
-rw-r--r--django/db/models/sql/aggregates.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/db/models/sql/aggregates.py b/django/db/models/sql/aggregates.py
index ce2968c445..8274d43621 100644
--- a/django/db/models/sql/aggregates.py
+++ b/django/db/models/sql/aggregates.py
@@ -103,7 +103,7 @@ class Aggregate(RegisterLookupMixin):
return []
@property
- def output_type(self):
+ def output_field(self):
return self.field