mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #8308 from owncloud/case_insensitive_search_oracle 

use case insensitive linguistic sort and compare when connecting to oracle
This commit is contained in:
Jörn Friedrich Dreyer 2014-07-04 15:51:57 +02:00
parent 2327d41b11 b5545b81c6
commit aeeae5f1b2
2 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/private/files/cache/cache.php vendored
View File

@ -458,9 +458,27 @@ class Cache {
// normalize pattern // normalize pattern
$pattern = $this->normalize($pattern); $pattern = $this->normalize($pattern);
$sql = 'SELECT `fileid`, `storage`, `path`, `parent`, `name`, `mimetype`, `mimepart`, `size`, `mtime`, `encrypted`, `unencrypted_size`, `etag`, `permissions`
FROM `*PREFIX*filecache` WHERE `name` LIKE ? AND `storage` = ?'; $sql = '
$result = \OC_DB::executeAudited($sql, array($pattern, $this->getNumericStorageId())); SELECT `fileid`, `storage`, `path`, `parent`, `name`,
`mimetype`, `mimepart`, `size`, `mtime`, `encrypted`,
`unencrypted_size`, `etag`, `permissions`
FROM `*PREFIX*filecache`
WHERE `storage` = ? AND ';
$dbtype = \OC_Config::getValue( 'dbtype', 'sqlite' );
if($dbtype === 'oci') {
//remove starting and ending % from the pattern
$pattern = '^'.str_replace('%', '.*', $pattern).'$';
$sql .= 'REGEXP_LIKE(`name`, ?, \'i\')';
} else if($dbtype === 'pgsql') {
$sql .= '`name` ILIKE ?';
} else {
$sql .= '`name` LIKE ?';
}
$result = \OC_DB::executeAudited($sql,
array($this->getNumericStorageId(), $pattern)
);
$files = array(); $files = array();
while ($row = $result->fetchRow()) { while ($row = $result->fetchRow()) {
$row['mimetype'] = $this->getMimetype($row['mimetype']); $row['mimetype'] = $this->getMimetype($row['mimetype']);

6
tests/lib/files/cache/cache.php vendored
View File

@ -239,6 +239,12 @@ class Cache extends \PHPUnit_Framework_TestCase {
$this->assertEquals(1, count($this->cache->search('folder%'))); $this->assertEquals(1, count($this->cache->search('folder%')));
$this->assertEquals(3, count($this->cache->search('%'))); $this->assertEquals(3, count($this->cache->search('%')));
// case insensitive search should match the same files
$this->assertEquals(2, count($this->cache->search('%Foo%')));
$this->assertEquals(1, count($this->cache->search('Foo')));
$this->assertEquals(1, count($this->cache->search('%Folder%')));
$this->assertEquals(1, count($this->cache->search('Folder%')));
$this->assertEquals(3, count($this->cache->searchByMime('foo'))); $this->assertEquals(3, count($this->cache->searchByMime('foo')));
$this->assertEquals(2, count($this->cache->searchByMime('foo/file'))); $this->assertEquals(2, count($this->cache->searchByMime('foo/file')));
} }