mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 22:10:45 +02:00
Code Issues Releases Wiki Activity

[ticket/17232] Improve SQL error messages handling

Browse Source 
PHP 7 changes how most errors are reported by PHP. Instead of reporting errors
through the traditional error reporting mechanism used by PHP 5, most errors
are now reported by throwing Error exceptions.
Use it to display meaningful SQL error messages instead of PHP fatal errors
for SQL errors.

PHPBB3-17232
This commit is contained in:
rxu
2023-12-20 11:45:58 +07:00
parent 213d092f6f
commit 6a8140e82b
7 changed files with 106 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
phpBB/phpbb/db/driver/mysqli.php
View File

@@ -197,7 +197,16 @@ class mysqli extends \phpbb\db\driver\mysql_base
if ($this->query_result === false)
{
if (($this->query_result = @mysqli_query($this->db_connect_id, $query)) === false)
try
{
$this->query_result = @mysqli_query($this->db_connect_id, $query);
}
catch (\Error $e)
{
// Do nothing as SQL driver will report the error
}
if ($this->query_result === false)
{
$this->sql_error($query);
}
@@ -345,24 +354,24 @@ class mysqli extends \phpbb\db\driver\mysql_base
{
if ($this->db_connect_id)
{
$error = array(
'message' => @mysqli_error($this->db_connect_id),
'code' => @mysqli_errno($this->db_connect_id)
);
$error = [
'message' => $this->db_connect_id->error,
'code' => $this->db_connect_id->errno,
];
}
else if (function_exists('mysqli_connect_error'))
{
$error = array(
'message' => @mysqli_connect_error(),
'code' => @mysqli_connect_errno(),
);
$error = [
'message' => $this->db_connect_id->connect_error,
'code' => $this->db_connect_id->connect_errno,
];
}
else
{
$error = array(
$error = [
'message' => $this->connect_error,
'code' => '',
);
];
}
return $error;