upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-25 16:19:06 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 33

Merge pull request #31696 from nextcloud/fix/user_ldap-fix-migration-lengthcheck-oracle

Browse source 
Use getLengthExpression to measure field length instead of like
This commit is contained in:
Côme Chilliet 2022-03-29 09:38:21 +02:00 committed by GitHub
commit 4a4f250a2b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 105 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/user_ldap/lib/Migration/Version1120Date20210917155206.php
View file

@ -129,7 +129,7 @@ class Version1120Date20210917155206 extends SimpleMigrationStep {
$qb = $this->dbc->getQueryBuilder();
$qb->select('owncloud_name', 'directory_uuid')
->from($table)
->where($qb->expr()->like('owncloud_name', $qb->createNamedParameter(str_repeat('_', 65) . '%'), Types::STRING));
->where($qb->expr()->gt($qb->func()->octetLength('owncloud_name'), '64', IQueryBuilder::PARAM_INT));
return $qb;
}

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

@ -94,6 +94,18 @@ class FunctionBuilder implements IFunctionBuilder {
return new QueryFunction('COUNT(' . $quotedName . ')' . $alias);
}
public function octetLength($field, $alias = ''): IQueryFunction {
$alias = $alias ? (' AS ' . $this->helper->quoteColumnName($alias)) : '';
$quotedName = $this->helper->quoteColumnName($field);
return new QueryFunction('OCTET_LENGTH(' . $quotedName . ')' . $alias);
}
public function charLength($field, $alias = ''): IQueryFunction {
$alias = $alias ? (' AS ' . $this->helper->quoteColumnName($alias)) : '';
$quotedName = $this->helper->quoteColumnName($field);
return new QueryFunction('CHAR_LENGTH(' . $quotedName . ')' . $alias);
}
public function max($field): IQueryFunction {
return new QueryFunction('MAX(' . $this->helper->quoteColumnName($field) . ')');
}

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

@ -91,4 +91,16 @@ class OCIFunctionBuilder extends FunctionBuilder {
$separator = $this->connection->quote($separator);
return new QueryFunction('LISTAGG(' . $this->helper->quoteColumnName($expr) . ', ' . $separator . ')' . $orderByClause);
}
public function octetLength($field, $alias = ''): IQueryFunction {
$alias = $alias ? (' AS ' . $this->helper->quoteColumnName($alias)) : '';
$quotedName = $this->helper->quoteColumnName($field);
return new QueryFunction('LENGTHB(' . $quotedName . ')' . $alias);
}
public function charLength($field, $alias = ''): IQueryFunction {
$alias = $alias ? (' AS ' . $this->helper->quoteColumnName($alias)) : '';
$quotedName = $this->helper->quoteColumnName($field);
return new QueryFunction('LENGTH(' . $quotedName . ')' . $alias);
}
}

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

@ -48,4 +48,16 @@ class SqliteFunctionBuilder extends FunctionBuilder {
public function least($x, $y): IQueryFunction {
return new QueryFunction('MIN(' . $this->helper->quoteColumnName($x) . ', ' . $this->helper->quoteColumnName($y) . ')');
}
public function octetLength($field, $alias = ''): IQueryFunction {
$alias = $alias ? (' AS ' . $this->helper->quoteColumnName($alias)) : '';
$quotedName = $this->helper->quoteColumnName($field);
return new QueryFunction('LENGTH(CAST(' . $quotedName . ' as BLOB))' . $alias);
}
public function charLength($field, $alias = ''): IQueryFunction {
$alias = $alias ? (' AS ' . $this->helper->quoteColumnName($alias)) : '';
$quotedName = $this->helper->quoteColumnName($field);
return new QueryFunction('LENGTH(' . $quotedName . ')' . $alias);
}
}

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

@ -123,6 +123,24 @@ interface IFunctionBuilder {
*/
public function count($count = '', $alias = ''): IQueryFunction;
/**
* @param string|ILiteral|IParameter|IQueryFunction $field The input to be measured
* @param string $alias Alias for the length
*
* @return IQueryFunction
* @since 24.0.0
*/
public function octetLength($field, $alias = ''): IQueryFunction;
/**
* @param string|ILiteral|IParameter|IQueryFunction $field The input to be measured
* @param string $alias Alias for the length
*
* @return IQueryFunction
* @since 24.0.0
*/
public function charLength($field, $alias = ''): IQueryFunction;
/**
* Takes the maximum of all rows in a column
*

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

@ -336,6 +336,56 @@ class FunctionBuilderTest extends TestCase {
$this->assertGreaterThan(1, $column);
}
public function octetLengthProvider() {
return [
['', 0],
['foobar', 6],
['fé', 3],
['šđčćž', 10],
];
}
/**
* @dataProvider octetLengthProvider
*/
public function testOctetLength(string $str, int $bytes) {
$query = $this->connection->getQueryBuilder();
$query->select($query->func()->octetLength($query->createNamedParameter($str, IQueryBuilder::PARAM_STR)));
$query->from('appconfig')
->setMaxResults(1);
$result = $query->execute();
$column = $result->fetchOne();
$result->closeCursor();
$this->assertEquals($bytes, $column);
}
public function charLengthProvider() {
return [
['', 0],
['foobar', 6],
['fé', 2],
['šđčćž', 5],
];
}
/**
* @dataProvider charLengthProvider
*/
public function testCharLength(string $str, int $bytes) {
$query = $this->connection->getQueryBuilder();
$query->select($query->func()->charLength($query->createNamedParameter($str, IQueryBuilder::PARAM_STR)));
$query->from('appconfig')
->setMaxResults(1);
$result = $query->execute();
$column = $result->fetchOne();
$result->closeCursor();
$this->assertEquals($bytes, $column);
}
private function setUpMinMax($value) {
$query = $this->connection->getQueryBuilder();