diff options
author | Andrey Andreev <narf@devilix.net> | 2014-05-09 09:24:14 +0200 |
---|---|---|
committer | Andrey Andreev <narf@devilix.net> | 2014-05-09 09:24:14 +0200 |
commit | 2bbbd1a13ead097fd3f4b00bfb275f0b0f836f93 (patch) | |
tree | 9a1615f486dac1502c024d8fcd57e066a875b4a2 /system/database/drivers/oci8 | |
parent | 81b6efa76b90e28c87d1efad50dc13c2ac462ca8 (diff) |
Remove (most of) error suppression from database drivers (issue #3036)
Diffstat (limited to 'system/database/drivers/oci8')
-rw-r--r-- | system/database/drivers/oci8/oci8_driver.php | 6 | ||||
-rw-r--r-- | system/database/drivers/oci8/oci8_result.php | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/system/database/drivers/oci8/oci8_driver.php b/system/database/drivers/oci8/oci8_driver.php index 316f17a5d..f34c0d117 100644 --- a/system/database/drivers/oci8/oci8_driver.php +++ b/system/database/drivers/oci8/oci8_driver.php @@ -261,7 +261,7 @@ class CI_DB_oci8_driver extends CI_DB { $this->stmt_id = FALSE; $this->_set_stmt_id($sql); oci_set_prefetch($this->stmt_id, 1000); - return @oci_execute($this->stmt_id, $this->commit_mode); + return oci_execute($this->stmt_id, $this->commit_mode); } // -------------------------------------------------------------------- @@ -451,7 +451,7 @@ class CI_DB_oci8_driver extends CI_DB { */ public function affected_rows() { - return @oci_num_rows($this->stmt_id); + return oci_num_rows($this->stmt_id); } // -------------------------------------------------------------------- @@ -697,7 +697,7 @@ class CI_DB_oci8_driver extends CI_DB { */ protected function _close() { - @oci_close($this->conn_id); + oci_close($this->conn_id); } } diff --git a/system/database/drivers/oci8/oci8_result.php b/system/database/drivers/oci8/oci8_result.php index 177646273..50612ca67 100644 --- a/system/database/drivers/oci8/oci8_result.php +++ b/system/database/drivers/oci8/oci8_result.php @@ -94,7 +94,7 @@ class CI_DB_oci8_result extends CI_DB_result { */ public function num_fields() { - $count = @oci_num_fields($this->stmt_id); + $count = oci_num_fields($this->stmt_id); // if we used a limit we subtract it return ($this->limit_used) ? $count - 1 : $count; @@ -183,7 +183,7 @@ class CI_DB_oci8_result extends CI_DB_result { protected function _fetch_assoc() { $id = ($this->curs_id) ? $this->curs_id : $this->stmt_id; - return @oci_fetch_assoc($id); + return oci_fetch_assoc($id); } // -------------------------------------------------------------------- |