summaryrefslogtreecommitdiffstats
path: root/system/database/drivers/mssql
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/mssql
parent81b6efa76b90e28c87d1efad50dc13c2ac462ca8 (diff)
Remove (most of) error suppression from database drivers (issue #3036)
Diffstat (limited to 'system/database/drivers/mssql')
-rw-r--r--system/database/drivers/mssql/mssql_driver.php10
-rw-r--r--system/database/drivers/mssql/mssql_result.php6
2 files changed, 8 insertions, 8 deletions
diff --git a/system/database/drivers/mssql/mssql_driver.php b/system/database/drivers/mssql/mssql_driver.php
index afe80e8d9..f4a166180 100644
--- a/system/database/drivers/mssql/mssql_driver.php
+++ b/system/database/drivers/mssql/mssql_driver.php
@@ -142,9 +142,9 @@ class CI_DB_mssql_driver extends CI_DB {
$database = $this->database;
}
- // Note: The brackets are required in the event that the DB name
+ // Note: Escaping is required in the event that the DB name
// contains reserved characters
- if (@mssql_select_db($this->escape_identifiers($database), $this->conn_id))
+ if (mssql_select_db($this->escape_identifiers($database), $this->conn_id))
{
$this->database = $database;
return TRUE;
@@ -163,7 +163,7 @@ class CI_DB_mssql_driver extends CI_DB {
*/
protected function _execute($sql)
{
- return @mssql_query($sql, $this->conn_id);
+ return mssql_query($sql, $this->conn_id);
}
// --------------------------------------------------------------------
@@ -235,7 +235,7 @@ class CI_DB_mssql_driver extends CI_DB {
*/
public function affected_rows()
{
- return @mssql_rows_affected($this->conn_id);
+ return mssql_rows_affected($this->conn_id);
}
// --------------------------------------------------------------------
@@ -519,7 +519,7 @@ class CI_DB_mssql_driver extends CI_DB {
*/
protected function _close()
{
- @mssql_close($this->conn_id);
+ mssql_close($this->conn_id);
}
}
diff --git a/system/database/drivers/mssql/mssql_result.php b/system/database/drivers/mssql/mssql_result.php
index cce93740f..f3ee987ed 100644
--- a/system/database/drivers/mssql/mssql_result.php
+++ b/system/database/drivers/mssql/mssql_result.php
@@ -47,7 +47,7 @@ class CI_DB_mssql_result extends CI_DB_result {
{
return is_int($this->num_rows)
? $this->num_rows
- : $this->num_rows = @mssql_num_rows($this->result_id);
+ : $this->num_rows = mssql_num_rows($this->result_id);
}
// --------------------------------------------------------------------
@@ -59,7 +59,7 @@ class CI_DB_mssql_result extends CI_DB_result {
*/
public function num_fields()
{
- return @mssql_num_fields($this->result_id);
+ return mssql_num_fields($this->result_id);
}
// --------------------------------------------------------------------
@@ -167,7 +167,7 @@ class CI_DB_mssql_result extends CI_DB_result {
*/
protected function _fetch_object($class_name = 'stdClass')
{
- $row = @mssql_fetch_object($this->result_id);
+ $row = mssql_fetch_object($this->result_id);
if ($class_name === 'stdClass' OR ! $row)
{