summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDerek Allard <derek.allard@ellislab.com>2010-02-04 22:29:03 +0100
committerDerek Allard <derek.allard@ellislab.com>2010-02-04 22:29:03 +0100
commit4860ec52f5bdf917d12f511ecd07b7d4797f0d91 (patch)
treeb41d18404cd886a3e927bf3cf82b5914b5d3d70f
parent62396232658467b463f37e55bec159aadc188edd (diff)
fixing a series of errors in (ironically) error display in some database drivers
-rw-r--r--system/database/drivers/oci8/oci8_driver.php4
-rw-r--r--system/database/drivers/sqlite/sqlite_driver.php4
-rw-r--r--system/database/drivers/sqlite/sqlite_utility.php2
-rw-r--r--user_guide/changelog.html1
4 files changed, 6 insertions, 5 deletions
diff --git a/system/database/drivers/oci8/oci8_driver.php b/system/database/drivers/oci8/oci8_driver.php
index cd0e09577..1ad05a793 100644
--- a/system/database/drivers/oci8/oci8_driver.php
+++ b/system/database/drivers/oci8/oci8_driver.php
@@ -244,7 +244,7 @@ class CI_DB_oci8_driver extends CI_DB {
if ($this->db_debug)
{
log_message('error', 'Invalid query: '.$package.'.'.$procedure);
- return $this->display_error('db_invalid_query');
+ return $this->db->display_error('db_invalid_query');
}
return FALSE;
}
@@ -443,7 +443,7 @@ class CI_DB_oci8_driver extends CI_DB {
function insert_id()
{
// not supported in oracle
- return $this->display_error('db_unsupported_function');
+ return $this->db->display_error('db_unsupported_function');
}
// --------------------------------------------------------------------
diff --git a/system/database/drivers/sqlite/sqlite_driver.php b/system/database/drivers/sqlite/sqlite_driver.php
index c08ed2a56..4309c1656 100644
--- a/system/database/drivers/sqlite/sqlite_driver.php
+++ b/system/database/drivers/sqlite/sqlite_driver.php
@@ -63,7 +63,7 @@ class CI_DB_sqlite_driver extends CI_DB {
if ($this->db_debug)
{
- $this->display_error($error, '', TRUE);
+ $this->db->display_error($error, '', TRUE);
}
return FALSE;
@@ -88,7 +88,7 @@ class CI_DB_sqlite_driver extends CI_DB {
if ($this->db_debug)
{
- $this->display_error($error, '', TRUE);
+ $this->db->display_error($error, '', TRUE);
}
return FALSE;
diff --git a/system/database/drivers/sqlite/sqlite_utility.php b/system/database/drivers/sqlite/sqlite_utility.php
index 5629dac99..fe63362ee 100644
--- a/system/database/drivers/sqlite/sqlite_utility.php
+++ b/system/database/drivers/sqlite/sqlite_utility.php
@@ -39,7 +39,7 @@ class CI_DB_sqlite_utility extends CI_DB_utility {
{
if ($this->db_debug)
{
- return $this->display_error('db_unsuported_feature');
+ return $this->db->display_error('db_unsuported_feature');
}
return array();
}
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index 88d8a1621..9b62dc89a 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -121,6 +121,7 @@ SVN Revision: </p>
<li>Fixed a bug in values_parsing() of the XML-RPC library which prevented NULL variables typed as 'string' from being handled properly.</li>
<li>Fixed a bug were form_open_multipart() didn't accept string attribute arguments (#10930).</li>
<li>Fixed a bug (#10470) where <kdb>get_mime_by_extension()</kbd> was case sensitive.</li>
+ <li>Fixed a bug where some error messages for the SQLite and Oracle drivers would not display.</li>
</ul>
<h2>Version 1.7.2</h2>