Merge branch 'ticket/kellanved/9521' into develop-olympus

* ticket/kellanved/9521:
  [ticket/9521] Fix error reporting for the native SQL Server plugin.
This commit is contained in:
Andreas Fischer 2010-07-31 02:08:40 +02:00
commit ccb4182d29

8
phpBB/includes/db/mssqlnative.php Normal file → Executable file
View file

@ -503,6 +503,7 @@ class dbal_mssqlnative extends dbal
{
$errors = @sqlsrv_errors(SQLSRV_ERR_ERRORS);
$error_message = '';
$code = 0;
if ($errors != null)
{
@ -510,6 +511,7 @@ class dbal_mssqlnative extends dbal
{
$error_message .= "SQLSTATE: ".$error[ 'SQLSTATE']."\n";
$error_message .= "code: ".$error[ 'code']."\n";
$code = $error['code'];
$error_message .= "message: ".$error[ 'message']."\n";
}
$this->last_error_result = $error_message;
@ -519,7 +521,11 @@ class dbal_mssqlnative extends dbal
{
$error = (isset($this->last_error_result) && $this->last_error_result) ? $this->last_error_result : array();
}
return $error;
return array(
'message' => $error,
'code' => $code,
);
}
/**