summaryrefslogtreecommitdiffstats
path: root/system/database/drivers/sqlite3
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-04-27 11:16:35 +0200
committerAndrey Andreev <narf@bofh.bg>2012-04-27 11:16:35 +0200
commit87ac4260063e3a62805cc8f6f73cd2eb18da663a (patch)
tree8a2463b964a5e7dd6aa606349a4251f70191fce1 /system/database/drivers/sqlite3
parenta58c0b695a0590aff07a42ad2ad81b544e226af9 (diff)
parentced2c9ab41450cb632c042730604111ec2a24e1f (diff)
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop-db-sqlsrv
Diffstat (limited to 'system/database/drivers/sqlite3')
-rw-r--r--system/database/drivers/sqlite3/sqlite3_driver.php5
-rw-r--r--system/database/drivers/sqlite3/sqlite3_result.php4
2 files changed, 3 insertions, 6 deletions
diff --git a/system/database/drivers/sqlite3/sqlite3_driver.php b/system/database/drivers/sqlite3/sqlite3_driver.php
index 49cfbe7ec..d22f6a442 100644
--- a/system/database/drivers/sqlite3/sqlite3_driver.php
+++ b/system/database/drivers/sqlite3/sqlite3_driver.php
@@ -29,7 +29,7 @@
* SQLite3 Database Adapter Class
*
* Note: _DB is an extender class that the app controller
- * creates dynamically based on whether the active record
+ * creates dynamically based on whether the query builder
* class is being used or not.
*
* @package CodeIgniter
@@ -417,9 +417,10 @@ class CI_DB_sqlite3_driver extends CI_DB {
/**
* Close DB Connection
*
+ * @param object (ignored)
* @return void
*/
- protected function _close()
+ protected function _close($conn_id)
{
$this->conn_id->close();
}
diff --git a/system/database/drivers/sqlite3/sqlite3_result.php b/system/database/drivers/sqlite3/sqlite3_result.php
index 64482e379..d83d6b2cd 100644
--- a/system/database/drivers/sqlite3/sqlite3_result.php
+++ b/system/database/drivers/sqlite3/sqlite3_result.php
@@ -198,8 +198,6 @@ class CI_DB_sqlite3_result extends CI_DB_result {
$this->row_data[$row_index++] = $row;
}
- // Un-comment the following line, in case it becomes needed
- // $this->_data_seek();
return $this->result_array = $this->row_data;
}
@@ -266,8 +264,6 @@ class CI_DB_sqlite3_result extends CI_DB_result {
$this->num_rows = count($this->result_object);
}
- // Un-comment the following line, in case it becomes needed
- // $this->_data_seek();
return $this->result_object;
}