makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-27 21:58:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/10205] Rewrite _sql_error implementations to have a single return.

Browse source 
PHPBB3-10205
This commit is contained in:
Oleg Pudeyev 2012-12-04 21:32:02 -05:00
parent 89c9c9d4b0
commit 597dea1e04
5 changed files with 34 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
phpBB/includes/db/mssql_odbc.php
View file

@ -362,18 +362,20 @@ class dbal_mssql_odbc extends dbal
{ {
if (function_exists('odbc_errormsg')) if (function_exists('odbc_errormsg'))
{ {
return array( $error = array(
'message' => @odbc_errormsg(), 'message' => @odbc_errormsg(),
'code' => @odbc_error(), 'code' => @odbc_error(),
); );
} }
else else
{ {
return array( $error = array(
'message' => $this->connect_error, 'message' => $this->connect_error,
'code' => '', 'code' => '',
); );
} }
return $error;
} }
/** /**

6
phpBB/includes/db/mssqlnative.php
View file

@ -539,18 +539,20 @@ class dbal_mssqlnative extends dbal
$error = (isset($this->last_error_result) && $this->last_error_result) ? $this->last_error_result : array(); $error = (isset($this->last_error_result) && $this->last_error_result) ? $this->last_error_result : array();
} }
return array( $error = array(
'message' => $error, 'message' => $error,
'code' => $code, 'code' => $code,
); );
} }
else else
{ {
return array( $error = array(
'message' => $this->connect_error, 'message' => $this->connect_error,
'code' => '', 'code' => '',
); );
} }
return $error;
} }
/** /**

18
phpBB/includes/db/mysql.php
View file

@ -437,28 +437,32 @@ class dbal_mysql extends dbal
*/ */
function _sql_error() function _sql_error()
{ {
if (!$this->db_connect_id) if ($this->db_connect_id)
{
$error = array(
'message' => @mysql_error($this->db_connect_id),
'code' => @mysql_errno($this->db_connect_id),
);
}
else
{ {
if (function_exists('mysql_error')) if (function_exists('mysql_error'))
{ {
return array( $error = array(
'message' => @mysql_error(), 'message' => @mysql_error(),
'code' => @mysql_errno(), 'code' => @mysql_errno(),
); );
} }
else else
{ {
return array( $error = array(
'message' => $this->connect_error, 'message' => $this->connect_error,
'code' => '', 'code' => '',
); );
} }
} }
return array( return $error;
'message' => @mysql_error($this->db_connect_id),
'code' => @mysql_errno($this->db_connect_id),
);
} }
/** /**

18
phpBB/includes/db/mysqli.php
View file

@ -423,28 +423,32 @@ class dbal_mysqli extends dbal
*/ */
function _sql_error() function _sql_error()
{ {
if (!$this->db_connect_id) if ($this->db_connect_id)
{
$error = array(
'message' => @mysqli_error($this->db_connect_id),
'code' => @mysqli_errno($this->db_connect_id)
);
}
else
{ {
if (function_exists('mysqli_connect_error')) if (function_exists('mysqli_connect_error'))
{ {
return array( $error = array(
'message' => @mysqli_connect_error(), 'message' => @mysqli_connect_error(),
'code' => @mysqli_connect_errno(), 'code' => @mysqli_connect_errno(),
); );
} }
else else
{ {
return array( $error = array(
'message' => $this->connect_error, 'message' => $this->connect_error,
'code' => '', 'code' => '',
); );
} }
} }
return array( return $error;
'message' => @mysqli_error($this->db_connect_id),
'code' => @mysqli_errno($this->db_connect_id)
);
} }
/** /**

6
phpBB/includes/db/sqlite.php
View file

@ -302,18 +302,20 @@ class dbal_sqlite extends dbal
{ {
if (function_exists('sqlite_error_string')) if (function_exists('sqlite_error_string'))
{ {
return array( $error = array(
'message' => @sqlite_error_string(@sqlite_last_error($this->db_connect_id)), 'message' => @sqlite_error_string(@sqlite_last_error($this->db_connect_id)),
'code' => @sqlite_last_error($this->db_connect_id), 'code' => @sqlite_last_error($this->db_connect_id),
); );
} }
else else
{ {
return array( $error = array(
'message' => $this->connect_error, 'message' => $this->connect_error,
'code' => '', 'code' => '',
); );
} }
return $error;
} }
/** /**