diff options
author | Timothy Warren <tim@timshomepage.net> | 2012-03-02 15:07:04 +0100 |
---|---|---|
committer | Timothy Warren <tim@timshomepage.net> | 2012-03-02 15:07:04 +0100 |
commit | d33dab14c5d812d30f48d9a5f6324bb230e77203 (patch) | |
tree | 9f56e656e54c68d4a971b7985269f3c1cba1c696 /system/database/drivers/odbc/odbc_driver.php | |
parent | eabc5ec81209ec83393222f2964098aedf6dbc7a (diff) | |
parent | 4be5de1d11eefd9f0b7cf0589a2942f067cefe35 (diff) |
Merge upstream
Diffstat (limited to 'system/database/drivers/odbc/odbc_driver.php')
-rw-r--r-- | system/database/drivers/odbc/odbc_driver.php | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/system/database/drivers/odbc/odbc_driver.php b/system/database/drivers/odbc/odbc_driver.php index abb660324..5a93f7cad 100644 --- a/system/database/drivers/odbc/odbc_driver.php +++ b/system/database/drivers/odbc/odbc_driver.php @@ -398,27 +398,16 @@ class CI_DB_odbc_driver extends CI_DB { // -------------------------------------------------------------------- /** - * The error message string + * Error * - * @access private - * @return string - */ - function _error_message() - { - return odbc_errormsg($this->conn_id); - } - - // -------------------------------------------------------------------- - - /** - * The error message number + * Returns an array containing code and message of the last + * database error that has occured. * - * @access private - * @return integer + * @return array */ - function _error_number() + public function error() { - return odbc_error($this->conn_id); + return array('code' => odbc_error($this->conn_id), 'message' => odbc_errormsg($this->conn_id)); } // -------------------------------------------------------------------- |