diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-03-09 13:17:18 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-03-09 13:17:18 +0100 |
| commit | 5f2214f0526b823c92f308312d883147a4c9faed (patch) | |
| tree | 146f821e4a7d60ee059764c2bc884620c9e84901 /system/database/drivers/odbc/odbc_driver.php | |
| parent | 4cc726913b7a8696dc5cff7456b6a95926b6816b (diff) | |
| parent | c016a1102e2a77e0c27b9656c19a0460df24dfb6 (diff) | |
Merge upstream branch
Diffstat (limited to 'system/database/drivers/odbc/odbc_driver.php')
| -rw-r--r-- | system/database/drivers/odbc/odbc_driver.php | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/system/database/drivers/odbc/odbc_driver.php b/system/database/drivers/odbc/odbc_driver.php index 779b0c62f..2575f431d 100644 --- a/system/database/drivers/odbc/odbc_driver.php +++ b/system/database/drivers/odbc/odbc_driver.php @@ -287,12 +287,11 @@ class CI_DB_odbc_driver extends CI_DB { /** * Insert ID * - * @access public - * @return integer + * @return bool */ - function insert_id() + public function insert_id() { - return @odbc_insert_id($this->conn_id); + return ($this->db->db_debug) ? $this->db->display_error('db_unsuported_feature') : FALSE; } // -------------------------------------------------------------------- @@ -314,7 +313,7 @@ class CI_DB_odbc_driver extends CI_DB { return 0; } - $query = $this->query($this->_count_string . $this->_protect_identifiers('numrows') . " FROM " . $this->_protect_identifiers($table, TRUE, NULL, FALSE)); + $query = $this->query($this->_count_string . $this->protect_identifiers('numrows') . " FROM " . $this->protect_identifiers($table, TRUE, NULL, FALSE)); if ($query->num_rows() == 0) { |