Merge pull request #23954 from nextcloud/backport/23943/stable20

rullzer · web-flow · commit bac92bb81453 · 2020-11-07T09:18:23.000+01:00
[stable20] 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
@@ -189,8 +189,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
`@@ -189,8 +189,6 @@ public function like($x, $y, $type = null) {`
`189`	`189`	`* @inheritdoc`
`190`	`190`	`*/`
`191`	`191`	`public function iLike($x, $y, $type = null) {`
`192`		`- $x = $this->helper->quoteColumnName($x);`
`193`		`- $y = $this->helper->quoteColumnName($y);`
`194`		`- return new QueryFunction('REGEXP_LIKE(' . $x . ', \'^\' \|\| REPLACE(REPLACE(' . $y . ', \'%\', \'.*\'), \'_\', \'.\') \|\| \'$\', \'i\')');`
	`192`	`+ return $this->like($this->functionBuilder->lower($x), $this->functionBuilder->lower($y));`
`195`	`193`	`}`
`196`	`194`	`}`