diff options
author | Joas Schilling <coding@schilljs.com> | 2022-01-04 13:59:54 +0100 |
---|---|---|
committer | Joas Schilling <coding@schilljs.com> | 2022-01-04 13:59:54 +0100 |
commit | 005e717fe6d3f5bf38e65069c055b9b817a2b6ef (patch) | |
tree | 9b58f1279f2927552927d8eccc5141dd2d0b706d | |
parent | ecc92067bf6eff340bc2f6833112c0e1084e74d4 (diff) | |
download | nextcloud-server-005e717fe6d3f5bf38e65069c055b9b817a2b6ef.tar.gz nextcloud-server-005e717fe6d3f5bf38e65069c055b9b817a2b6ef.zip |
Use quote function
Signed-off-by: Joas Schilling <coding@schilljs.com>
-rw-r--r-- | lib/private/DB/QueryBuilder/FunctionBuilder/OCIFunctionBuilder.php | 8 | ||||
-rw-r--r-- | lib/public/DB/QueryBuilder/IFunctionBuilder.php | 2 |
2 files changed, 3 insertions, 7 deletions
diff --git a/lib/private/DB/QueryBuilder/FunctionBuilder/OCIFunctionBuilder.php b/lib/private/DB/QueryBuilder/FunctionBuilder/OCIFunctionBuilder.php index b2d5deffc87..3871070a583 100644 --- a/lib/private/DB/QueryBuilder/FunctionBuilder/OCIFunctionBuilder.php +++ b/lib/private/DB/QueryBuilder/FunctionBuilder/OCIFunctionBuilder.php @@ -26,7 +26,6 @@ namespace OC\DB\QueryBuilder\FunctionBuilder; use OC\DB\QueryBuilder\QueryFunction; use OCP\DB\QueryBuilder\ILiteral; use OCP\DB\QueryBuilder\IParameter; -use OCP\DB\QueryBuilder\IQueryBuilder; use OCP\DB\QueryBuilder\IQueryFunction; class OCIFunctionBuilder extends FunctionBuilder { @@ -80,10 +79,7 @@ class OCIFunctionBuilder extends FunctionBuilder { return new QueryFunction('LISTAGG(' . $this->helper->quoteColumnName($expr) . ')' . $orderByClause); } - if ($separator === '\'') { - $separator = '\'\''; - } - - return new QueryFunction('LISTAGG(' . $this->helper->quoteColumnName($expr) . ", '$separator')$orderByClause"); + $separator = $this->connection->quote($separator); + return new QueryFunction('LISTAGG(' . $this->helper->quoteColumnName($expr) . ', ' . $separator . ')' . $orderByClause); } } diff --git a/lib/public/DB/QueryBuilder/IFunctionBuilder.php b/lib/public/DB/QueryBuilder/IFunctionBuilder.php index 49be92d7852..1e8d8c89f81 100644 --- a/lib/public/DB/QueryBuilder/IFunctionBuilder.php +++ b/lib/public/DB/QueryBuilder/IFunctionBuilder.php @@ -44,7 +44,7 @@ interface IFunctionBuilder { * Combines two input strings * * @param string|ILiteral|IParameter|IQueryFunction $x The first input string - * @param string|ILiteral|IParameter|IQueryFunction $y The seccond input string + * @param string|ILiteral|IParameter|IQueryFunction $y The second input string * * @return IQueryFunction * @since 12.0.0 |