From 5f24e7158e1d5a7e40fa0ae270639f6a171bb18e Mon Sep 17 00:00:00 2001 From: Étienne Beaulé Date: Tue, 30 Jul 2019 20:08:55 +0200 Subject: Fixed #30665 -- Added support for distinct argument to Avg() and Sum(). --- docs/ref/models/querysets.txt | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) (limited to 'docs/ref') diff --git a/docs/ref/models/querysets.txt b/docs/ref/models/querysets.txt index f84097ae96..409d8f0f29 100644 --- a/docs/ref/models/querysets.txt +++ b/docs/ref/models/querysets.txt @@ -3378,7 +3378,7 @@ by the aggregate. ``Avg`` ~~~~~~~ -.. class:: Avg(expression, output_field=None, filter=None, **extra) +.. class:: Avg(expression, output_field=None, distinct=False, filter=None, **extra) Returns the mean value of the given expression, which must be numeric unless you specify a different ``output_field``. @@ -3387,6 +3387,18 @@ by the aggregate. * Return type: ``float`` if input is ``int``, otherwise same as input field, or ``output_field`` if supplied + Has one optional argument: + + .. attribute:: distinct + + If ``distinct=True``, ``Avg`` returns the mean value of unique values. + This is the SQL equivalent of ``AVG(DISTINCT )``. The default + value is ``False``. + + .. versionchanged:: 3.0 + + Support for ``distinct=True`` was added. + ``Count`` ~~~~~~~~~ @@ -3451,13 +3463,25 @@ by the aggregate. ``Sum`` ~~~~~~~ -.. class:: Sum(expression, output_field=None, filter=None, **extra) +.. class:: Sum(expression, output_field=None, distinct=False, filter=None, **extra) Computes the sum of all values of the given expression. * Default alias: ``__sum`` * Return type: same as input field, or ``output_field`` if supplied + Has one optional argument: + + .. attribute:: distinct + + If ``distinct=True``, ``Sum`` returns the sum of unique values. This is + the SQL equivalent of ``SUM(DISTINCT )``. The default value is + ``False``. + + .. versionchanged:: 3.0 + + Support for ``distinct=True`` was added. + ``Variance`` ~~~~~~~~~~~~ -- cgit v1.3