Keep Driver\DriverException

Author: beberlei

UPGRADE.md

@@ -88,7 +88,6 @@ The non-interface methods of driver-level classes have been marked internal:
 
 The following classes under the `Driver` namespace have been deprecated in favor of their consistently named counterparts:
 
-- `DriverException` → `LowLevelDriverException`
 - `AbstractDriverException` → `AbstractException`
 - `IBMDB2\DB2Driver` → `IBMDB2\Driver`
 - `IBMDB2\DB2Connection` → `IBMDB2\Connection`
@@ -110,7 +109,7 @@ All driver-specific exception classes have been deprecated:
 - `PDOException`
 - `SQLSrv\SQLSrvException`
 
-A driver-level exception should be only identified as a subtype of `Doctrine\DBAL\Driver\LowLevelDriverException` 
+A driver-level exception should be only identified as a subtype of `Doctrine\DBAL\Driver\DriverException` 
 or when its wrapped as `Doctrine\DBAL\Exception\DriverException`.
 Internal driver-level exception implementations may use `Driver\AbstractException` as the base class.
 Driver-specific exception handling has to be implemented either in the driver or based on the type of the `Driver` implementation.

lib/Doctrine/DBAL/Cache/ResultCacheStatement.php

@@ -4,8 +4,8 @@
 
 use ArrayIterator;
 use Doctrine\Common\Cache\Cache;
+use Doctrine\DBAL\Driver\DriverException;
 use Doctrine\DBAL\Driver\FetchUtils;
-use Doctrine\DBAL\Driver\LowLevelDriverException;
 use Doctrine\DBAL\Driver\Result;
 use Doctrine\DBAL\Driver\ResultStatement;
 use Doctrine\DBAL\Driver\Statement;
@@ -297,7 +297,7 @@ public function free(): void
     /**
      * @return array<string,mixed>|false
      *
-     * @throws LowLevelDriverException
+     * @throws DriverException
      */
     private function doFetch()
     {

lib/Doctrine/DBAL/DBALException.php

@@ -2,8 +2,8 @@
 
 namespace Doctrine\DBAL;
 
+use Doctrine\DBAL\Driver\DriverException as LowLevelDriverException;
 use Doctrine\DBAL\Driver\ExceptionConverterDriver;
-use Doctrine\DBAL\Driver\LowLevelDriverException;
 use Doctrine\DBAL\Exception\DriverException;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Types\Type;

lib/Doctrine/DBAL/Driver/DriverException.php

@@ -4,11 +4,31 @@
 
 namespace Doctrine\DBAL\Driver;
 
+use Throwable;
+
 /**
- * @deprecated
- *
  * @psalm-immutable
  */
-interface DriverException extends LowLevelDriverException
+interface DriverException extends Throwable
 {
+    /**
+     * Returns the driver specific error code if available.
+     *
+     * @deprecated Use {@link getCode()} or {@link getSQLState()} instead
+     *
+     * Returns null if no driver specific error code is available
+     * for the error raised by the driver.
+     *
+     * @return int|string|null
+     */
+    public function getErrorCode();
+
+    /**
+     * Returns the SQLSTATE the driver was in at the time the error occurred.
+     *
+     * Returns null if the driver does not provide a SQLSTATE for the error occurred.
+     *
+     * @return string|null
+     */
+    public function getSQLState();
 }

lib/Doctrine/DBAL/Driver/FetchUtils.php

@@ -12,7 +12,7 @@ final class FetchUtils
     /**
      * @return mixed|false
      *
-     * @throws LowLevelDriverException
+     * @throws DriverException
      */
     public static function fetchOne(Result $result)
     {
@@ -28,7 +28,7 @@ public static function fetchOne(Result $result)
     /**
      * @return array<int,array<int,mixed>>
      *
-     * @throws LowLevelDriverException
+     * @throws DriverException
      */
     public static function fetchAllNumeric(Result $result): array
     {
@@ -44,7 +44,7 @@ public static function fetchAllNumeric(Result $result): array
     /**
      * @return array<int,array<string,mixed>>
      *
-     * @throws LowLevelDriverException
+     * @throws DriverException
      */
     public static function fetchAllAssociative(Result $result): array
     {
@@ -60,7 +60,7 @@ public static function fetchAllAssociative(Result $result): array
     /**
      * @return array<int,mixed>
      *
-     * @throws LowLevelDriverException
+     * @throws DriverException
      */
     public static function fetchFirstColumn(Result $result): array
     {

lib/Doctrine/DBAL/Driver/LowLevelDriverException.php

@@ -14,7 +14,7 @@ interface Result
      *
      * @return array<int,mixed>|false
      *
-     * @throws LowLevelDriverException
+     * @throws DriverException
      */
     public function fetchNumeric();
 
@@ -23,7 +23,7 @@ public function fetchNumeric();
      *
      * @return array<string,mixed>|false
      *
-     * @throws LowLevelDriverException
+     * @throws DriverException
      */
     public function fetchAssociative();
 
@@ -32,7 +32,7 @@ public function fetchAssociative();
      *
      * @return mixed|false
      *
-     * @throws LowLevelDriverException
+     * @throws DriverException
      */
     public function fetchOne();
 
@@ -41,7 +41,7 @@ public function fetchOne();
      *
      * @return array<int,array<int,mixed>>
      *
-     * @throws LowLevelDriverException
+     * @throws DriverException
      */
     public function fetchAllNumeric(): array;
 
@@ -50,7 +50,7 @@ public function fetchAllNumeric(): array;
      *
      * @return array<int,array<string,mixed>>
      *
-     * @throws LowLevelDriverException
+     * @throws DriverException
      */
     public function fetchAllAssociative(): array;
 
@@ -59,7 +59,7 @@ public function fetchAllAssociative(): array;
      *
      * @return array<int,mixed>
      *
-     * @throws LowLevelDriverException
+     * @throws DriverException
      */
     public function fetchFirstColumn(): array;
 

lib/Doctrine/DBAL/Driver/Result.php

@@ -2,8 +2,8 @@
 
 namespace Doctrine\DBAL\Driver\SQLAnywhere;
 
+use Doctrine\DBAL\Driver\DriverException;
 use Doctrine\DBAL\Driver\FetchUtils;
-use Doctrine\DBAL\Driver\LowLevelDriverException;
 use Doctrine\DBAL\Driver\Result;
 use Doctrine\DBAL\Driver\Statement;
 use Doctrine\DBAL\Driver\StatementIterator;
@@ -352,7 +352,7 @@ public function fetchAssociative()
     /**
      * {@inheritdoc}
      *
-     * @throws LowLevelDriverException
+     * @throws DriverException
      */
     public function fetchOne()
     {
@@ -362,7 +362,7 @@ public function fetchOne()
     /**
      * @return array<int,array<int,mixed>>
      *
-     * @throws LowLevelDriverException
+     * @throws DriverException
      */
     public function fetchAllNumeric(): array
     {
@@ -372,7 +372,7 @@ public function fetchAllNumeric(): array
     /**
      * @return array<int,array<string,mixed>>
      *
-     * @throws LowLevelDriverException
+     * @throws DriverException
      */
     public function fetchAllAssociative(): array
     {
@@ -382,7 +382,7 @@ public function fetchAllAssociative(): array
     /**
      * @return array<int,mixed>
      *
-     * @throws LowLevelDriverException
+     * @throws DriverException
      */
     public function fetchFirstColumn(): array
     {

lib/Doctrine/DBAL/Driver/SQLAnywhere/SQLAnywhereStatement.php

@@ -3,7 +3,7 @@
 namespace Doctrine\DBAL\Exception;
 
 use Doctrine\DBAL\DBALException;
-use Doctrine\DBAL\Driver\LowLevelDriverException;
+use Doctrine\DBAL\Driver\DriverException as LowLevelDriverException;
 use Exception;
 
 /**

lib/Doctrine/DBAL/Exception/DriverException.php

@@ -3,7 +3,7 @@
 namespace Doctrine\DBAL\Schema;
 
 use Doctrine\DBAL\DBALException;
-use Doctrine\DBAL\Driver\LowLevelDriverException;
+use Doctrine\DBAL\Driver\DriverException;
 use Doctrine\DBAL\Platforms\OraclePlatform;
 use Doctrine\DBAL\Types\Type;
 use Throwable;
@@ -37,7 +37,7 @@ public function dropDatabase($database)
             $exception = $exception->getPrevious();
             assert($exception instanceof Throwable);
 
-            if (! $exception instanceof LowLevelDriverException) {
+            if (! $exception instanceof DriverException) {
                 throw $exception;
             }