mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-09-06 18:50:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fixed #24649 -- Allowed using Avg aggregate on non-numeric field types.

Browse source
This commit is contained in:
Tim Graham 2015-04-23 20:13:24 -04:00
parent 26996e2d55
commit 2d76b61dc2
7 changed files with 46 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

8
django/db/models/aggregates.py
View file

@ -75,12 +75,8 @@ class Avg(Aggregate):
name = 'Avg'
def __init__(self, expression, **extra):
super(Avg, self).__init__(expression, output_field=FloatField(), **extra)
def convert_value(self, value, expression, connection, context):
if value is None:
return value
return float(value)
output_field = extra.pop('output_field', FloatField())
super(Avg, self).__init__(expression, output_field=output_field, **extra)
class Count(Aggregate):