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

Make sure we don't quote column names twice

This commit is contained in:
Joas Schilling 2016-02-23 08:50:52 +01:00
parent 4dfdb2720c
commit 8754ea6c8a
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/private/db/querybuilder/expressionbuilder/mysqlexpressionbuilder.php
View File

@ -33,7 +33,7 @@ class MySqlExpressionBuilder extends ExpressionBuilder {
public function iLike($x, $y, $type = null) {
$x = $this->helper->quoteColumnName($x);
$y = $this->helper->quoteColumnName($y);
return $this->comparison($x, ' COLLATE utf8_general_ci LIKE', $y);
return $this->expressionBuilder->comparison($x, ' COLLATE utf8_general_ci LIKE', $y);
}
}

2
lib/private/db/querybuilder/expressionbuilder/ociexpressionbuilder.php
View File

@ -156,6 +156,6 @@ class OCIExpressionBuilder extends ExpressionBuilder {
public function iLike($x, $y, $type = null) {
$x = $this->helper->quoteColumnName($x);
$y = $this->helper->quoteColumnName($y);
return 'REGEXP_LIKE(`'.$x.'`, \'^\' || REPLACE('.$y.', \'%\', \'.*\') || \'$\', \'i\')';
return new QueryFunction('REGEXP_LIKE('.$x.', \'^\' || REPLACE('.$y.', \'%\', \'.*\') || \'$\', \'i\')');
}
}

2
lib/private/db/querybuilder/expressionbuilder/pgsqlexpressionbuilder.php
View File

@ -49,7 +49,7 @@ class PgSqlExpressionBuilder extends ExpressionBuilder {
public function iLike($x, $y, $type = null) {
$x = $this->helper->quoteColumnName($x);
$y = $this->helper->quoteColumnName($y);
return $this->comparison($x, 'ILIKE', $y);
return $this->expressionBuilder->comparison($x, 'ILIKE', $y);
}
}