Merge pull request #24047 from nextcloud/backport/23943/stable18

rullzer · web-flow · commit 13f6dcfbf8c0 · 2020-11-11T21:53:28.000+01:00
[stable18] Fix iLike() falsely turning escaped % and _ into wildcards
diff --git a/lib/private/DB/QueryBuilder/ExpressionBuilder/OCIExpressionBuilder.php b/lib/private/DB/QueryBuilder/ExpressionBuilder/OCIExpressionBuilder.php
@@ -186,8 +186,6 @@ public function like($x, $y, $type = null) {
 	 * @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));
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -186,8 +186,6 @@ public function like($x, $y, $type = null) {`
`186`	`186`	`* @inheritdoc`
`187`	`187`	`*/`
`188`	`188`	`public function iLike($x, $y, $type = null) {`
`189`		`- $x = $this->helper->quoteColumnName($x);`
`190`		`- $y = $this->helper->quoteColumnName($y);`
`191`		`- return new QueryFunction('REGEXP_LIKE(' . $x . ', \'^\' \|\| REPLACE(REPLACE(' . $y . ', \'%\', \'.*\'), \'_\', \'.\') \|\| \'$\', \'i\')');`
	`189`	`+ return $this->like($this->functionBuilder->lower($x), $this->functionBuilder->lower($y));`
`192`	`190`	`}`
`193`	`191`	`}`