diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-03-20 15:59:04 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-03-20 15:59:04 +0100 |
| commit | 817164d822ce5dc1159ddc3e8fad2fa094dfc5ea (patch) | |
| tree | 125069e2089d0e0ee3b8337b7acac6050ca1e045 /system/database/drivers/sqlite/sqlite_driver.php | |
| parent | 4b4363871256df9009bb4245def8f89420331cfd (diff) | |
| parent | 8480f7c35af9aacaf2ebee43677ff1d31a5cce13 (diff) | |
Merge upstream branch
Diffstat (limited to 'system/database/drivers/sqlite/sqlite_driver.php')
| -rw-r--r-- | system/database/drivers/sqlite/sqlite_driver.php | 27 |
1 files changed, 5 insertions, 22 deletions
diff --git a/system/database/drivers/sqlite/sqlite_driver.php b/system/database/drivers/sqlite/sqlite_driver.php index 568a6b6b3..ffc57e72a 100644 --- a/system/database/drivers/sqlite/sqlite_driver.php +++ b/system/database/drivers/sqlite/sqlite_driver.php @@ -2,7 +2,7 @@ /** * CodeIgniter * - * An open source application development framework for PHP 5.1.6 or newer + * An open source application development framework for PHP 5.2.4 or newer * * NOTICE OF LICENSE * @@ -46,7 +46,7 @@ class CI_DB_sqlite_driver extends CI_DB { protected $_escape_char = '"'; // clause and character used for LIKE escape sequences - protected $_like_escape_str = ' ESCAPE \'%s\' '; + protected $_like_escape_str = " ESCAPE '%s' "; protected $_like_escape_chr = '!'; /** @@ -155,7 +155,6 @@ class CI_DB_sqlite_driver extends CI_DB { */ protected function _execute($sql) { - $sql = $this->_prep_query($sql); return $this->is_write_type($sql) ? @sqlite_exec($this->conn_id, $sql) : @sqlite_query($this->conn_id, $sql); @@ -164,21 +163,6 @@ class CI_DB_sqlite_driver extends CI_DB { // -------------------------------------------------------------------- /** - * Prep the query - * - * If needed, each database adapter can prep the query string - * - * @param string an SQL query - * @return string - */ - protected function _prep_query($sql) - { - return $sql; - } - - // -------------------------------------------------------------------- - - /** * Begin Transaction * * @return bool @@ -440,8 +424,8 @@ class CI_DB_sqlite_driver extends CI_DB { * This function implicitly groups FROM tables so there is no confusion * about operator precedence in harmony with SQL standards * - * @param type - * @return type + * @param array + * @return string */ protected function _from_tables($tables) { @@ -575,8 +559,7 @@ class CI_DB_sqlite_driver extends CI_DB { @sqlite_close($conn_id); } - } /* End of file sqlite_driver.php */ -/* Location: ./system/database/drivers/sqlite/sqlite_driver.php */ +/* Location: ./system/database/drivers/sqlite/sqlite_driver.php */
\ No newline at end of file |