summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMads Jensen <mje@inducks.org>2016-09-26 13:16:03 +0200
committerTim Graham <timograham@gmail.com>2016-10-07 07:52:03 -0400
commit0a26f3c3388137c336fb1417ba870fde12c0fbcc (patch)
tree6267b1295ee7b8d5a4f9e24f93516e81b393216d /docs
parent52188a5ca6bafea0a66f17baacb315d61c7b99cd (diff)
Fixed #26327 -- Added JsonAgg to contrib.postgres.
Thanks Tim Graham for review.
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/contrib/postgres/aggregates.txt9
-rw-r--r--docs/releases/1.11.txt3
2 files changed, 12 insertions, 0 deletions
diff --git a/docs/ref/contrib/postgres/aggregates.txt b/docs/ref/contrib/postgres/aggregates.txt
index f9b7be0fd3..38b876c664 100644
--- a/docs/ref/contrib/postgres/aggregates.txt
+++ b/docs/ref/contrib/postgres/aggregates.txt
@@ -58,6 +58,15 @@ General-purpose aggregation functions
Returns ``True`` if at least one input value is true, ``None`` if all
values are null or if there are no values, otherwise ``False``.
+``JsonAgg``
+-----------
+
+.. class:: JsonAgg(expressions, **extra)
+
+ .. versionadded:: 1.11
+
+ Returns the input values as a ``JSON`` array.
+
``StringAgg``
-------------
diff --git a/docs/releases/1.11.txt b/docs/releases/1.11.txt
index 142eb4e9ba..f5faedd0a9 100644
--- a/docs/releases/1.11.txt
+++ b/docs/releases/1.11.txt
@@ -172,6 +172,9 @@ Minor features
operation allow using PostgreSQL's ``citext`` extension for case-insensitive
lookups.
+* The new :class:`~django.contrib.postgres.aggregates.JsonAgg` allows
+ aggregating values as a JSON array.
+
:mod:`django.contrib.redirects`
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~