From 1771bfc2f2c790bc5d7a439095290cb4c97edf1a Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Tue, 9 Sep 2014 13:57:02 +0200 Subject: [PATCH 1/7] Introduce cross-db ILIKE --- lib/private/db/adaptermysql.php | 17 +++++++++++++++++ lib/private/db/adapteroci8.php | 12 +++++++----- lib/private/db/adaptersqlite.php | 1 + lib/private/db/connectionfactory.php | 2 +- tests/lib/db.php | 15 +++++++++++++++ 5 files changed, 41 insertions(+), 6 deletions(-) create mode 100644 lib/private/db/adaptermysql.php diff --git a/lib/private/db/adaptermysql.php b/lib/private/db/adaptermysql.php new file mode 100644 index 00000000000..0b6e6a5e969 --- /dev/null +++ b/lib/private/db/adaptermysql.php @@ -0,0 +1,17 @@ + + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + + +namespace OC\DB; + +class AdapterMySQL extends Adapter { + public function fixupStatement($statement) { + $statement = str_replace(' ILIKE ', ' COLLATE utf8_general_ci LIKE ', $statement); + return $statement; + } +} diff --git a/lib/private/db/adapteroci8.php b/lib/private/db/adapteroci8.php index bc226e979ec..fb4ea1bcde9 100644 --- a/lib/private/db/adapteroci8.php +++ b/lib/private/db/adapteroci8.php @@ -11,18 +11,20 @@ namespace OC\DB; class AdapterOCI8 extends Adapter { public function lastInsertId($table) { - if($table !== null) { + if ($table !== null) { $suffix = '_SEQ'; - $table = '"'.$table.$suffix.'"'; + $table = '"' . $table . $suffix . '"'; } return $this->conn->realLastInsertId($table); } const UNIX_TIMESTAMP_REPLACEMENT = "(cast(sys_extract_utc(systimestamp) as date) - date'1970-01-01') * 86400"; + public function fixupStatement($statement) { - $statement = str_replace( '`', '"', $statement ); - $statement = str_ireplace( 'NOW()', 'CURRENT_TIMESTAMP', $statement ); - $statement = str_ireplace( 'UNIX_TIMESTAMP()', self::UNIX_TIMESTAMP_REPLACEMENT, $statement ); + $statement = preg_replace('/`(\w+)` ILIKE \?/', 'REGEXP_LIKE(`$1`, TRIM(BOTH \'%\' FROM ?), \'i\')', $statement); + $statement = str_replace('`', '"', $statement); + $statement = str_ireplace('NOW()', 'CURRENT_TIMESTAMP', $statement); + $statement = str_ireplace('UNIX_TIMESTAMP()', self::UNIX_TIMESTAMP_REPLACEMENT, $statement); return $statement; } } diff --git a/lib/private/db/adaptersqlite.php b/lib/private/db/adaptersqlite.php index 5b9c5a437da..06cdb7aab05 100644 --- a/lib/private/db/adaptersqlite.php +++ b/lib/private/db/adaptersqlite.php @@ -11,6 +11,7 @@ namespace OC\DB; class AdapterSqlite extends Adapter { public function fixupStatement($statement) { + $statement = str_replace(' ILIKE ', ' LIKE ', $statement); $statement = str_replace( '`', '"', $statement ); $statement = str_ireplace( 'NOW()', 'datetime(\'now\')', $statement ); $statement = str_ireplace( 'UNIX_TIMESTAMP()', 'strftime(\'%s\',\'now\')', $statement ); diff --git a/lib/private/db/connectionfactory.php b/lib/private/db/connectionfactory.php index dbbe58dbef8..8fd26bdc947 100644 --- a/lib/private/db/connectionfactory.php +++ b/lib/private/db/connectionfactory.php @@ -26,7 +26,7 @@ class ConnectionFactory { 'wrapperClass' => 'OC\DB\Connection', ), 'mysql' => array( - 'adapter' => '\OC\DB\Adapter', + 'adapter' => '\OC\DB\AdapterMySQL', 'charset' => 'UTF8', 'driver' => 'pdo_mysql', 'wrapperClass' => 'OC\DB\Connection', diff --git a/tests/lib/db.php b/tests/lib/db.php index 1f62413cbe4..893d42cdbe9 100644 --- a/tests/lib/db.php +++ b/tests/lib/db.php @@ -263,4 +263,19 @@ class Test_DB extends PHPUnit_Framework_TestCase { $query = OC_DB::prepare("UPDATE `*PREFIX*{$this->table2}` SET `uri` = ? WHERE `fullname` = ?"); return $query->execute(array($uri, $fullname)); } + + public function testILIKE() { + $table = "*PREFIX*{$this->table2}"; + + $query = OC_DB::prepare("INSERT INTO `$table` (`fullname`, `uri`, `carddata`) VALUES (?, ?, ?)"); + $query->execute(array('fooBAR', 'foo', 'bar')); + + $query = OC_DB::prepare("SELECT * FROM `$table` WHERE `fullname` LIKE ?"); + $result = $query->execute(array('foobar')); + $this->assertCount(0, $result->fetchAll()); + + $query = OC_DB::prepare("SELECT * FROM `$table` WHERE `fullname` ILIKE ?"); + $result = $query->execute(array('foobar')); + $this->assertCount(1, $result->fetchAll()); + } } From ca35d86c5a85485a418916ebf236b575d4401136 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Tue, 16 Sep 2014 15:44:21 +0200 Subject: [PATCH 2/7] adding ILIKE to AdapterSQLSrv --- lib/private/db/adaptersqlsrv.php | 1 + tests/lib/db.php | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/lib/private/db/adaptersqlsrv.php b/lib/private/db/adaptersqlsrv.php index a6bc0e21052..1ac9badab94 100644 --- a/lib/private/db/adaptersqlsrv.php +++ b/lib/private/db/adaptersqlsrv.php @@ -11,6 +11,7 @@ namespace OC\DB; class AdapterSQLSrv extends Adapter { public function fixupStatement($statement) { + $statement = str_replace(' ILIKE ', ' COLLATE Latin1_General_CI_AS LIKE ', $statement); $statement = preg_replace( "/\`(.*?)`/", "[$1]", $statement ); $statement = str_ireplace( 'NOW()', 'CURRENT_TIMESTAMP', $statement ); $statement = str_replace( 'LENGTH(', 'LEN(', $statement ); diff --git a/tests/lib/db.php b/tests/lib/db.php index 893d42cdbe9..22792930f0a 100644 --- a/tests/lib/db.php +++ b/tests/lib/db.php @@ -27,6 +27,11 @@ class Test_DB extends PHPUnit_Framework_TestCase { */ private $table3; + /** + * @var string + */ + private $table4; + public function setUp() { $dbfile = OC::$SERVERROOT.'/tests/data/db_structure.xml'; From 95815c0b57c0d255a1ad5dd71d8f925fc5cc4588 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Tue, 16 Sep 2014 21:03:03 +0200 Subject: [PATCH 3/7] add test case for ILIKE with wildcard --- tests/lib/db.php | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/tests/lib/db.php b/tests/lib/db.php index 22792930f0a..d4270737d86 100644 --- a/tests/lib/db.php +++ b/tests/lib/db.php @@ -283,4 +283,35 @@ class Test_DB extends PHPUnit_Framework_TestCase { $result = $query->execute(array('foobar')); $this->assertCount(1, $result->fetchAll()); } + + public function testILIKEWildcard() { + $table = "*PREFIX*{$this->table2}"; + + $query = OC_DB::prepare("INSERT INTO `$table` (`fullname`, `uri`, `carddata`) VALUES (?, ?, ?)"); + $query->execute(array('FooBAR', 'foo', 'bar')); + + $query = OC_DB::prepare("SELECT * FROM `$table` WHERE `fullname` LIKE ?"); + $result = $query->execute(array('%bar')); + $this->assertCount(0, $result->fetchAll()); + + $query = OC_DB::prepare("SELECT * FROM `$table` WHERE `fullname` LIKE ?"); + $result = $query->execute(array('foo%')); + $this->assertCount(0, $result->fetchAll()); + + $query = OC_DB::prepare("SELECT * FROM `$table` WHERE `fullname` LIKE ?"); + $result = $query->execute(array('%ba%')); + $this->assertCount(0, $result->fetchAll()); + + $query = OC_DB::prepare("SELECT * FROM `$table` WHERE `fullname` ILIKE ?"); + $result = $query->execute(array('%bar')); + $this->assertCount(1, $result->fetchAll()); + + $query = OC_DB::prepare("SELECT * FROM `$table` WHERE `fullname` ILIKE ?"); + $result = $query->execute(array('foo%')); + $this->assertCount(1, $result->fetchAll()); + + $query = OC_DB::prepare("SELECT * FROM `$table` WHERE `fullname` ILIKE ?"); + $result = $query->execute(array('%ba%')); + $this->assertCount(1, $result->fetchAll()); + } } From 60587e9dcda4e4c9d7a04c201024124964008f36 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Wed, 17 Sep 2014 13:47:33 +0200 Subject: [PATCH 4/7] Make sqlite LIKE case sensitive on default --- lib/private/db/connectionfactory.php | 3 ++ lib/private/db/sqlitesessioninit.php | 42 ++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 lib/private/db/sqlitesessioninit.php diff --git a/lib/private/db/connectionfactory.php b/lib/private/db/connectionfactory.php index 8fd26bdc947..589a1c0affd 100644 --- a/lib/private/db/connectionfactory.php +++ b/lib/private/db/connectionfactory.php @@ -89,6 +89,9 @@ class ConnectionFactory { case 'oci': $eventManager->addEventSubscriber(new \Doctrine\DBAL\Event\Listeners\OracleSessionInit); break; + case 'sqlite3': + $eventManager->addEventSubscriber(new SQLiteSessionInit); + break; } $connection = \Doctrine\DBAL\DriverManager::getConnection( array_merge($this->getDefaultConnectionParams($type), $additionalConnectionParams), diff --git a/lib/private/db/sqlitesessioninit.php b/lib/private/db/sqlitesessioninit.php new file mode 100644 index 00000000000..7e1166be95b --- /dev/null +++ b/lib/private/db/sqlitesessioninit.php @@ -0,0 +1,42 @@ + + * This file is licensed under the Affero General Public License version 3 or + * later. + * See the COPYING-README file. + */ + +namespace OC\DB; + +use Doctrine\DBAL\Event\ConnectionEventArgs; +use Doctrine\DBAL\Events; +use Doctrine\Common\EventSubscriber; + +class SQLiteSessionInit implements EventSubscriber { + /** + * @var bool + */ + private $caseSensitiveLike; + + /** + * Configure case sensitive like for each connection + * + * @param bool $caseSensitiveLike + */ + public function __construct($caseSensitiveLike = true) { + $this->caseSensitiveLike = $caseSensitiveLike; + } + + /** + * @param ConnectionEventArgs $args + * @return void + */ + public function postConnect(ConnectionEventArgs $args) { + $sensitive = ($this->caseSensitiveLike) ? 'true' : 'false'; + $args->getConnection()->executeUpdate('PRAGMA case_sensitive_like = ' . $sensitive); + } + + public function getSubscribedEvents() { + return array(Events::postConnect); + } +} From 67b1ec1fafaa4ca4d4343b7a3867d194509cb633 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Wed, 17 Sep 2014 13:47:55 +0200 Subject: [PATCH 5/7] Implement ILIKE for sqlite --- lib/private/db/adaptersqlite.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/private/db/adaptersqlite.php b/lib/private/db/adaptersqlite.php index 06cdb7aab05..3471fcf4042 100644 --- a/lib/private/db/adaptersqlite.php +++ b/lib/private/db/adaptersqlite.php @@ -11,7 +11,7 @@ namespace OC\DB; class AdapterSqlite extends Adapter { public function fixupStatement($statement) { - $statement = str_replace(' ILIKE ', ' LIKE ', $statement); + $statement = preg_replace('/`(\w+)` ILIKE \?/', 'LOWER($1) LIKE LOWER(?)', $statement); $statement = str_replace( '`', '"', $statement ); $statement = str_ireplace( 'NOW()', 'datetime(\'now\')', $statement ); $statement = str_ireplace( 'UNIX_TIMESTAMP()', 'strftime(\'%s\',\'now\')', $statement ); From 0c03b2bdd5fd8b94e7fad657591bdc3788b99157 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Wed, 17 Sep 2014 16:12:54 +0200 Subject: [PATCH 6/7] Use ILIKE in cache search --- lib/private/files/cache/cache.php | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/lib/private/files/cache/cache.php b/lib/private/files/cache/cache.php index cfa3e916185..7ea00325a10 100644 --- a/lib/private/files/cache/cache.php +++ b/lib/private/files/cache/cache.php @@ -464,19 +464,7 @@ class Cache { `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 if ($dbtype === 'mysql') { - $sql .= '`name` COLLATE utf8_general_ci LIKE ?'; - } else { - $sql .= '`name` LIKE ?'; - } + WHERE `storage` = ? AND `name` ILIKE ?'; $result = \OC_DB::executeAudited($sql, array($this->getNumericStorageId(), $pattern) ); From a85f0ae2da4344826ee04f79bc362eb5d1a86f67 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Thu, 18 Sep 2014 15:09:57 +0200 Subject: [PATCH 7/7] Fix ILIKE without wildcards for oracle --- lib/private/db/adapteroci8.php | 2 +- tests/lib/db.php | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/private/db/adapteroci8.php b/lib/private/db/adapteroci8.php index fb4ea1bcde9..db7e66e7913 100644 --- a/lib/private/db/adapteroci8.php +++ b/lib/private/db/adapteroci8.php @@ -21,7 +21,7 @@ class AdapterOCI8 extends Adapter { const UNIX_TIMESTAMP_REPLACEMENT = "(cast(sys_extract_utc(systimestamp) as date) - date'1970-01-01') * 86400"; public function fixupStatement($statement) { - $statement = preg_replace('/`(\w+)` ILIKE \?/', 'REGEXP_LIKE(`$1`, TRIM(BOTH \'%\' FROM ?), \'i\')', $statement); + $statement = preg_replace('/`(\w+)` ILIKE \?/', 'REGEXP_LIKE(`$1`, \'^\' || REPLACE(?, \'%\', \'.*\') || \'$\', \'i\')', $statement); $statement = str_replace('`', '"', $statement); $statement = str_ireplace('NOW()', 'CURRENT_TIMESTAMP', $statement); $statement = str_ireplace('UNIX_TIMESTAMP()', self::UNIX_TIMESTAMP_REPLACEMENT, $statement); diff --git a/tests/lib/db.php b/tests/lib/db.php index d4270737d86..fb673b8092b 100644 --- a/tests/lib/db.php +++ b/tests/lib/db.php @@ -282,6 +282,10 @@ class Test_DB extends PHPUnit_Framework_TestCase { $query = OC_DB::prepare("SELECT * FROM `$table` WHERE `fullname` ILIKE ?"); $result = $query->execute(array('foobar')); $this->assertCount(1, $result->fetchAll()); + + $query = OC_DB::prepare("SELECT * FROM `$table` WHERE `fullname` ILIKE ?"); + $result = $query->execute(array('foo')); + $this->assertCount(0, $result->fetchAll()); } public function testILIKEWildcard() {