Fixed #24301 -- Added PostgreSQL-specific aggregate functions

1 files changed, 43 insertions, 0 deletions

diff --git a/django/contrib/postgres/aggregates/general.py b/django/contrib/postgres/aggregates/general.py
new file mode 100644
index 0000000000..1dda69c449
--- /dev/null
+++ b/django/contrib/postgres/aggregates/general.py
@@ -0,0 +1,43 @@
+from django.db.models.aggregates import Aggregate
+
+__all__ = [
+    'ArrayAgg', 'BitAnd', 'BitOr', 'BoolAnd', 'BoolOr', 'StringAgg',
+]
+
+
+class ArrayAgg(Aggregate):
+    function = 'ARRAY_AGG'
+
+    def convert_value(self, value, expression, connection, context):
+        if not value:
+            return []
+        return value
+
+
+class BitAnd(Aggregate):
+    function = 'BIT_AND'
+
+
+class BitOr(Aggregate):
+    function = 'BIT_OR'
+
+
+class BoolAnd(Aggregate):
+    function = 'BOOL_AND'
+
+
+class BoolOr(Aggregate):
+    function = 'BOOL_OR'
+
+
+class StringAgg(Aggregate):
+    function = 'STRING_AGG'
+    template = "%(function)s(%(expressions)s, '%(delimiter)s')"
+
+    def __init__(self, expression, delimiter, **extra):
+        super(StringAgg, self).__init__(expression, delimiter=delimiter, **extra)
+
+    def convert_value(self, value, expression, connection, context):
+        if not value:
+            return ''
+        return value