summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorftwbzhao <b.zhao1@gmail.com>2015-07-05 15:25:32 +0200
committerftwbzhao <b.zhao1@gmail.com>2015-07-05 15:25:32 +0200
commit820f06f63de3da890a87a88161daea0fd1be8caa (patch)
treef3660e14ad3b4c866ade0def53204dfeccdeacd7
parent59a253d0776275994af0fda9ad729abb8607b4d5 (diff)
fix pdo/sqlite & update changelog
-rw-r--r--system/database/drivers/pdo/subdrivers/pdo_sqlite_driver.php2
-rw-r--r--user_guide_src/source/changelog.rst2
2 files changed, 2 insertions, 2 deletions
diff --git a/system/database/drivers/pdo/subdrivers/pdo_sqlite_driver.php b/system/database/drivers/pdo/subdrivers/pdo_sqlite_driver.php
index d5ca741fd..409e6501b 100644
--- a/system/database/drivers/pdo/subdrivers/pdo_sqlite_driver.php
+++ b/system/database/drivers/pdo/subdrivers/pdo_sqlite_driver.php
@@ -140,7 +140,7 @@ class CI_DB_pdo_sqlite_driver extends CI_DB_pdo_driver {
}
$this->data_cache['field_names'][$table] = array();
- foreach ($result as $row)
+ foreach ($result->result_array() as $row)
{
$this->data_cache['field_names'][$table][] = $row['name'];
}
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 1fe6e9e09..3cd24c450 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -46,7 +46,7 @@ Bug fixes for 3.0.1
- Fixed a bug (#3913) - :doc:`Cache Library <libraries/caching>` didn't work with the direct ``$this->cache->$driver_name->method()`` syntax with Redis and Memcache(d).
- Fixed a bug (#3932) - :doc:`Query Builder <database/query_builder>` didn't properly compile WHERE and HAVING conditions for field names that end with "and", "or".
- Fixed a bug in :doc:`Query Builder <database/query_builder>` where ``delete()`` didn't properly work on multiple tables with a WHERE condition previously set via ``where()``.
-- Fixed a bug (#3952) - ``list_fields()`` didn't work properly with the SQlite ('sqlite3' driver).
+- Fixed a bug (#3952) - :doc:`Database <database/index>` method ``list_fields()`` didn't work with SQLite3.
Version 3.0.0
=============