bug #43281 [Lock] Use platform to identify the PDO driver (Jean85)

derrabus · derrabus · commit 72cd43a60246 · 2021-10-04T16:45:18.000+02:00
This PR was squashed before being merged into the 5.4 branch. Discussion ---------- [Lock] Use platform to identify the PDO driver | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #43048 | License | MIT This should fix the issue in the same way we did for #42011. I'm not sure if I should add/change any test... Commits ------- 687a7ed [Lock] Use platform to identify the PDO driver
diff --git a/src/Symfony/Component/Lock/Store/PdoStore.php b/src/Symfony/Component/Lock/Store/PdoStore.php
@@ -299,7 +299,7 @@ public function createTable(): void
                 $sql = "CREATE TABLE $this->table ($this->idCol VARCHAR(64) NOT NULL PRIMARY KEY, $this->tokenCol VARCHAR(64) NOT NULL, $this->expirationCol INTEGER)";
                 break;
             default:
-                throw new \DomainException(sprintf('Creating the lock table is currently not implemented for PDO driver "%s".', $driver));
+                throw new \DomainException(sprintf('Creating the lock table is currently not implemented for platform "%s".', $driver));
         }
 
         if (method_exists($conn, 'executeStatement')) {
@@ -351,33 +351,33 @@ private function getDriver(): string
             $this->driver = $con->getAttribute(\PDO::ATTR_DRIVER_NAME);
         } else {
             $driver = $con->getDriver();
+            $platform = $driver->getDatabasePlatform();
+
+            if ($driver instanceof \Doctrine\DBAL\Driver\Mysqli\Driver) {
+                throw new \LogicException(sprintf('The adapter "%s" does not support the mysqli driver, use pdo_mysql instead.', static::class));
+            }
 
             switch (true) {
-                case $driver instanceof \Doctrine\DBAL\Driver\Mysqli\Driver:
-                    throw new \LogicException(sprintf('The adapter "%s" does not support the mysqli driver, use pdo_mysql instead.', static::class));
-                case $driver instanceof \Doctrine\DBAL\Driver\AbstractMySQLDriver:
+                case $platform instanceof \Doctrine\DBAL\Platforms\MySQLPlatform:
+                case $platform instanceof \Doctrine\DBAL\Platforms\MySQL57Platform:
                     $this->driver = 'mysql';
                     break;
-                case $driver instanceof \Doctrine\DBAL\Driver\PDOSqlite\Driver:
-                case $driver instanceof \Doctrine\DBAL\Driver\PDO\SQLite\Driver:
+                case $platform instanceof \Doctrine\DBAL\Platforms\SqlitePlatform:
                     $this->driver = 'sqlite';
                     break;
-                case $driver instanceof \Doctrine\DBAL\Driver\PDOPgSql\Driver:
-                case $driver instanceof \Doctrine\DBAL\Driver\PDO\PgSQL\Driver:
+                case $platform instanceof \Doctrine\DBAL\Platforms\PostgreSQLPlatform:
+                case $platform instanceof \Doctrine\DBAL\Platforms\PostgreSQL94Platform:
                     $this->driver = 'pgsql';
                     break;
-                case $driver instanceof \Doctrine\DBAL\Driver\OCI8\Driver:
-                case $driver instanceof \Doctrine\DBAL\Driver\PDOOracle\Driver:
-                case $driver instanceof \Doctrine\DBAL\Driver\PDO\OCI\Driver:
+                case $platform instanceof \Doctrine\DBAL\Platforms\OraclePlatform:
                     $this->driver = 'oci';
                     break;
-                case $driver instanceof \Doctrine\DBAL\Driver\SQLSrv\Driver:
-                case $driver instanceof \Doctrine\DBAL\Driver\PDOSqlsrv\Driver:
-                case $driver instanceof \Doctrine\DBAL\Driver\PDO\SQLSrv\Driver:
+                case $platform instanceof \Doctrine\DBAL\Platforms\SQLServerPlatform:
+                case $platform instanceof \Doctrine\DBAL\Platforms\SQLServer2012Platform:
                     $this->driver = 'sqlsrv';
                     break;
                 default:
-                    $this->driver = \get_class($driver);
+                    $this->driver = \get_class($platform);
                     break;
             }
         }
