summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorRustam Kashapov <hardtechnik91@gmail.com>2016-05-15 12:53:16 +0300
committerTim Graham <timograham@gmail.com>2016-06-02 13:48:35 -0400
commitdf8412d2e5c95fe8c8238ebde8e0dbb68fe2ec1d (patch)
tree58495dcfbed508cc58456b44e32bf97cbbeb46a1 /docs
parent149ace94dfc10504a0e69462c7737f5ce05340a4 (diff)
Fixed #26617 -- Added distinct argument to contrib.postgres's StringAgg.
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/contrib/postgres/aggregates.txt9
-rw-r--r--docs/releases/1.11.txt4
2 files changed, 11 insertions, 2 deletions
diff --git a/docs/ref/contrib/postgres/aggregates.txt b/docs/ref/contrib/postgres/aggregates.txt
index 943b0b9373..f9b7be0fd3 100644
--- a/docs/ref/contrib/postgres/aggregates.txt
+++ b/docs/ref/contrib/postgres/aggregates.txt
@@ -61,7 +61,7 @@ General-purpose aggregation functions
``StringAgg``
-------------
-.. class:: StringAgg(expression, delimiter)
+.. class:: StringAgg(expression, delimiter, distinct=False)
Returns the input values concatenated into a string, separated by
the ``delimiter`` string.
@@ -70,6 +70,13 @@ General-purpose aggregation functions
Required argument. Needs to be a string.
+ .. attribute:: distinct
+
+ .. versionadded:: 1.11
+
+ An optional boolean argument that determines if concatenated values
+ will be distinct. Defaults to ``False``.
+
Aggregate functions for statistics
==================================
diff --git a/docs/releases/1.11.txt b/docs/releases/1.11.txt
index a2a427e7a4..9c162b41c4 100644
--- a/docs/releases/1.11.txt
+++ b/docs/releases/1.11.txt
@@ -81,7 +81,9 @@ Minor features
:mod:`django.contrib.postgres`
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-* ...
+* The new ``distinct`` argument for
+ :class:`~django.contrib.postgres.aggregates.StringAgg` determines if
+ concatenated values will be distinct.
:mod:`django.contrib.redirects`
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~