Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix ILIKE REGEXP workaround on oracle #26672

Merged
merged 2 commits into from
May 9, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/private/DB/AdapterOCI8.php
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,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 \?/', "LOWER(`$1`) LIKE LOWER(?) ESCAPE '\\' -- \\'' \n", $statement); // FIXME workaround for singletick matching with regexes in SQLParserUtils::getUnquotedStatementFragments
$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 @@ -157,7 +157,7 @@ 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("LOWER($x) LIKE LOWER($y) ESCAPE '\\' -- \\'' \n"); // FIXME workaround for singletick matching with regexes in SQLParserUtils::getUnquotedStatementFragments
}

/**
Expand Down
28 changes: 17 additions & 11 deletions tests/lib/Files/Cache/CacheTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -292,29 +292,35 @@ function testSearch() {
$file1 = 'folder';
$file2 = 'folder/foobar';
$file3 = 'folder/foo';
$file4 = 'folder/f[o.o%ba-r';
$data1 = ['size' => 100, 'mtime' => 50, 'mimetype' => 'foo/folder'];
$fileData = [];
$fileData['foobar'] = ['size' => 1000, 'mtime' => 20, 'mimetype' => 'foo/file'];
$fileData['foo'] = ['size' => 20, 'mtime' => 25, 'mimetype' => 'foo/file'];
$fileData['f[o.o%ba-r'] = ['size' => 20, 'mtime' => 25, 'mimetype' => 'foo/file'];

$this->cache->put($file1, $data1);
$this->cache->put($file2, $fileData['foobar']);
$this->cache->put($file3, $fileData['foo']);
$this->cache->put($file4, $fileData['f[o.o%ba-r']);

$this->assertCount(2, $this->cache->search('%foo%'));
$this->assertCount(1, $this->cache->search('foo'));
$this->assertCount(1, $this->cache->search('%folder%'));
$this->assertCount(1, $this->cache->search('folder%'));
$this->assertCount(3, $this->cache->search('%'));
$this->assertCount(2, $this->cache->search('%foo%'), "expected 2 when searching for '%foo%'");
$this->assertCount(1, $this->cache->search('foo'), "expected 1 when searching for 'foo'");
$this->assertCount(1, $this->cache->search('%folder%'), "expected 1 when searching for '%folder%'");
$this->assertCount(1, $this->cache->search('folder%'), "expected 1 when searching for 'folder%'");
$this->assertCount(4, $this->cache->search('%'), "expected 4 when searching for '%'");

// case insensitive search should match the same files
$this->assertCount(2, $this->cache->search('%Foo%'));
$this->assertCount(1, $this->cache->search('Foo'));
$this->assertCount(1, $this->cache->search('%Folder%'));
$this->assertCount(1, $this->cache->search('Folder%'));
$this->assertCount(2, $this->cache->search('%Foo%'), "expected 2 when searching for '%Foo%'");
$this->assertCount(1, $this->cache->search('Foo'), "expected 1 when searching for 'Foo'");
$this->assertCount(1, $this->cache->search('%Folder%'), "expected 1 when searching for '%Folder%'");
$this->assertCount(1, $this->cache->search('Folder%'), "expected 1 when searching for 'Folder%'");

$this->assertCount(3, $this->cache->searchByMime('foo'));
$this->assertCount(2, $this->cache->searchByMime('foo/file'));
$this->assertCount(4, $this->cache->searchByMime('foo'), "expected 4 when searching for mime 'foo'");
$this->assertCount(3, $this->cache->searchByMime('foo/file'), "expected 3 when searching for mime 'foo/file'");

// oracle uses regexp,
$this->assertCount(1, $this->cache->search('f[o.o%ba-r'), "expected 1 when searching for 'f[o.o%ba-r'");
}

function testSearchByTag() {
Expand Down