diff options
Diffstat (limited to 'lib/private/DB/QueryBuilder/FunctionBuilder/PgSqlFunctionBuilder.php')
-rw-r--r-- | lib/private/DB/QueryBuilder/FunctionBuilder/PgSqlFunctionBuilder.php | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/lib/private/DB/QueryBuilder/FunctionBuilder/PgSqlFunctionBuilder.php b/lib/private/DB/QueryBuilder/FunctionBuilder/PgSqlFunctionBuilder.php index a3a25b7e293..702b71e12b8 100644 --- a/lib/private/DB/QueryBuilder/FunctionBuilder/PgSqlFunctionBuilder.php +++ b/lib/private/DB/QueryBuilder/FunctionBuilder/PgSqlFunctionBuilder.php @@ -31,10 +31,15 @@ class PgSqlFunctionBuilder extends FunctionBuilder { return new QueryFunction('(' . $this->helper->quoteColumnName($x) . ' || ' . $this->helper->quoteColumnName($y) . ')'); } - public function groupConcat($expr, ?string $separator = ','): IQueryFunction { + public function groupConcat($expr, ?string $separator = ',', ?string $orderBy = null): IQueryFunction { + if (is_null($orderBy)) { + $orderByClause = ''; + } else { + $orderByClause = ' ORDER BY ' . $orderBy; + } if (is_null($separator)) { - return new QueryFunction('string_agg(' . $this->helper->quoteColumnName($expr)); + return new QueryFunction('string_agg(' . $this->helper->quoteColumnName($expr) . $orderByClause . ')'); } - return new QueryFunction('string_agg(' . $this->helper->quoteColumnName($expr) . ", '$separator')"); + return new QueryFunction('string_agg(' . $this->helper->quoteColumnName($expr) . ", '$separator'$orderByClause)"); } } |