standardebooks/web
1
0
Fork 0
mirror of https://github.com/standardebooks/web.git synced 2025-07-12 01:22:23 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix incorrect exception check in DB connection code

Browse source
This commit is contained in:
Alex Cabal 2024-04-29 11:28:57 -05:00
parent 233f8eb171
commit 5ee7e8e2ad
1 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
lib/DbConnection.php
View file

@ -1,8 +1,4 @@
<? <?
use Safe\DateTimeImmutable;
use function Safe\preg_match;
use function Safe\posix_getpwuid;
class DbConnection{ class DbConnection{
private ?\PDO $_link = null; private ?\PDO $_link = null;
public int $QueryCount = 0; public int $QueryCount = 0;
@ -108,12 +104,12 @@ class DbConnection{
$done = true; $done = true;
} }
catch(\PDOException $ex){ catch(\PDOException $ex){
if(isset($ex->errorInfo) && $ex->errorInfo[1] == 1213 && $deadlockRetries < 3){ // InnoDB deadlock, this is normal and happens occasionally. All we have to do is retry the query. if(isset($ex->errorInfo) && $ex->errorInfo[1] == 1213 && $deadlockRetries < 3){
// InnoDB deadlock, this is normal and happens occasionally. All we have to do is retry the query.
$deadlockRetries++; $deadlockRetries++;
usleep(500000 * $deadlockRetries); // Give the deadlock some time to clear up. Start at .5 seconds usleep(500000 * $deadlockRetries); // Give the deadlock some time to clear up. Start at .5 seconds
} }
elseif($ex->getCode() == '23000'){ elseif(isset($ex->errorInfo) && $ex->errorInfo[1] == 1062){
// Duplicate key, bubble this up without logging it so the business logic can handle it // Duplicate key, bubble this up without logging it so the business logic can handle it
throw new Exceptions\DuplicateDatabaseKeyException(); throw new Exceptions\DuplicateDatabaseKeyException();
} }
@ -130,7 +126,7 @@ class DbConnection{
} }
/** /**
* @param \PdoException $ex The exception to create details from. * @param PdoException $ex The exception to create details from.
* @param string $preparedSql The prepared SQL that caused the exception. * @param string $preparedSql The prepared SQL that caused the exception.
* @param array<mixed> $params The parameters passed to the prepared SQL. * @param array<mixed> $params The parameters passed to the prepared SQL.
*/ */