upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-21 14:23:17 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

Add unit test and orderBy parameter

Browse source 
Signed-off-by: Vitor Mattos <vitor@php.rio>
This commit is contained in:
Vitor Mattos 2022-01-03 11:04:05 -03:00
parent 79b3df00f8
commit 7b9fea85b6
No known key found for this signature in database
GPG key ID: B7AB4B76A7CA7318
7 changed files with 68 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
lib/private/DB/QueryBuilder/FunctionBuilder/FunctionBuilder.php
View file

@ -27,17 +27,22 @@ use OC\DB\QueryBuilder\QueryFunction;
use OC\DB\QueryBuilder\QuoteHelper;
use OCP\DB\QueryBuilder\IFunctionBuilder;
use OCP\DB\QueryBuilder\IQueryFunction;
use OCP\IDBConnection;
class FunctionBuilder implements IFunctionBuilder {
/** @var QuoteHelper */
protected $helper;
/** @var IDBConnection */
protected $connection;
/**
* ExpressionBuilder constructor.
*
* @param QuoteHelper $helper
*/
public function __construct(QuoteHelper $helper) {
public function __construct(IDBConnection $connection, QuoteHelper $helper) {
$this->connection = $connection;
$this->helper = $helper;
}
@ -49,8 +54,14 @@ class FunctionBuilder implements IFunctionBuilder {
return new QueryFunction('CONCAT(' . $this->helper->quoteColumnName($x) . ', ' . $this->helper->quoteColumnName($y) . ')');
}
public function groupConcat($expr, ?string $separator = ','): IQueryFunction {
return new QueryFunction('GROUP_CONCAT(' . $this->helper->quoteColumnName($expr) . ')');
public function groupConcat($expr, ?string $separator = ',', ?string $orderBy = null): IQueryFunction {
if (is_null($orderBy)) {
$orderByClause = '';
} else {
$orderByClause = ' ORDER BY ' . $orderBy;
}
$separator = $this->connection->quote($separator);
return new QueryFunction('GROUP_CONCAT(' . $this->helper->quoteColumnName($expr) . $orderByClause . ' SEPARATOR ' . $separator . ')');
}
public function substring($input, $start, $length = null): IQueryFunction {

12
lib/private/DB/QueryBuilder/FunctionBuilder/OCIFunctionBuilder.php
View file

@ -73,10 +73,14 @@ class OCIFunctionBuilder extends FunctionBuilder {
return parent::least($x, $y);
}
public function groupConcat($expr, ?string $separator = ','): IQueryFunction {
if (is_null($separator)) {
return new QueryFunction('LISTAGG(' . $this->helper->quoteColumnName($expr));
public function groupConcat($expr, ?string $separator = ',', ?string $orderBy = null): IQueryFunction {
if (is_null($orderBy)) {
$orderBy = 'NULL';
}
return new QueryFunction('LISTAGG(' . $this->helper->quoteColumnName($expr) . ", '$separator')");
$orderByClause = ' WITHIN GROUP(ORDER BY ' . $orderBy . ')';
if (is_null($separator)) {
return new QueryFunction('LISTAGG(' . $this->helper->quoteColumnName($expr) . $orderByClause . ')');
}
return new QueryFunction('LISTAGG(' . $this->helper->quoteColumnName($expr) . ", '$separator')$orderByClause");
}
}

13
lib/private/DB/QueryBuilder/FunctionBuilder/PgSqlFunctionBuilder.php
View file

@ -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 {
if (is_null($separator)) {
return new QueryFunction('string_agg(' . $this->helper->quoteColumnName($expr));
public function groupConcat($expr, ?string $separator = ',', ?string $orderBy = null): IQueryFunction {
if (is_null($orderBy)) {
$orderByClause = '';
} else {
$orderByClause = ' ORDER BY ' . $orderBy;
}
return new QueryFunction('string_agg(' . $this->helper->quoteColumnName($expr) . ", '$separator')");
if (is_null($separator)) {
return new QueryFunction('string_agg(' . $this->helper->quoteColumnName($expr) . $orderByClause . ')');
}
return new QueryFunction('string_agg(' . $this->helper->quoteColumnName($expr) . ", '$separator'$orderByClause)");
}
}

5
lib/private/DB/QueryBuilder/FunctionBuilder/SqliteFunctionBuilder.php
View file

@ -31,6 +31,11 @@ class SqliteFunctionBuilder extends FunctionBuilder {
return new QueryFunction('(' . $this->helper->quoteColumnName($x) . ' || ' . $this->helper->quoteColumnName($y) . ')');
}
public function groupConcat($expr, ?string $separator = ',', ?string $orderBy = null): IQueryFunction {
$separator = $this->helper->quoteColumnName($separator);
return new QueryFunction('GROUP_CONCAT(' . $this->helper->quoteColumnName($expr) . "$separator)");
}
public function greatest($x, $y): IQueryFunction {
return new QueryFunction('MAX(' . $this->helper->quoteColumnName($x) . ', ' . $this->helper->quoteColumnName($y) . ')');
}

8
lib/private/DB/QueryBuilder/QueryBuilder.php
View file

@ -155,16 +155,16 @@ class QueryBuilder implements IQueryBuilder {
*/
public function func() {
if ($this->connection->getDatabasePlatform() instanceof OraclePlatform) {
return new OCIFunctionBuilder($this->helper);
return new OCIFunctionBuilder($this->connection, $this->helper);
}
if ($this->connection->getDatabasePlatform() instanceof SqlitePlatform) {
return new SqliteFunctionBuilder($this->helper);
return new SqliteFunctionBuilder($this->connection, $this->helper);
}
if ($this->connection->getDatabasePlatform() instanceof PostgreSQL94Platform) {
return new PgSqlFunctionBuilder($this->helper);
return new PgSqlFunctionBuilder($this->connection, $this->helper);
}
return new FunctionBuilder($this->helper);
return new FunctionBuilder($this->connection, $this->helper);
}
/**

3
lib/public/DB/QueryBuilder/IFunctionBuilder.php
View file

@ -62,10 +62,11 @@ interface IFunctionBuilder {
*
* @param string|ILiteral|IParameter|IQueryFunction $expr The expression to group
* @param string|null $separator The separator
* @param string|null $orderBy Optional SQL expression (and direction) to order the grouped rows by.
* @return IQueryFunction
* @since 24.0.0
*/
public function groupConcat($expr, ?string $separator = ','): IQueryFunction;
public function groupConcat($expr, ?string $separator = ',', ?string $orderBy = null): IQueryFunction;
/**
* Takes a substring from the input string

26
tests/lib/DB/QueryBuilder/FunctionBuilderTest.php
View file

@ -54,6 +54,32 @@ class FunctionBuilderTest extends TestCase {
$this->assertEquals('foobar', $column);
}
public function testGroupConcatWithoutSeparatorAndOrder() {
$query = $this->connection->getQueryBuilder();
$query->select($query->func()->groupConcat('appid'));
$query->from('appconfig')
->setMaxResults(1);
$result = $query->execute();
$column = $result->fetchOne();
$result->closeCursor();
$this->assertGreaterThan(1, str_getcsv($column, ','));
}
public function testGroupConcatWithSeparatorAndOrder() {
$query = $this->connection->getQueryBuilder();
$query->select($query->func()->groupConcat('appid', '#', 'appid'));
$query->from('appconfig')
->setMaxResults(1);
$result = $query->execute();
$column = $result->fetchOne();
$result->closeCursor();
$this->assertGreaterThan(1, str_getcsv($column, '#', 'appid'));
}
public function testMd5() {
$query = $this->connection->getQueryBuilder();