Simplify DSN stuff again

Author: andrewmy

docker-compose.yml

@@ -29,7 +29,7 @@ services:
       - STOMP_DSN=stomp://guest:guest@rabbitmq:61613/mqdev
       - RABITMQ_STOMP_DSN=stomp+rabbitmq://guest:guest@rabbitmq:61613/mqdev
       - RABBITMQ_MANAGMENT_DSN=http://guest:guest@rabbitmq:15672/mqdev
-      - DOCTRINE_DSN=mysql+pdo://root:rootpass@mysql/mqdev
+      - DOCTRINE_DSN=mysql://root:rootpass@mysql/mqdev
       - DOCTRINE_POSTGRES_DSN=postgres://postgres:pass@postgres/template1
       - MYSQL_DSN=mysql://root:rootpass@mysql/mqdev
       - POSTGRES_DSN=postgres://postgres:pass@postgres/postgres

pkg/dbal/DbalConnectionFactory.php

@@ -106,18 +106,21 @@ private function parseDsn(string $dsn, ?array $config = null): array
     {
         $parsedDsn = Dsn::parseFirst($dsn);
 
+        // enqueue scheme => dbal scheme
+        // out of the box dbal 4 schemes: pdo_mysql, pdo_sqlite, pdo_pgsql, pdo_oci, oci8, ibm_db2, pdo_sqlsrv, mysqli, pgsql, sqlsrv, sqlite3
+        // in case of multiple drivers like mysqli vs pdo_mysql the pdo variant is preferred
         $supported = [
-            'db2' => 'db2',
-            'ibm-db2' => 'ibm-db2',
-            'mssql' => 'mssql',
+            'db2' => 'ibm_db2',
+            'ibm-db2' => 'ibm_db2',
+            'mssql' => 'pdo_sqlsrv',
             'sqlsrv+pdo' => 'pdo_sqlsrv',
-            'mysql' => 'mysql',
-            'mysql2' => 'mysql2',
+            'mysql' => 'pdo_mysql',
+            'mysql2' => 'mysqli',
             'mysql+pdo' => 'pdo_mysql',
             'pgsql' => 'pgsql',
-            'postgres' => 'postgres',
+            'postgres' => 'pdo_pgsql',
             'pgsql+pdo' => 'pdo_pgsql',
-            'sqlite' => 'sqlite',
+            'sqlite' => 'sqlite3',
             'sqlite3' => 'sqlite3',
             'sqlite+pdo' => 'pdo_sqlite',
         ];
@@ -148,15 +151,11 @@ private function parseDsn(string $dsn, ?array $config = null): array
                 $dsn = $parsedDsn->getScheme().'://root@localhost';
             }
 
-            $doctrineSupported = [];
-            foreach ($supported as $k => $v) {
-                $doctrineSupported[$this->prepareDsnForDoctrine($k)] = $this->prepareDsnForDoctrine($v);
-            }
-            $dsnParser = new DsnParser($doctrineSupported);
+            $dsnParser = new DsnParser($supported);
 
             return [
                 'lazy' => true,
-                'connection' => $dsnParser->parse($this->prepareDsnForDoctrine($dsn)),
+                'connection' => $dsnParser->parse($dsn),
             ];
         }
 
@@ -169,9 +168,4 @@ private function parseDsn(string $dsn, ?array $config = null): array
             'connection' => ['url' => $dsn],
         ];
     }
-
-    private function prepareDsnForDoctrine(string $dsn): string
-    {
-        return preg_replace('/^([a-z0-9]+)\+pdo/i', 'pdo-$1', $dsn);
-    }
 }