From 2bbbd1a13ead097fd3f4b00bfb275f0b0f836f93 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Fri, 9 May 2014 10:24:14 +0300
Subject: Remove (most of) error suppression from database drivers (issue
 #3036)

---
 system/database/drivers/ibase/ibase_driver.php | 12 ++++++------
 system/database/drivers/ibase/ibase_result.php |  8 ++++----
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'system/database/drivers/ibase')

diff --git a/system/database/drivers/ibase/ibase_driver.php b/system/database/drivers/ibase/ibase_driver.php
index b9eabd00e..b19985c37 100644
--- a/system/database/drivers/ibase/ibase_driver.php
+++ b/system/database/drivers/ibase/ibase_driver.php
@@ -115,7 +115,7 @@ class CI_DB_ibase_driver extends CI_DB {
 	 */
 	protected function _execute($sql)
 	{
-		return @ibase_query($this->conn_id, $sql);
+		return ibase_query($this->conn_id, $sql);
 	}
 
 	// --------------------------------------------------------------------
@@ -139,7 +139,7 @@ class CI_DB_ibase_driver extends CI_DB {
 		// even if the queries produce a successful result.
 		$this->_trans_failure = ($test_mode === TRUE);
 
-		$this->_ibase_trans = @ibase_trans($this->conn_id);
+		$this->_ibase_trans = ibase_trans($this->conn_id);
 
 		return TRUE;
 	}
@@ -159,7 +159,7 @@ class CI_DB_ibase_driver extends CI_DB {
 			return TRUE;
 		}
 
-		return @ibase_commit($this->_ibase_trans);
+		return ibase_commit($this->_ibase_trans);
 	}
 
 	// --------------------------------------------------------------------
@@ -177,7 +177,7 @@ class CI_DB_ibase_driver extends CI_DB {
 			return TRUE;
 		}
 
-		return @ibase_rollback($this->_ibase_trans);
+		return ibase_rollback($this->_ibase_trans);
 	}
 
 	// --------------------------------------------------------------------
@@ -189,7 +189,7 @@ class CI_DB_ibase_driver extends CI_DB {
 	 */
 	public function affected_rows()
 	{
-		return @ibase_affected_rows($this->conn_id);
+		return ibase_affected_rows($this->conn_id);
 	}
 
 	// --------------------------------------------------------------------
@@ -392,7 +392,7 @@ class CI_DB_ibase_driver extends CI_DB {
 	 */
 	protected function _close()
 	{
-		@ibase_close($this->conn_id);
+		ibase_close($this->conn_id);
 	}
 
 }
diff --git a/system/database/drivers/ibase/ibase_result.php b/system/database/drivers/ibase/ibase_result.php
index 1f89db65d..cb2c7f4a6 100644
--- a/system/database/drivers/ibase/ibase_result.php
+++ b/system/database/drivers/ibase/ibase_result.php
@@ -45,7 +45,7 @@ class CI_DB_ibase_result extends CI_DB_result {
 	 */
 	public function num_fields()
 	{
-		return @ibase_num_fields($this->result_id);
+		return ibase_num_fields($this->result_id);
 	}
 
 	// --------------------------------------------------------------------
@@ -103,7 +103,7 @@ class CI_DB_ibase_result extends CI_DB_result {
 	 */
 	public function free_result()
 	{
-		@ibase_free_result($this->result_id);
+		ibase_free_result($this->result_id);
 	}
 
 	// --------------------------------------------------------------------
@@ -117,7 +117,7 @@ class CI_DB_ibase_result extends CI_DB_result {
 	 */
 	protected function _fetch_assoc()
 	{
-		return @ibase_fetch_assoc($this->result_id, IBASE_FETCH_BLOBS);
+		return ibase_fetch_assoc($this->result_id, IBASE_FETCH_BLOBS);
 	}
 
 	// --------------------------------------------------------------------
@@ -132,7 +132,7 @@ class CI_DB_ibase_result extends CI_DB_result {
 	 */
 	protected function _fetch_object($class_name = 'stdClass')
 	{
-		$row = @ibase_fetch_object($this->result_id, IBASE_FETCH_BLOBS);
+		$row = ibase_fetch_object($this->result_id, IBASE_FETCH_BLOBS);
 
 		if ($class_name === 'stdClass' OR ! $row)
 		{
-- 
cgit v1.2.3-24-g4f1b