Merge pull request #30471 from nextcloud/enh/cast-char-mysql

Explicitly cast char in the query builder
nextcloud · Jan 20, 2022 · de9fe8f · de9fe8f
2 parents a9b098e + eebed2c
commit de9fe8f
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 0 deletions.
diff --git a/lib/private/DB/QueryBuilder/ExpressionBuilder/ExpressionBuilder.php b/lib/private/DB/QueryBuilder/ExpressionBuilder/ExpressionBuilder.php
@@ -427,6 +427,7 @@ public function literal($input, $type = IQueryBuilder::PARAM_STR): ILiteral {
 	 *
 	 * @param string|IQueryFunction $column
 	 * @param mixed $type One of IQueryBuilder::PARAM_*
+	 * @psalm-param IQueryBuilder::PARAM_* $type
 	 * @return IQueryFunction
 	 */
 	public function castColumn($column, $type): IQueryFunction {

diff --git a/lib/private/DB/QueryBuilder/ExpressionBuilder/MySqlExpressionBuilder.php b/lib/private/DB/QueryBuilder/ExpressionBuilder/MySqlExpressionBuilder.php
@@ -26,7 +26,9 @@
 namespace OC\DB\QueryBuilder\ExpressionBuilder;
 
 use OC\DB\ConnectionAdapter;
+use OC\DB\QueryBuilder\QueryFunction;
 use OCP\DB\QueryBuilder\IQueryBuilder;
+use OCP\DB\QueryBuilder\IQueryFunction;
 
 class MySqlExpressionBuilder extends ExpressionBuilder {
 
@@ -52,4 +54,21 @@ public function iLike($x, $y, $type = null): string {
 		$y = $this->helper->quoteColumnName($y);
 		return $this->expressionBuilder->comparison($x, ' COLLATE ' . $this->collation . ' LIKE', $y);
 	}
+
+	/**
+	 * Returns a IQueryFunction that casts the column to the given type
+	 *
+	 * @param string|IQueryFunction $column
+	 * @param mixed $type One of IQueryBuilder::PARAM_*
+	 * @psalm-param IQueryBuilder::PARAM_* $type
+	 * @return IQueryFunction
+	 */
+	public function castColumn($column, $type): IQueryFunction {
+		switch ($type) {
+			case IQueryBuilder::PARAM_STR:
+				return new QueryFunction('CAST(' . $this->helper->quoteColumnName($column) . ' AS CHAR)');
+			default:
+				return parent::castColumn($column, $type);
+		}
+	}
 }
diff --git a/lib/private/DB/QueryBuilder/ExpressionBuilder/OCIExpressionBuilder.php b/lib/private/DB/QueryBuilder/ExpressionBuilder/OCIExpressionBuilder.php
@@ -163,6 +163,7 @@ public function nonEmptyString($x): string {
 	 *
 	 * @param string|IQueryFunction $column
 	 * @param mixed $type One of IQueryBuilder::PARAM_*
+	 * @psalm-param IQueryBuilder::PARAM_* $type
 	 * @return IQueryFunction
 	 */
 	public function castColumn($column, $type): IQueryFunction {

diff --git a/lib/private/DB/QueryBuilder/ExpressionBuilder/PgSqlExpressionBuilder.php b/lib/private/DB/QueryBuilder/ExpressionBuilder/PgSqlExpressionBuilder.php
@@ -35,6 +35,7 @@ class PgSqlExpressionBuilder extends ExpressionBuilder {
 	 *
 	 * @param string|IQueryFunction $column
 	 * @param mixed $type One of IQueryBuilder::PARAM_*
+	 * @psalm-param IQueryBuilder::PARAM_* $type
 	 * @return IQueryFunction
 	 */
 	public function castColumn($column, $type): IQueryFunction {

diff --git a/lib/public/DB/QueryBuilder/IExpressionBuilder.php b/lib/public/DB/QueryBuilder/IExpressionBuilder.php
@@ -433,6 +433,7 @@ public function literal($input, $type = IQueryBuilder::PARAM_STR): ILiteral;
 	 *
 	 * @param string|IQueryFunction $column
 	 * @param mixed $type One of IQueryBuilder::PARAM_*
+	 * @psalm-param IQueryBuilder::PARAM_* $type
 	 * @return IQueryFunction
 	 * @since 9.0.0
 	 *