Skip to content

Commit

Permalink
fix it
Browse files Browse the repository at this point in the history
  • Loading branch information
butonic committed Dec 12, 2016
1 parent c9f6040 commit 70ac9d3
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion lib/private/DB/AdapterOCI8.php
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public function lastInsertId($table) {

public function fixupStatement($statement) {
$statement = preg_replace('( LIKE \?)', '$0 ESCAPE \'\\\'', $statement);
$statement = preg_replace('/`(\w+)` ILIKE \?/', 'REGEXP_LIKE(`$1`, \'^\' || REPLACE(?, \'%\', \'.*\') || \'$\', \'i\')', $statement);
$statement = preg_replace('/`(\w+)` ILIKE \?/', "REGEXP_LIKE(`$1`, '^' || REPLACE(REGEXP_REPLACE(REPLACE(?, '[', '\\['), '(\\]|[\\*+?|^$.[(){}])', '\\\\\\1'), '%', '.*') || '$', 'i')", $statement);
$statement = str_replace('`', '"', $statement);
$statement = str_ireplace('NOW()', 'CURRENT_TIMESTAMP', $statement);
$statement = str_ireplace('UNIX_TIMESTAMP()', self::UNIX_TIMESTAMP_REPLACEMENT, $statement);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,6 @@ public function castColumn($column, $type) {
public function iLike($x, $y, $type = null) {
$x = $this->helper->quoteColumnName($x);
$y = $this->helper->quoteColumnName($y);
return new QueryFunction('REGEXP_LIKE('.$x.', \'^\' || REPLACE('.$y.', \'%\', \'.*\') || \'$\', \'i\')');
return new QueryFunction("REGEXP_LIKE($x, '^' || REPLACE(REGEXP_REPLACE(REPLACE($y, '[', '\\['), '(\\]|[\\*+?|^$.[(){}])', '\\\\\\1'), '%', '.*') || '$', 'i')");
}
}

0 comments on commit 70ac9d3

Please sign in to comment.