Merge pull request #5890 from maxm86545/pdoexception

PDOException&DriverException

Author: derrabus

src/Driver/PDO/Connection.php

@@ -2,6 +2,7 @@
 
 namespace Doctrine\DBAL\Driver\PDO;
 
+use Doctrine\DBAL\Driver\PDO\PDOException as DriverPDOException;
 use Doctrine\DBAL\Driver\Result as ResultInterface;
 use Doctrine\DBAL\Driver\ServerInfoAwareConnection;
 use Doctrine\DBAL\Driver\Statement as StatementInterface;
@@ -107,17 +108,29 @@ public function lastInsertId($name = null)
 
     public function beginTransaction(): bool
     {
-        return $this->connection->beginTransaction();
+        try {
+            return $this->connection->beginTransaction();
+        } catch (PDOException $exception) {
+            throw DriverPDOException::new($exception);
+        }
     }
 
     public function commit(): bool
     {
-        return $this->connection->commit();
+        try {
+            return $this->connection->commit();
+        } catch (PDOException $exception) {
+            throw DriverPDOException::new($exception);
+        }
     }
 
     public function rollBack(): bool
     {
-        return $this->connection->rollBack();
+        try {
+            return $this->connection->rollBack();
+        } catch (PDOException $exception) {
+            throw DriverPDOException::new($exception);
+        }
     }
 
     public function getNativeConnection(): PDO

src/Driver/PDO/PDOException.php

@@ -0,0 +1,33 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\DBAL\Driver\PDO;
+
+use Doctrine\DBAL\Driver\Exception as DriverException;
+
+/**
+ * @internal
+ *
+ * @psalm-immutable
+ */
+final class PDOException extends \PDOException implements DriverException
+{
+    private ?string $sqlState = null;
+
+    public static function new(\PDOException $previous): self
+    {
+        $exception = new self($previous->message, 0, $previous);
+
+        $exception->errorInfo = $previous->errorInfo;
+        $exception->code      = $previous->code;
+        $exception->sqlState  = $previous->errorInfo[0] ?? null;
+
+        return $exception;
+    }
+
+    public function getSQLState(): ?string
+    {
+        return $this->sqlState;
+    }
+}

tests/Functional/TransactionTest.php

@@ -2,6 +2,7 @@
 
 namespace Doctrine\DBAL\Tests\Functional;
 
+use Doctrine\DBAL\Driver\Exception as DriverException;
 use Doctrine\DBAL\Platforms\AbstractMySQLPlatform;
 use Doctrine\DBAL\Tests\FunctionalTestCase;
 use PDOException;
@@ -30,6 +31,8 @@ public function testCommitFalse(): void
         try {
             self::assertFalse(@$this->connection->commit()); // we will ignore `MySQL server has gone away` warnings
         } catch (PDOException $e) {
+            self::assertInstanceOf(DriverException::class, $e);
+
             /* For PDO, we are using ERRMODE EXCEPTION, so this catch should be
              * necessary as the equivalent of the error control operator above.
              * This seems to be the case only since PHP 8 */