summaryrefslogtreecommitdiffstats
path: root/system/database/drivers/odbc
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2014-05-09 09:24:14 +0200
committerAndrey Andreev <narf@devilix.net>2014-05-09 09:24:14 +0200
commit2bbbd1a13ead097fd3f4b00bfb275f0b0f836f93 (patch)
tree9a1615f486dac1502c024d8fcd57e066a875b4a2 /system/database/drivers/odbc
parent81b6efa76b90e28c87d1efad50dc13c2ac462ca8 (diff)
Remove (most of) error suppression from database drivers (issue #3036)
Diffstat (limited to 'system/database/drivers/odbc')
-rw-r--r--system/database/drivers/odbc/odbc_driver.php6
-rw-r--r--system/database/drivers/odbc/odbc_result.php4
2 files changed, 5 insertions, 5 deletions
diff --git a/system/database/drivers/odbc/odbc_driver.php b/system/database/drivers/odbc/odbc_driver.php
index 14c85c8e2..06c24d66f 100644
--- a/system/database/drivers/odbc/odbc_driver.php
+++ b/system/database/drivers/odbc/odbc_driver.php
@@ -124,7 +124,7 @@ class CI_DB_odbc_driver extends CI_DB {
*/
protected function _execute($sql)
{
- return @odbc_exec($this->conn_id, $sql);
+ return odbc_exec($this->conn_id, $sql);
}
// --------------------------------------------------------------------
@@ -213,7 +213,7 @@ class CI_DB_odbc_driver extends CI_DB {
*/
public function affected_rows()
{
- return @odbc_num_rows($this->result_id);
+ return odbc_num_rows($this->result_id);
}
// --------------------------------------------------------------------
@@ -357,7 +357,7 @@ class CI_DB_odbc_driver extends CI_DB {
*/
protected function _close()
{
- @odbc_close($this->conn_id);
+ odbc_close($this->conn_id);
}
}
diff --git a/system/database/drivers/odbc/odbc_result.php b/system/database/drivers/odbc/odbc_result.php
index 5b2df3943..3a101cd7e 100644
--- a/system/database/drivers/odbc/odbc_result.php
+++ b/system/database/drivers/odbc/odbc_result.php
@@ -49,7 +49,7 @@ class CI_DB_odbc_result extends CI_DB_result {
{
return $this->num_rows;
}
- elseif (($this->num_rows = @odbc_num_rows($this->result_id)) !== -1)
+ elseif (($this->num_rows = odbc_num_rows($this->result_id)) !== -1)
{
return $this->num_rows;
}
@@ -76,7 +76,7 @@ class CI_DB_odbc_result extends CI_DB_result {
*/
public function num_fields()
{
- return @odbc_num_fields($this->result_id);
+ return odbc_num_fields($this->result_id);
}
// --------------------------------------------------------------------