diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-03-26 11:33:23 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-03-26 11:33:23 +0200 |
| commit | 8aea4f49c81199661d3f6e49ff6142b886ea7226 (patch) | |
| tree | 4d60eebc6c5b763d6dc1bbc51b12b46d15c9ae71 /system/database/drivers/sqlite | |
| parent | 12ddc49cf0592cde87407739c5dd12a537dfcf0f (diff) | |
| parent | 6192bc0cd34e214d5287ba45994d84789def31af (diff) | |
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop-db-postgre
Diffstat (limited to 'system/database/drivers/sqlite')
| -rw-r--r-- | system/database/drivers/sqlite/sqlite_driver.php | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/system/database/drivers/sqlite/sqlite_driver.php b/system/database/drivers/sqlite/sqlite_driver.php index bb86c2296..102c79bb3 100644 --- a/system/database/drivers/sqlite/sqlite_driver.php +++ b/system/database/drivers/sqlite/sqlite_driver.php @@ -106,21 +106,6 @@ class CI_DB_sqlite_driver extends CI_DB { // -------------------------------------------------------------------- /** - * Reconnect - * - * Keep / reestablish the db connection if no queries have been - * sent for a length of time exceeding the server's idle timeout - * - * @return void - */ - public function reconnect() - { - // not implemented in SQLite - } - - // -------------------------------------------------------------------- - - /** * Select the database * * @return resource @@ -260,9 +245,9 @@ class CI_DB_sqlite_driver extends CI_DB { // escape LIKE condition wildcards if ($like === TRUE) { - $str = str_replace( array('%', '_', $this->_like_escape_chr), - array($this->_like_escape_chr.'%', $this->_like_escape_chr.'_', $this->_like_escape_chr.$this->_like_escape_chr), - $str); + return str_replace(array($this->_like_escape_chr, '%', '_'), + array($this->_like_escape_chr.$this->_like_escape_chr, $this->_like_escape_chr.'%', $this->_like_escape_chr.'_'), + $str); } return $str; |