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