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/postgre | |
parent | 81b6efa76b90e28c87d1efad50dc13c2ac462ca8 (diff) |
Remove (most of) error suppression from database drivers (issue #3036)
Diffstat (limited to 'system/database/drivers/postgre')
-rw-r--r-- | system/database/drivers/postgre/postgre_driver.php | 12 | ||||
-rw-r--r-- | system/database/drivers/postgre/postgre_result.php | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/system/database/drivers/postgre/postgre_driver.php b/system/database/drivers/postgre/postgre_driver.php index 6a2209755..c380a7c49 100644 --- a/system/database/drivers/postgre/postgre_driver.php +++ b/system/database/drivers/postgre/postgre_driver.php @@ -233,7 +233,7 @@ class CI_DB_postgre_driver extends CI_DB { */ protected function _execute($sql) { - return @pg_query($this->conn_id, $sql); + return pg_query($this->conn_id, $sql); } // -------------------------------------------------------------------- @@ -257,7 +257,7 @@ class CI_DB_postgre_driver extends CI_DB { // even if the queries produce a successful result. $this->_trans_failure = ($test_mode === TRUE); - return (bool) @pg_query($this->conn_id, 'BEGIN'); + return (bool) pg_query($this->conn_id, 'BEGIN'); } // -------------------------------------------------------------------- @@ -275,7 +275,7 @@ class CI_DB_postgre_driver extends CI_DB { return TRUE; } - return (bool) @pg_query($this->conn_id, 'COMMIT'); + return (bool) pg_query($this->conn_id, 'COMMIT'); } // -------------------------------------------------------------------- @@ -293,7 +293,7 @@ class CI_DB_postgre_driver extends CI_DB { return TRUE; } - return (bool) @pg_query($this->conn_id, 'ROLLBACK'); + return (bool) pg_query($this->conn_id, 'ROLLBACK'); } // -------------------------------------------------------------------- @@ -355,7 +355,7 @@ class CI_DB_postgre_driver extends CI_DB { */ public function affected_rows() { - return @pg_affected_rows($this->result_id); + return pg_affected_rows($this->result_id); } // -------------------------------------------------------------------- @@ -632,7 +632,7 @@ class CI_DB_postgre_driver extends CI_DB { */ protected function _close() { - @pg_close($this->conn_id); + pg_close($this->conn_id); } } diff --git a/system/database/drivers/postgre/postgre_result.php b/system/database/drivers/postgre/postgre_result.php index ec484e940..ab04af12c 100644 --- a/system/database/drivers/postgre/postgre_result.php +++ b/system/database/drivers/postgre/postgre_result.php @@ -47,7 +47,7 @@ class CI_DB_postgre_result extends CI_DB_result { { return is_int($this->num_rows) ? $this->num_rows - : $this->num_rows = @pg_num_rows($this->result_id); + : $this->num_rows = pg_num_rows($this->result_id); } // -------------------------------------------------------------------- @@ -59,7 +59,7 @@ class CI_DB_postgre_result extends CI_DB_result { */ public function num_fields() { - return @pg_num_fields($this->result_id); + return pg_num_fields($this->result_id); } // -------------------------------------------------------------------- |