summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2018-11-27 10:57:26 -0500
committerTim Graham <timograham@gmail.com>2018-11-27 11:20:23 -0500
commit926fa7116fd633b69277c3ad9b3370ca45163231 (patch)
treea4e9b1ff9eb91860c514094e5893189a2490b8c7 /docs
parent7056a4dd8e10dd16eb30fb9ed997f75bd54c00bb (diff)
Fixed #29317 -- Doc'd filter argument in contrib.postgres aggregates.
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/contrib/postgres/aggregates.txt5
-rw-r--r--docs/ref/models/querysets.txt2
2 files changed, 7 insertions, 0 deletions
diff --git a/docs/ref/contrib/postgres/aggregates.txt b/docs/ref/contrib/postgres/aggregates.txt
index a605bc831c..fce85d0ade 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 6492ba8685..2f32382e1f 100644
--- a/docs/ref/models/querysets.txt
+++ b/docs/ref/models/querysets.txt
@@ -3315,6 +3315,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``
~~~~~~~~~~