summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMads Jensen <mje@inducks.org>2016-11-12 21:42:20 +0100
committerTim Graham <timograham@gmail.com>2016-11-28 06:57:01 -0500
commitaa2cb4c622dfd5709ba89ac3cace959202318987 (patch)
treea51596027d4e4443369e66dffd757ccdb286477e /docs
parent6252fd6314f66d2d303cc47c791ffefd27169b42 (diff)
Refs #26327 -- Renamed JsonAgg to JSONBAgg.
Thanks to Christian von Roques for the report.
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/contrib/postgres/aggregates.txt8
-rw-r--r--docs/releases/1.11.txt2
2 files changed, 5 insertions, 5 deletions
diff --git a/docs/ref/contrib/postgres/aggregates.txt b/docs/ref/contrib/postgres/aggregates.txt
index 6b5e827ab2..3939023e26 100644
--- a/docs/ref/contrib/postgres/aggregates.txt
+++ b/docs/ref/contrib/postgres/aggregates.txt
@@ -58,14 +58,14 @@ 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``
------------
+``JSONBAgg``
+------------
-.. class:: JsonAgg(expressions, **extra)
+.. class:: JSONBAgg(expressions, **extra)
.. versionadded:: 1.11
- Returns the input values as a ``JSON`` array.
+ Returns the input values as a ``JSON`` array. Requires PostgreSQL ≥ 9.5.
``StringAgg``
-------------
diff --git a/docs/releases/1.11.txt b/docs/releases/1.11.txt
index 1b301078f1..486362fe43 100644
--- a/docs/releases/1.11.txt
+++ b/docs/releases/1.11.txt
@@ -183,7 +183,7 @@ Minor features
operation allow using PostgreSQL's ``citext`` extension for case-insensitive
lookups.
-* The new :class:`~django.contrib.postgres.aggregates.JsonAgg` allows
+* The new :class:`~django.contrib.postgres.aggregates.JSONBAgg` allows
aggregating values as a JSON array.
:mod:`django.contrib.redirects`