From: Joas Schilling <coding@schilljs.com>
Date: Fri, 6 Nov 2020 14:31:28 +0000 (+0100)
Subject: Fix iLike() falsely turning escaped % and _ into wildcards
X-Git-Tag: v21.0.0beta1~229^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=cb8bef1f37d6216c0f7905f6e46500e8352fb5c8;p=nextcloud-server.git

Fix iLike() falsely turning escaped % and _ into wildcards

Signed-off-by: Joas Schilling <coding@schilljs.com>
---

diff --git a/lib/private/DB/QueryBuilder/ExpressionBuilder/OCIExpressionBuilder.php b/lib/private/DB/QueryBuilder/ExpressionBuilder/OCIExpressionBuilder.php
index e8e436ba5bd..f41242fdc60 100644
--- a/lib/private/DB/QueryBuilder/ExpressionBuilder/OCIExpressionBuilder.php
+++ b/lib/private/DB/QueryBuilder/ExpressionBuilder/OCIExpressionBuilder.php
@@ -189,8 +189,6 @@ class OCIExpressionBuilder extends ExpressionBuilder {
 	 * @inheritdoc
 	 */
 	public function iLike($x, $y, $type = null) {
-		$x = $this->helper->quoteColumnName($x);
-		$y = $this->helper->quoteColumnName($y);
-		return new QueryFunction('REGEXP_LIKE(' . $x . ', \'^\' || REPLACE(REPLACE(' . $y . ', \'%\', \'.*\'), \'_\', \'.\') || \'$\', \'i\')');
+		return $this->like($this->functionBuilder->lower($x), $this->functionBuilder->lower($y));
 	}
 }