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

Fix Oracle comparisons

This commit is contained in:
Joas Schilling 2016-01-26 11:27:35 +01:00
parent bd444ae3c3
commit 7514695399
4 changed files with 312 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
lib/private/db/querybuilder/expressionbuilder.php
View File

@ -86,12 +86,14 @@ class ExpressionBuilder implements IExpressionBuilder {
* Creates a comparison expression.
*
* @param mixed $x The left expression.
* @param string $operator One of the ExpressionBuilder::* constants.
* @param string $operator One of the IExpressionBuilder::* constants.
* @param mixed $y The right expression.
* @param mixed|null $type one of the IQueryBuilder::PARAM_* constants
* required when comparing text fields for oci compatibility
*
* @return string
*/
public function comparison($x, $operator, $y) {
public function comparison($x, $operator, $y, $type = null) {
$x = $this->helper->quoteColumnName($x);
$y = $this->helper->quoteColumnName($y);
return $this->expressionBuilder->comparison($x, $operator, $y);
@ -109,7 +111,7 @@ class ExpressionBuilder implements IExpressionBuilder {
*
* @param mixed $x The left expression.
* @param mixed $y The right expression.
* @param int|null $type one of the IQueryBuilder::PARAM_* constants
* @param mixed|null $type one of the IQueryBuilder::PARAM_* constants
* required when comparing text fields for oci compatibility
*
* @return string
@ -131,10 +133,12 @@ class ExpressionBuilder implements IExpressionBuilder {
*
* @param mixed $x The left expression.
* @param mixed $y The right expression.
* @param mixed|null $type one of the IQueryBuilder::PARAM_* constants
* required when comparing text fields for oci compatibility
*
* @return string
*/
public function neq($x, $y) {
public function neq($x, $y, $type = null) {
$x = $this->helper->quoteColumnName($x);
$y = $this->helper->quoteColumnName($y);
return $this->expressionBuilder->neq($x, $y);
@ -151,10 +155,12 @@ class ExpressionBuilder implements IExpressionBuilder {
*
* @param mixed $x The left expression.
* @param mixed $y The right expression.
* @param mixed|null $type one of the IQueryBuilder::PARAM_* constants
* required when comparing text fields for oci compatibility
*
* @return string
*/
public function lt($x, $y) {
public function lt($x, $y, $type = null) {
$x = $this->helper->quoteColumnName($x);
$y = $this->helper->quoteColumnName($y);
return $this->expressionBuilder->lt($x, $y);
@ -171,10 +177,12 @@ class ExpressionBuilder implements IExpressionBuilder {
*
* @param mixed $x The left expression.
* @param mixed $y The right expression.
* @param mixed|null $type one of the IQueryBuilder::PARAM_* constants
* required when comparing text fields for oci compatibility
*
* @return string
*/
public function lte($x, $y) {
public function lte($x, $y, $type = null) {
$x = $this->helper->quoteColumnName($x);
$y = $this->helper->quoteColumnName($y);
return $this->expressionBuilder->lte($x, $y);
@ -191,10 +199,12 @@ class ExpressionBuilder implements IExpressionBuilder {
*
* @param mixed $x The left expression.
* @param mixed $y The right expression.
* @param mixed|null $type one of the IQueryBuilder::PARAM_* constants
* required when comparing text fields for oci compatibility
*
* @return string
*/
public function gt($x, $y) {
public function gt($x, $y, $type = null) {
$x = $this->helper->quoteColumnName($x);
$y = $this->helper->quoteColumnName($y);
return $this->expressionBuilder->gt($x, $y);
@ -211,10 +221,12 @@ class ExpressionBuilder implements IExpressionBuilder {
*
* @param mixed $x The left expression.
* @param mixed $y The right expression.
* @param mixed|null $type one of the IQueryBuilder::PARAM_* constants
* required when comparing text fields for oci compatibility
*
* @return string
*/
public function gte($x, $y) {
public function gte($x, $y, $type = null) {
$x = $this->helper->quoteColumnName($x);
$y = $this->helper->quoteColumnName($y);
return $this->expressionBuilder->gte($x, $y);
@ -249,10 +261,12 @@ class ExpressionBuilder implements IExpressionBuilder {
*
* @param string $x Field in string format to be inspected by LIKE() comparison.
* @param mixed $y Argument to be used in LIKE() comparison.
* @param mixed|null $type one of the IQueryBuilder::PARAM_* constants
* required when comparing text fields for oci compatibility
*
* @return string
*/
public function like($x, $y) {
public function like($x, $y, $type = null) {
$x = $this->helper->quoteColumnName($x);
$y = $this->helper->quoteColumnName($y);
return $this->expressionBuilder->like($x, $y);
@ -263,10 +277,12 @@ class ExpressionBuilder implements IExpressionBuilder {
*
* @param string $x Field in string format to be inspected by NOT LIKE() comparison.
* @param mixed $y Argument to be used in NOT LIKE() comparison.
* @param mixed|null $type one of the IQueryBuilder::PARAM_* constants
* required when comparing text fields for oci compatibility
*
* @return string
*/
public function notLike($x, $y) {
public function notLike($x, $y, $type = null) {
$x = $this->helper->quoteColumnName($x);
$y = $this->helper->quoteColumnName($y);
return $this->expressionBuilder->notLike($x, $y);
@ -277,10 +293,12 @@ class ExpressionBuilder implements IExpressionBuilder {
*
* @param string $x The field in string format to be inspected by IN() comparison.
* @param string|array $y The placeholder or the array of values to be used by IN() comparison.
* @param mixed|null $type one of the IQueryBuilder::PARAM_* constants
* required when comparing text fields for oci compatibility
*
* @return string
*/
public function in($x, $y) {
public function in($x, $y, $type = null) {
$x = $this->helper->quoteColumnName($x);
$y = $this->helper->quoteColumnNames($y);
return $this->expressionBuilder->in($x, $y);
@ -291,10 +309,12 @@ class ExpressionBuilder implements IExpressionBuilder {
*
* @param string $x The field in string format to be inspected by NOT IN() comparison.
* @param string|array $y The placeholder or the array of values to be used by NOT IN() comparison.
* @param mixed|null $type one of the IQueryBuilder::PARAM_* constants
* required when comparing text fields for oci compatibility
*
* @return string
*/
public function notIn($x, $y) {
public function notIn($x, $y, $type = null) {
$x = $this->helper->quoteColumnName($x);
$y = $this->helper->quoteColumnNames($y);
return $this->expressionBuilder->notIn($x, $y);
@ -304,7 +324,7 @@ class ExpressionBuilder implements IExpressionBuilder {
* Quotes a given input parameter.
*
* @param mixed $input The parameter to be quoted.
* @param string|null $type The type of the parameter.
* @param mixed|null $type One of the IQueryBuilder::PARAM_* constants
*
* @return Literal
*/

169
lib/private/db/querybuilder/ociexpressionbuilder.php
View File

@ -21,15 +21,180 @@
namespace OC\DB\QueryBuilder;
use OCP\DB\QueryBuilder\ILiteral;
use OCP\DB\QueryBuilder\IParameter;
use OCP\DB\QueryBuilder\IQueryBuilder;
class OCIExpressionBuilder extends ExpressionBuilder {
public function eq($x, $y, $type = null) {
/**
* @inheritdoc
*/
public function comparison($x, $operator, $y, $type = null) {
$x = $this->helper->quoteColumnName($x);
$y = $this->helper->quoteColumnName($y);
if ($type === IQueryBuilder::PARAM_STR) {
$x = new QueryFunction('to_char(' . $x . ')');
}
if ($type === IQueryBuilder::PARAM_STR && !($y instanceof IParameter) && !($y instanceof ILiteral)) {
$y = $this->helper->quoteColumnName($y);
$y = new QueryFunction('to_char(' . $y . ')');
} else {
$y = $this->helper->quoteColumnName($y);
}
return $this->expressionBuilder->comparison($x, $operator, $y);
}
/**
* @inheritdoc
*/
public function eq($x, $y, $type = null) {
$x = $this->helper->quoteColumnName($x);
if ($type === IQueryBuilder::PARAM_STR) {
$x = new QueryFunction('to_char(' . $x . ')');
}
if ($type === IQueryBuilder::PARAM_STR && !($y instanceof IParameter) && !($y instanceof ILiteral)) {
$y = $this->helper->quoteColumnName($y);
$y = new QueryFunction('to_char(' . $y . ')');
} else {
$y = $this->helper->quoteColumnName($y);
}
return $this->expressionBuilder->eq($x, $y);
}
/**
* @inheritdoc
*/
public function neq($x, $y, $type = null) {
$x = $this->helper->quoteColumnName($x);
if ($type === IQueryBuilder::PARAM_STR) {
$x = new QueryFunction('to_char(' . $x . ')');
}
if ($type === IQueryBuilder::PARAM_STR && !($y instanceof IParameter) && !($y instanceof ILiteral)) {
$y = $this->helper->quoteColumnName($y);
$y = new QueryFunction('to_char(' . $y . ')');
} else {
$y = $this->helper->quoteColumnName($y);
}
return $this->expressionBuilder->neq($x, $y);
}
/**
* @inheritdoc
*/
public function lt($x, $y, $type = null) {
$x = $this->helper->quoteColumnName($x);
if ($type === IQueryBuilder::PARAM_STR) {
$x = new QueryFunction('to_char(' . $x . ')');
}
if ($type === IQueryBuilder::PARAM_STR && !($y instanceof IParameter) && !($y instanceof ILiteral)) {
$y = $this->helper->quoteColumnName($y);
$y = new QueryFunction('to_char(' . $y . ')');
} else {
$y = $this->helper->quoteColumnName($y);
}
return $this->expressionBuilder->lt($x, $y);
}
/**
* @inheritdoc
*/
public function lte($x, $y, $type = null) {
$x = $this->helper->quoteColumnName($x);
if ($type === IQueryBuilder::PARAM_STR) {
$x = new QueryFunction('to_char(' . $x . ')');
}
if ($type === IQueryBuilder::PARAM_STR && !($y instanceof IParameter) && !($y instanceof ILiteral)) {
$y = $this->helper->quoteColumnName($y);
$y = new QueryFunction('to_char(' . $y . ')');
} else {
$y = $this->helper->quoteColumnName($y);
}
return $this->expressionBuilder->lte($x, $y);
}
/**
* @inheritdoc
*/
public function gt($x, $y, $type = null) {
$x = $this->helper->quoteColumnName($x);
if ($type === IQueryBuilder::PARAM_STR) {
$x = new QueryFunction('to_char(' . $x . ')');
}
if ($type === IQueryBuilder::PARAM_STR && !($y instanceof IParameter) && !($y instanceof ILiteral)) {
$y = $this->helper->quoteColumnName($y);
$y = new QueryFunction('to_char(' . $y . ')');
} else {
$y = $this->helper->quoteColumnName($y);
}
return $this->expressionBuilder->gt($x, $y);
}
/**
* @inheritdoc
*/
public function gte($x, $y, $type = null) {
$x = $this->helper->quoteColumnName($x);
if ($type === IQueryBuilder::PARAM_STR) {
$x = new QueryFunction('to_char(' . $x . ')');
}
if ($type === IQueryBuilder::PARAM_STR && !($y instanceof IParameter) && !($y instanceof ILiteral)) {
$y = $this->helper->quoteColumnName($y);
$y = new QueryFunction('to_char(' . $y . ')');
} else {
$y = $this->helper->quoteColumnName($y);
}
return $this->expressionBuilder->gte($x, $y);
}
/**
* @inheritdoc
*/
public function in($x, $y, $type = null) {
$x = $this->helper->quoteColumnName($x);
if ($type === IQueryBuilder::PARAM_STR) {
$x = new QueryFunction('to_char(' . $x . ')');
}
if ($type === IQueryBuilder::PARAM_STR && !is_array($y) && !($y instanceof IParameter) && !($y instanceof ILiteral)) {
$y = $this->helper->quoteColumnName($y);
$y = new QueryFunction('to_char(' . $y . ')');
} else {
$y = $this->helper->quoteColumnNames($y);
}
return $this->expressionBuilder->in($x, $y);
}
/**
* @inheritdoc
*/
public function notIn($x, $y, $type = null) {
$x = $this->helper->quoteColumnName($x);
if ($type === IQueryBuilder::PARAM_STR) {
$x = new QueryFunction('to_char(' . $x . ')');
}
if ($type === IQueryBuilder::PARAM_STR && !is_array($y) && !($y instanceof IParameter) && !($y instanceof ILiteral)) {
$y = $this->helper->quoteColumnName($y);
$y = new QueryFunction('to_char(' . $y . ')');
} else {
$y = $this->helper->quoteColumnNames($y);
}
return $this->expressionBuilder->notIn($x, $y);
}
}

98
lib/public/db/querybuilder/iexpressionbuilder.php
View File

@ -21,11 +21,39 @@
namespace OCP\DB\QueryBuilder;
use Doctrine\DBAL\Query\Expression\ExpressionBuilder;
/**
* This class provides a wrapper around Doctrine's ExpressionBuilder
* @since 8.2.0
*/
interface IExpressionBuilder {
/**
* @since 9.0.0
*/
const EQ = ExpressionBuilder::EQ;
/**
* @since 9.0.0
*/
const NEQ = ExpressionBuilder::NEQ;
/**
* @since 9.0.0
*/
const LT = ExpressionBuilder::LT;
/**
* @since 9.0.0
*/
const LTE = ExpressionBuilder::LTE;
/**
* @since 9.0.0
*/
const GT = ExpressionBuilder::GT;
/**
* @since 9.0.0
*/
const GTE = ExpressionBuilder::GTE;
/**
* Creates a conjunction of the given boolean expressions.
*
@ -64,13 +92,15 @@ interface IExpressionBuilder {
* Creates a comparison expression.
*
* @param mixed $x The left expression.
* @param string $operator One of the ExpressionBuilder::* constants.
* @param string $operator One of the IExpressionBuilder::* constants.
* @param mixed $y The right expression.
* @param mixed|null $type one of the IQueryBuilder::PARAM_* constants
* required when comparing text fields for oci compatibility
*
* @return string
* @since 8.2.0
* @since 8.2.0 - Parameter $type was added in 9.0.0
*/
public function comparison($x, $operator, $y);
public function comparison($x, $operator, $y, $type = null);
/**
* Creates an equality comparison expression with the given arguments.
@ -84,11 +114,11 @@ interface IExpressionBuilder {
*
* @param mixed $x The left expression.
* @param mixed $y The right expression.
* @param int|null $type @since 9.0.0 one of the IQueryBuilder::PARAM_* constants
* required when comparing text fields for oci compatibility.
* @param mixed|null $type one of the IQueryBuilder::PARAM_* constants
* required when comparing text fields for oci compatibility
*
* @return string
* @since 8.2.0
* @since 8.2.0 - Parameter $type was added in 9.0.0
*/
public function eq($x, $y, $type = null);
@ -103,11 +133,13 @@ interface IExpressionBuilder {
*
* @param mixed $x The left expression.
* @param mixed $y The right expression.
* @param mixed|null $type one of the IQueryBuilder::PARAM_* constants
* required when comparing text fields for oci compatibility
*
* @return string
* @since 8.2.0
* @since 8.2.0 - Parameter $type was added in 9.0.0
*/
public function neq($x, $y);
public function neq($x, $y, $type = null);
/**
* Creates a lower-than comparison expression with the given arguments.
@ -120,11 +152,13 @@ interface IExpressionBuilder {
*
* @param mixed $x The left expression.
* @param mixed $y The right expression.
* @param mixed|null $type one of the IQueryBuilder::PARAM_* constants
* required when comparing text fields for oci compatibility
*
* @return string
* @since 8.2.0
* @since 8.2.0 - Parameter $type was added in 9.0.0
*/
public function lt($x, $y);
public function lt($x, $y, $type = null);
/**
* Creates a lower-than-equal comparison expression with the given arguments.
@ -137,11 +171,13 @@ interface IExpressionBuilder {
*
* @param mixed $x The left expression.
* @param mixed $y The right expression.
* @param mixed|null $type one of the IQueryBuilder::PARAM_* constants
* required when comparing text fields for oci compatibility
*
* @return string
* @since 8.2.0
* @since 8.2.0 - Parameter $type was added in 9.0.0
*/
public function lte($x, $y);
public function lte($x, $y, $type = null);
/**
* Creates a greater-than comparison expression with the given arguments.
@ -154,11 +190,13 @@ interface IExpressionBuilder {
*
* @param mixed $x The left expression.
* @param mixed $y The right expression.
* @param mixed|null $type one of the IQueryBuilder::PARAM_* constants
* required when comparing text fields for oci compatibility
*
* @return string
* @since 8.2.0
* @since 8.2.0 - Parameter $type was added in 9.0.0
*/
public function gt($x, $y);
public function gt($x, $y, $type = null);
/**
* Creates a greater-than-equal comparison expression with the given arguments.
@ -171,11 +209,13 @@ interface IExpressionBuilder {
*
* @param mixed $x The left expression.
* @param mixed $y The right expression.
* @param mixed|null $type one of the IQueryBuilder::PARAM_* constants
* required when comparing text fields for oci compatibility
*
* @return string
* @since 8.2.0
* @since 8.2.0 - Parameter $type was added in 9.0.0
*/
public function gte($x, $y);
public function gte($x, $y, $type = null);
/**
* Creates an IS NULL expression with the given arguments.
@ -202,50 +242,58 @@ interface IExpressionBuilder {
*
* @param string $x Field in string format to be inspected by LIKE() comparison.
* @param mixed $y Argument to be used in LIKE() comparison.
* @param mixed|null $type one of the IQueryBuilder::PARAM_* constants
* required when comparing text fields for oci compatibility
*
* @return string
* @since 8.2.0
* @since 8.2.0 - Parameter $type was added in 9.0.0
*/
public function like($x, $y);
public function like($x, $y, $type = null);
/**
* Creates a NOT LIKE() comparison expression with the given arguments.
*
* @param string $x Field in string format to be inspected by NOT LIKE() comparison.
* @param mixed $y Argument to be used in NOT LIKE() comparison.
* @param mixed|null $type one of the IQueryBuilder::PARAM_* constants
* required when comparing text fields for oci compatibility
*
* @return string
* @since 8.2.0
* @since 8.2.0 - Parameter $type was added in 9.0.0
*/
public function notLike($x, $y);
public function notLike($x, $y, $type = null);
/**
* Creates a IN () comparison expression with the given arguments.
*
* @param string $x The field in string format to be inspected by IN() comparison.
* @param string|array $y The placeholder or the array of values to be used by IN() comparison.
* @param mixed|null $type one of the IQueryBuilder::PARAM_* constants
* required when comparing text fields for oci compatibility
*
* @return string
* @since 8.2.0
* @since 8.2.0 - Parameter $type was added in 9.0.0
*/
public function in($x, $y);
public function in($x, $y, $type = null);
/**
* Creates a NOT IN () comparison expression with the given arguments.
*
* @param string $x The field in string format to be inspected by NOT IN() comparison.
* @param string|array $y The placeholder or the array of values to be used by NOT IN() comparison.
* @param mixed|null $type one of the IQueryBuilder::PARAM_* constants
* required when comparing text fields for oci compatibility
*
* @return string
* @since 8.2.0
* @since 8.2.0 - Parameter $type was added in 9.0.0
*/
public function notIn($x, $y);
public function notIn($x, $y, $type = null);
/**
* Quotes a given input parameter.
*
* @param mixed $input The parameter to be quoted.
* @param string|null $type The type of the parameter.
* @param mixed|null $type One of the IQueryBuilder::PARAM_* constants
*
* @return string
* @since 8.2.0

56
tests/lib/db/querybuilder/expressionbuildertest.php
View File

@ -350,16 +350,26 @@ class ExpressionBuilderTest extends TestCase {
public function dataClobComparisons() {
return [
['eq', '1', IQueryBuilder::PARAM_STR, 1],
['neq', '1', IQueryBuilder::PARAM_STR, 2],
['lt', '2', IQueryBuilder::PARAM_STR, 1],
['lte', '2', IQueryBuilder::PARAM_STR, 2],
['gt', '2', IQueryBuilder::PARAM_STR, 1],
['gte', '2', IQueryBuilder::PARAM_STR, 2],
['like', '%2%', IQueryBuilder::PARAM_STR, 1],
['notLike', '%2%', IQueryBuilder::PARAM_STR, 2],
['in', ['2'], IQueryBuilder::PARAM_STR_ARRAY, 1],
['notIn', ['2'], IQueryBuilder::PARAM_STR_ARRAY, 2],
['eq', '5', IQueryBuilder::PARAM_STR, false, 3],
['eq', '5', IQueryBuilder::PARAM_STR, true, 1],
['neq', '5', IQueryBuilder::PARAM_STR, false, 6],
['neq', '5', IQueryBuilder::PARAM_STR, true, 4],
['lt', '5', IQueryBuilder::PARAM_STR, false, 3],
['lt', '5', IQueryBuilder::PARAM_STR, true, 1],
['lte', '5', IQueryBuilder::PARAM_STR, false, 6],
['lte', '5', IQueryBuilder::PARAM_STR, true, 4],
['gt', '5', IQueryBuilder::PARAM_STR, false, 3],
['gt', '5', IQueryBuilder::PARAM_STR, true, 1],
['gte', '5', IQueryBuilder::PARAM_STR, false, 6],
['gte', '5', IQueryBuilder::PARAM_STR, true, 4],
['like', '%5%', IQueryBuilder::PARAM_STR, false, 3],
['like', '%5%', IQueryBuilder::PARAM_STR, true, 1],
['notLike', '%5%', IQueryBuilder::PARAM_STR, false, 6],
['notLike', '%5%', IQueryBuilder::PARAM_STR, true, 4],
['in', ['5'], IQueryBuilder::PARAM_STR_ARRAY, false, 3],
['in', ['5'], IQueryBuilder::PARAM_STR_ARRAY, true, 1],
['notIn', ['5'], IQueryBuilder::PARAM_STR_ARRAY, false, 6],
['notIn', ['5'], IQueryBuilder::PARAM_STR_ARRAY, true, 4],
];
}
@ -368,19 +378,31 @@ class ExpressionBuilderTest extends TestCase {
* @param string $function
* @param mixed $value
* @param mixed $type
* @param bool $compareKeyToValue
* @param int $expected
*/
public function testClobComparisons($function, $value, $type, $expected) {
public function testClobComparisons($function, $value, $type, $compareKeyToValue, $expected) {
$appId = $this->getUniqueID('testing');
$this->createConfig($appId, 1);
$this->createConfig($appId, 2);
$this->createConfig($appId, 3);
$this->createConfig($appId, 1, 4);
$this->createConfig($appId, 2, 5);
$this->createConfig($appId, 3, 6);
$this->createConfig($appId, 4, 4);
$this->createConfig($appId, 5, 5);
$this->createConfig($appId, 6, 6);
$this->createConfig($appId, 7, 4);
$this->createConfig($appId, 8, 5);
$this->createConfig($appId, 9, 6);
$query = $this->connection->getQueryBuilder();
$query->select($query->createFunction('COUNT(*) AS `count`'))
->from('appconfig')
->where($query->expr()->eq('appid', $query->createNamedParameter($appId)))
->andWhere(call_user_func([$query->expr(), $function], 'configvalue', $query->createNamedParameter($value, $type)));
->andWhere(call_user_func([$query->expr(), $function], 'configvalue', $query->createNamedParameter($value, $type), IQueryBuilder::PARAM_STR));
if ($compareKeyToValue) {
$query->andWhere(call_user_func([$query->expr(), $function], 'configkey', 'configvalue', IQueryBuilder::PARAM_STR));
}
$result = $query->execute();
$this->assertEquals(['count' => $expected], $result->fetch());
@ -392,12 +414,12 @@ class ExpressionBuilderTest extends TestCase {
->execute();
}
protected function createConfig($appId, $value) {
protected function createConfig($appId, $key, $value) {
$query = $this->connection->getQueryBuilder();
$query->insert('appconfig')
->values([
'appid' => $query->createNamedParameter($appId),
'configkey' => $query->createNamedParameter((string) $value),
'configkey' => $query->createNamedParameter((string) $key),
'configvalue' => $query->createNamedParameter((string) $value),
])
->execute();