mirrors/django
mirrors/django
0
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-11-29 14:46:18 +01:00
Code Issues Releases Wiki Activity

Fixed #26617 -- Added distinct argument to contrib.postgres's StringAgg.

Browse Source
This commit is contained in:
Rustam Kashapov 2016-05-15 12:53:16 +03:00 committed by Tim Graham
parent 149ace94df
commit df8412d2e5
4 changed files with 33 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,10 +32,11 @@ class BoolOr(Aggregate):
class StringAgg(Aggregate): class StringAgg(Aggregate):
function = 'STRING_AGG' function = 'STRING_AGG'
template = "%(function)s(%(expressions)s, '%(delimiter)s')" template = "%(function)s(%(distinct)s%(expressions)s, '%(delimiter)s')"
def __init__(self, expression, delimiter, **extra): def __init__(self, expression, delimiter, distinct=False, **extra):
super(StringAgg, self).__init__(expression, delimiter=delimiter, **extra) distinct = 'DISTINCT ' if distinct else ''
super(StringAgg, self).__init__(expression, delimiter=delimiter, distinct=distinct, **extra)
def convert_value(self, value, expression, connection, context): def convert_value(self, value, expression, connection, context):
if not value: if not value:

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

@ -61,7 +61,7 @@ General-purpose aggregation functions
``StringAgg`` ``StringAgg``
------------- -------------
.. class:: StringAgg(expression, delimiter) .. class:: StringAgg(expression, delimiter, distinct=False)
Returns the input values concatenated into a string, separated by Returns the input values concatenated into a string, separated by
the ``delimiter`` string. the ``delimiter`` string.
@ -70,6 +70,13 @@ General-purpose aggregation functions
Required argument. Needs to be a string. Required argument. Needs to be a string.
.. attribute:: distinct
.. versionadded:: 1.11
An optional boolean argument that determines if concatenated values
will be distinct. Defaults to ``False``.
Aggregate functions for statistics Aggregate functions for statistics
================================== ==================================

4
docs/releases/1.11.txt
View File

@ -81,7 +81,9 @@ Minor features
:mod:`django.contrib.postgres` :mod:`django.contrib.postgres`
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
* ... * The new ``distinct`` argument for
:class:`~django.contrib.postgres.aggregates.StringAgg` determines if
concatenated values will be distinct.
:mod:`django.contrib.redirects` :mod:`django.contrib.redirects`
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

18
tests/postgres_tests/test_aggregates.py
View File

@ -111,6 +111,24 @@ class TestGeneralAggregate(PostgreSQLTestCase):
self.assertEqual(values, {'stringagg': ''}) self.assertEqual(values, {'stringagg': ''})
class TestStringAggregateDistinct(PostgreSQLTestCase):
@classmethod
def setUpTestData(cls):
AggregateTestModel.objects.create(char_field='Foo')
AggregateTestModel.objects.create(char_field='Foo')
AggregateTestModel.objects.create(char_field='Bar')
def test_string_agg_distinct_false(self):
values = AggregateTestModel.objects.aggregate(stringagg=StringAgg('char_field', delimiter=' ', distinct=False))
self.assertEqual(values['stringagg'].count('Foo'), 2)
self.assertEqual(values['stringagg'].count('Bar'), 1)
def test_string_agg_distinct_true(self):
values = AggregateTestModel.objects.aggregate(stringagg=StringAgg('char_field', delimiter=' ', distinct=True))
self.assertEqual(values['stringagg'].count('Foo'), 1)
self.assertEqual(values['stringagg'].count('Bar'), 1)
class TestStatisticsAggregate(PostgreSQLTestCase): class TestStatisticsAggregate(PostgreSQLTestCase):
@classmethod @classmethod
def setUpTestData(cls): def setUpTestData(cls):