mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-29 01:59:19 +01:00
fix PHP 8.1 throws \mysqli_sql_exception or \PDOException for SQL errors
- change them to our regular Api\Db\Exception - for prop(find|patch) explicitly catch PDOException to deal more graceful with non-ascii prop-names
This commit is contained in:
parent
e939022817
commit
126bab8146
@ -776,6 +776,8 @@ class Db
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
try
|
||||
{
|
||||
if ($num_rows > 0)
|
||||
{
|
||||
$rs = $this->Link_ID->SelectLimit($Query_String, $num_rows, (int)$offset, $inputarr);
|
||||
@ -784,6 +786,11 @@ class Db
|
||||
{
|
||||
$rs = $this->Link_ID->Execute($Query_String, $inputarr);
|
||||
}
|
||||
}
|
||||
// PHP 8.1 mysqli throws its own exception
|
||||
catch(\mysqli_sql_exception $e) {
|
||||
throw new Db\Exception($e->getMessage(), $e->getCode(), $e);
|
||||
}
|
||||
$this->Row = 0;
|
||||
$this->Errno = $this->Link_ID->ErrorNo();
|
||||
$this->Error = $this->Link_ID->ErrorMsg();
|
||||
|
@ -27,10 +27,10 @@ class Exception extends \egw_exception_db
|
||||
* @param string $msg =null message, default "Database error!"
|
||||
* @param int $code =100
|
||||
*/
|
||||
function __construct($msg=null,$code=100)
|
||||
function __construct($msg=null, $code=100, \Exception $previous=null)
|
||||
{
|
||||
if (is_null($msg)) $msg = lang('Database error!');
|
||||
|
||||
parent::__construct($msg,$code);
|
||||
parent::__construct($msg, $code, $previous);
|
||||
}
|
||||
}
|
@ -1875,6 +1875,8 @@ GROUP BY A.fs_id';
|
||||
return false; // permission denied
|
||||
}
|
||||
$ins_stmt = $del_stmt = null;
|
||||
|
||||
try {
|
||||
foreach ($props as &$prop)
|
||||
{
|
||||
if (!array_key_exists('name', $prop))
|
||||
@ -1913,6 +1915,12 @@ GROUP BY A.fs_id';
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
// catch exception for inserting or deleting non-ascii prop_names
|
||||
catch (\PDOException $e) {
|
||||
_egw_log_exception($e);
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
@ -1945,10 +1953,16 @@ GROUP BY A.fs_id';
|
||||
(!is_null($ns) ? ' AND prop_namespace=?' : '');
|
||||
if (self::LOG_LEVEL > 2) $query = '/* '.__METHOD__.': '.__LINE__.' */ '.$query;
|
||||
|
||||
try {
|
||||
$stmt = self::$pdo->prepare($query);
|
||||
$stmt->setFetchMode(\PDO::FETCH_ASSOC);
|
||||
$stmt->execute(!is_null($ns) ? array($ns) : array());
|
||||
|
||||
}
|
||||
// cat exception trying to search for non-ascii prop_name
|
||||
catch (\PDOException $e) {
|
||||
_egw_log_exception($e);
|
||||
return [];
|
||||
}
|
||||
$props = array();
|
||||
foreach($stmt as $row)
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user