mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-11-07 07:15:35 +00:00
Code Issues 32 Releases Wiki Activity

Refs #26327 -- Renamed JsonAgg to JSONBAgg.

Browse Source 
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
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
__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'
class JsonAgg(Aggregate):
class JSONBAgg(Aggregate):
function = 'JSONB_AGG'
_output_field = JSONField()

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

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