p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Refs #28643 -- Changed StdDev() to use NumericOutputFieldMixin. 

Keeps precision instead of forcing DecimalField to FloatField.
This commit is contained in:
Nick Pope 2018-12-19 23:03:42 +00:00 committed by Tim Graham
parent c690afb873
commit e85afa5943
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -141,9 +141,8 @@ class Min(Aggregate):
name = 'Min' name = 'Min'
class StdDev(Aggregate): class StdDev(NumericOutputFieldMixin, 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'

5
docs/ref/models/querysets.txt
View File

@ -3387,12 +3387,13 @@ by the aggregate.
``StdDev`` ``StdDev``
~~~~~~~~~~ ~~~~~~~~~~
.. class:: StdDev(expression, sample=False, filter=None, **extra) .. class:: StdDev(expression, output_field=None, sample=False, filter=None, **extra)
Returns the standard deviation of the data in the provided expression. Returns the standard deviation of the data in the provided expression.
* Default alias: ``<field>__stddev`` * Default alias: ``<field>__stddev``
* Return type: ``float`` * Return type: ``float`` if input is ``int``, otherwise same as input
field, or ``output_field`` if supplied
Has one optional argument: Has one optional argument:

5
docs/releases/2.2.txt
View File

@ -493,8 +493,9 @@ Miscellaneous
* :djadmin:`runserver` no longer supports `pyinotify` (replaced by Watchman). * :djadmin:`runserver` no longer supports `pyinotify` (replaced by Watchman).
* The :class:`~django.db.models.Avg` aggregate function now returns a * The :class:`~django.db.models.Avg` and :class:`~django.db.models.StdDev`
``Decimal`` instead of a ``float`` when the input is ``Decimal``. aggregate functions now return a ``Decimal`` instead of a ``float`` when the
input is ``Decimal``.
.. _deprecated-features-2.2: .. _deprecated-features-2.2:

4
tests/aggregation_regress/tests.py
View File

@ -1130,7 +1130,7 @@ class AggregationTests(TestCase):
self.assertEqual( self.assertEqual(
Book.objects.aggregate(StdDev('price')), Book.objects.aggregate(StdDev('price')),
{'price__stddev': Approximate(24.16, 2)} {'price__stddev': Approximate(Decimal('24.16'), 2)}
) )
self.assertEqual( self.assertEqual(
@ -1145,7 +1145,7 @@ class AggregationTests(TestCase):
self.assertEqual( self.assertEqual(
Book.objects.aggregate(StdDev('price', sample=True)), Book.objects.aggregate(StdDev('price', sample=True)),
{'price__stddev': Approximate(26.46, 1)} {'price__stddev': Approximate(Decimal('26.46'), 1)}
) )
self.assertEqual( self.assertEqual(