diff options
| author | Tim Graham <timograham@gmail.com> | 2018-11-27 10:57:26 -0500 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2018-11-27 16:26:18 -0500 |
| commit | 7e9d5a0aca23427d431a6628b0593c26d087658f (patch) | |
| tree | 89dbd634145f586e5025c04bac32b4e7f210832d | |
| parent | 5760e053758a181aafa913f7a5565d84432fa5b8 (diff) | |
[2.1.x] Fixed #29317 -- Doc'd filter argument in contrib.postgres aggregates.
Backport of 926fa7116fd633b69277c3ad9b3370ca45163231 from master.
| -rw-r--r-- | docs/ref/contrib/postgres/aggregates.txt | 5 | ||||
| -rw-r--r-- | docs/ref/models/querysets.txt | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/docs/ref/contrib/postgres/aggregates.txt b/docs/ref/contrib/postgres/aggregates.txt index 43b4e3f44b..e0575b12bc 100644 --- a/docs/ref/contrib/postgres/aggregates.txt +++ b/docs/ref/contrib/postgres/aggregates.txt @@ -16,6 +16,11 @@ These functions are described in more detail in the `PostgreSQL docs >>> SomeModel.objects.aggregate(arr=ArrayAgg('somefield')) {'arr': [0, 1, 2]} +.. admonition:: Common aggregate options + + All aggregates have the :ref:`filter <aggregate-filter>` keyword + argument. + General-purpose aggregation functions ===================================== diff --git a/docs/ref/models/querysets.txt b/docs/ref/models/querysets.txt index b98f3a340f..5b6a2f22be 100644 --- a/docs/ref/models/querysets.txt +++ b/docs/ref/models/querysets.txt @@ -3262,6 +3262,8 @@ of the return value ``output_field`` if all fields are of the same type. Otherwise, you must provide the ``output_field`` yourself. +.. _aggregate-filter: + ``filter`` ~~~~~~~~~~ |