p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[2.0.x] Refs #28492 -- Defined aggregates' output_field at the class level. 

Missed in 08654a99bb.

Backport of f1b713024e from master
This commit is contained in:
Simon Charette 2017-09-29 00:37:49 -04:00 committed by Tim Graham
parent 8368d5a400
commit deb3b58b36
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
django/db/models/aggregates.py
View File

@ -110,6 +110,7 @@ class Count(Aggregate):
function = 'COUNT' function = 'COUNT'
name = 'Count' name = 'Count'
template = '%(function)s(%(distinct)s%(expressions)s)' template = '%(function)s(%(distinct)s%(expressions)s)'
output_field = IntegerField()
def __init__(self, expression, distinct=False, filter=None, **extra): def __init__(self, expression, distinct=False, filter=None, **extra):
if expression == '*': if expression == '*':
@ -118,7 +119,7 @@ class Count(Aggregate):
raise ValueError('Star cannot be used with filter. Please specify a field.') raise ValueError('Star cannot be used with filter. Please specify a field.')
super().__init__( super().__init__(
expression, distinct='DISTINCT ' if distinct else '', expression, distinct='DISTINCT ' if distinct else '',
output_field=IntegerField(), filter=filter, **extra filter=filter, **extra
) )
def _get_repr_options(self): def _get_repr_options(self):
@ -141,10 +142,11 @@ class Min(Aggregate):
class StdDev(Aggregate): class StdDev(Aggregate):
name = 'StdDev' name = 'StdDev'
output_field = FloatField()
def __init__(self, expression, sample=False, **extra): def __init__(self, expression, sample=False, **extra):
self.function = 'STDDEV_SAMP' if sample else 'STDDEV_POP' self.function = 'STDDEV_SAMP' if sample else 'STDDEV_POP'
super().__init__(expression, output_field=FloatField(), **extra) super().__init__(expression, **extra)
def _get_repr_options(self): def _get_repr_options(self):
options = super()._get_repr_options() options = super()._get_repr_options()
@ -167,10 +169,11 @@ class Sum(Aggregate):
class Variance(Aggregate): class Variance(Aggregate):
name = 'Variance' name = 'Variance'
output_field = FloatField()
def __init__(self, expression, sample=False, **extra): def __init__(self, expression, sample=False, **extra):
self.function = 'VAR_SAMP' if sample else 'VAR_POP' self.function = 'VAR_SAMP' if sample else 'VAR_POP'
super().__init__(expression, output_field=FloatField(), **extra) super().__init__(expression, **extra)
def _get_repr_options(self): def _get_repr_options(self):
options = super()._get_repr_options() options = super()._get_repr_options()