mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #23975 from nextcloud/backport/23923/stable20 

[stable20] Fix greatest/least order for oracle
This commit is contained in:
Morris Jobke 2020-11-09 10:17:11 +01:00 committed by GitHub
parent 0624ca3527 b3dfa9290d
commit 40c4d24e31
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 77 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/private/DB/QueryBuilder/FunctionBuilder/FunctionBuilder.php
View File

@ -27,6 +27,9 @@ namespace OC\DB\QueryBuilder\FunctionBuilder;
use OC\DB\QueryBuilder\QueryFunction;
use OC\DB\QueryBuilder\QuoteHelper;
use OCP\DB\QueryBuilder\IFunctionBuilder;
use OCP\DB\QueryBuilder\ILiteral;
use OCP\DB\QueryBuilder\IParameter;
use OCP\DB\QueryBuilder\IQueryFunction;
class FunctionBuilder implements IFunctionBuilder {
/** @var QuoteHelper */
@ -87,10 +90,20 @@ class FunctionBuilder implements IFunctionBuilder {
return new QueryFunction('MIN(' . $this->helper->quoteColumnName($field) . ')');
}
/**
* @param string|ILiteral|IParameter|IQueryFunction $x
* @param string|ILiteral|IParameter|IQueryFunction $y
* @return IQueryFunction
*/
public function greatest($x, $y) {
return new QueryFunction('GREATEST(' . $this->helper->quoteColumnName($x) . ', ' . $this->helper->quoteColumnName($y) . ')');
}
/**
* @param string|ILiteral|IParameter|IQueryFunction $x
* @param string|ILiteral|IParameter|IQueryFunction $y
* @return IQueryFunction
*/
public function least($x, $y) {
return new QueryFunction('LEAST(' . $this->helper->quoteColumnName($x) . ', ' . $this->helper->quoteColumnName($y) . ')');
}

43
lib/private/DB/QueryBuilder/FunctionBuilder/OCIFunctionBuilder.php
View File

@ -24,9 +24,52 @@
namespace OC\DB\QueryBuilder\FunctionBuilder;
use OC\DB\QueryBuilder\QueryFunction;
use OCP\DB\QueryBuilder\ILiteral;
use OCP\DB\QueryBuilder\IParameter;
use OCP\DB\QueryBuilder\IQueryFunction;
class OCIFunctionBuilder extends FunctionBuilder {
public function md5($input) {
return new QueryFunction('LOWER(DBMS_OBFUSCATION_TOOLKIT.md5 (input => UTL_RAW.cast_to_raw(' . $this->helper->quoteColumnName($input) .')))');
}
/**
* As per https://docs.oracle.com/cd/B19306_01/server.102/b14200/functions060.htm
* Oracle uses the first value to cast the rest or the values. So when the
* first value is a literal, plain value or column, instead of doing the
* math, it will cast the expression to int and continue with a "0". So when
* the second parameter is a function or column, we have to put that as
* first parameter.
*
* @param string|ILiteral|IParameter|IQueryFunction $x
* @param string|ILiteral|IParameter|IQueryFunction $y
* @return IQueryFunction
*/
public function greatest($x, $y) {
if (is_string($y) || $y instanceof IQueryFunction) {
return parent::greatest($y, $x);
}
return parent::greatest($x, $y);
}
/**
* As per https://docs.oracle.com/cd/B19306_01/server.102/b14200/functions060.htm
* Oracle uses the first value to cast the rest or the values. So when the
* first value is a literal, plain value or column, instead of doing the
* math, it will cast the expression to int and continue with a "0". So when
* the second parameter is a function or column, we have to put that as
* first parameter.
*
* @param string|ILiteral|IParameter|IQueryFunction $x
* @param string|ILiteral|IParameter|IQueryFunction $y
* @return IQueryFunction
*/
public function least($x, $y) {
if (is_string($y) || $y instanceof IQueryFunction) {
return parent::least($y, $x);
}
return parent::least($x, $y);
}
}

13
lib/private/DB/QueryBuilder/FunctionBuilder/SqliteFunctionBuilder.php
View File

@ -25,16 +25,29 @@
namespace OC\DB\QueryBuilder\FunctionBuilder;
use OC\DB\QueryBuilder\QueryFunction;
use OCP\DB\QueryBuilder\ILiteral;
use OCP\DB\QueryBuilder\IParameter;
use OCP\DB\QueryBuilder\IQueryFunction;
class SqliteFunctionBuilder extends FunctionBuilder {
public function concat($x, $y) {
return new QueryFunction('(' . $this->helper->quoteColumnName($x) . ' || ' . $this->helper->quoteColumnName($y) . ')');
}
/**
* @param string|ILiteral|IParameter|IQueryFunction $x
* @param string|ILiteral|IParameter|IQueryFunction $y
* @return IQueryFunction
*/
public function greatest($x, $y) {
return new QueryFunction('MAX(' . $this->helper->quoteColumnName($x) . ', ' . $this->helper->quoteColumnName($y) . ')');
}
/**
* @param string|ILiteral|IParameter|IQueryFunction $x
* @param string|ILiteral|IParameter|IQueryFunction $y
* @return IQueryFunction
*/
public function least($x, $y) {
return new QueryFunction('MIN(' . $this->helper->quoteColumnName($x) . ', ' . $this->helper->quoteColumnName($y) . ')');
}

8
lib/private/Files/Cache/Propagator.php
View File

@ -104,9 +104,9 @@ class Propagator implements IPropagator {
$builder = $this->connection->getQueryBuilder();
$builder->update('filecache')
->set('size', $builder->func()->greatest(
$builder->createNamedParameter(-1, IQueryBuilder::PARAM_INT),
$builder->func()->add('size', $builder->createNamedParameter($sizeDifference)))
)
$builder->func()->add('size', $builder->createNamedParameter($sizeDifference)),
$builder->createNamedParameter(-1, IQueryBuilder::PARAM_INT)
))
->where($builder->expr()->eq('storage', $builder->createNamedParameter($storageId, IQueryBuilder::PARAM_INT)))
->andWhere($builder->expr()->in('path_hash', $hashParams))
->andWhere($builder->expr()->gt('size', $builder->expr()->literal(-1, IQueryBuilder::PARAM_INT)));
@ -168,7 +168,7 @@ class Propagator implements IPropagator {
$storageId = (int)$this->storage->getStorageCache()->getNumericId();
$query->update('filecache')
->set('mtime', $query->createFunction('GREATEST(' . $query->getColumnName('mtime') . ', ' . $query->createParameter('time') . ')'))
->set('mtime', $query->func()->greatest('mtime', $query->createParameter('time')))
->set('etag', $query->expr()->literal(uniqid()))
->where($query->expr()->eq('storage', $query->expr()->literal($storageId, IQueryBuilder::PARAM_INT)))
->andWhere($query->expr()->eq('path_hash', $query->createParameter('hash')));

10
lib/public/DB/QueryBuilder/IFunctionBuilder.php
View File

@ -137,9 +137,8 @@ interface IFunctionBuilder {
*
* If you want to get the maximum value of all rows in a column, use `max` instead
*
* @param mixed $x the first input field or number
* @param mixed $y the first input field or number
*
* @param string|ILiteral|IParameter|IQueryFunction $x
* @param string|ILiteral|IParameter|IQueryFunction $y
* @return IQueryFunction
* @since 18.0.0
*/
@ -150,9 +149,8 @@ interface IFunctionBuilder {
*
* If you want to get the minimum value of all rows in a column, use `min` instead
*
* @param mixed $x the first input field or number
* @param mixed $y the first input field or number
*
* @param string|ILiteral|IParameter|IQueryFunction $x
* @param string|ILiteral|IParameter|IQueryFunction $y
* @return IQueryFunction
* @since 18.0.0
*/