innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Refs #26327 -- Renamed JsonAgg to JSONBAgg. 

Thanks to Christian von Roques for the report.
This commit is contained in:
Mads Jensen 2016-11-12 21:42:20 +01:00 committed by Tim Graham
parent 6252fd6314
commit aa2cb4c622
5 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
django/contrib/postgres/aggregates/general.py
View File

@ -2,7 +2,7 @@ from django.contrib.postgres.fields import JSONField
from django.db.models.aggregates import Aggregate from django.db.models.aggregates import Aggregate
__all__ = [ __all__ = [
'ArrayAgg', 'BitAnd', 'BitOr', 'BoolAnd', 'BoolOr', 'JsonAgg', 'StringAgg', 'ArrayAgg', 'BitAnd', 'BitOr', 'BoolAnd', 'BoolOr', 'JSONBAgg', 'StringAgg',
] ]
@ -31,7 +31,7 @@ class BoolOr(Aggregate):
function = 'BOOL_OR' function = 'BOOL_OR'
class JsonAgg(Aggregate): class JSONBAgg(Aggregate):
function = 'JSONB_AGG' function = 'JSONB_AGG'
_output_field = JSONField() _output_field = JSONField()

4
django/db/backends/postgresql/features.py
View File

@ -40,3 +40,7 @@ class DatabaseFeatures(BaseDatabaseFeatures):
@cached_property @cached_property
def has_jsonb_datatype(self): def has_jsonb_datatype(self):
return self.connection.pg_version >= 90400 return self.connection.pg_version >= 90400
@cached_property
def has_jsonb_agg(self):
return self.connection.pg_version >= 90500

8
docs/ref/contrib/postgres/aggregates.txt
View File

@ -58,14 +58,14 @@ General-purpose aggregation functions
Returns ``True`` if at least one input value is true, ``None`` if all Returns ``True`` if at least one input value is true, ``None`` if all
values are null or if there are no values, otherwise ``False``. values are null or if there are no values, otherwise ``False``.
``JsonAgg`` ``JSONBAgg``
----------- ------------
.. class:: JsonAgg(expressions, **extra) .. class:: JSONBAgg(expressions, **extra)
.. versionadded:: 1.11 .. versionadded:: 1.11
Returns the input values as a ``JSON`` array. Returns the input values as a ``JSON`` array. Requires PostgreSQL ≥ 9.5.
``StringAgg`` ``StringAgg``
------------- -------------

2
docs/releases/1.11.txt
View File

@ -183,7 +183,7 @@ Minor features
operation allow using PostgreSQL's ``citext`` extension for case-insensitive operation allow using PostgreSQL's ``citext`` extension for case-insensitive
lookups. 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. aggregating values as a JSON array.
:mod:`django.contrib.redirects` :mod:`django.contrib.redirects`

10
tests/postgres_tests/test_aggregates.py
View File

@ -9,7 +9,7 @@ from .models import AggregateTestModel, StatTestModel
try: try:
from django.contrib.postgres.aggregates import ( from django.contrib.postgres.aggregates import (
ArrayAgg, BitAnd, BitOr, BoolAnd, BoolOr, Corr, CovarPop, JsonAgg, ArrayAgg, BitAnd, BitOr, BoolAnd, BoolOr, Corr, CovarPop, JSONBAgg,
RegrAvgX, RegrAvgY, RegrCount, RegrIntercept, RegrR2, RegrSlope, RegrAvgX, RegrAvgY, RegrCount, RegrIntercept, RegrR2, RegrSlope,
RegrSXX, RegrSXY, RegrSYY, StatAggregate, StringAgg, RegrSXX, RegrSXY, RegrSYY, StatAggregate, StringAgg,
) )
@ -117,14 +117,14 @@ class TestGeneralAggregate(PostgreSQLTestCase):
values = AggregateTestModel.objects.aggregate(stringagg=StringAgg('char_field', delimiter=';')) values = AggregateTestModel.objects.aggregate(stringagg=StringAgg('char_field', delimiter=';'))
self.assertEqual(values, {'stringagg': ''}) self.assertEqual(values, {'stringagg': ''})
@skipUnlessDBFeature('has_jsonb_datatype') @skipUnlessDBFeature('has_jsonb_agg')
def test_json_agg(self): def test_json_agg(self):
values = AggregateTestModel.objects.aggregate(jsonagg=JsonAgg('char_field')) values = AggregateTestModel.objects.aggregate(jsonagg=JSONBAgg('char_field'))
self.assertEqual(values, {'jsonagg': ['Foo1', 'Foo2', 'Foo3', 'Foo4']}) self.assertEqual(values, {'jsonagg': ['Foo1', 'Foo2', 'Foo3', 'Foo4']})
@skipUnlessDBFeature('has_jsonb_datatype') @skipUnlessDBFeature('has_jsonb_agg')
def test_json_agg_empty(self): def test_json_agg_empty(self):
values = AggregateTestModel.objects.none().aggregate(jsonagg=JsonAgg('integer_field')) values = AggregateTestModel.objects.none().aggregate(jsonagg=JSONBAgg('integer_field'))
self.assertEqual(values, json.loads('{"jsonagg": []}')) self.assertEqual(values, json.loads('{"jsonagg": []}'))