DBAL 4 compatibility

Author: andrewmy

docker/bin/refresh-mysql-database.php

@@ -9,8 +9,9 @@
 
 $dbalContext = (new DbalConnectionFactory($dsn))->createContext();
 
-$dbalContext->getDbalConnection()->getSchemaManager()->dropAndCreateDatabase($database);
-$dbalContext->getDbalConnection()->exec('USE '.$database);
+$dbalContext->getDbalConnection()->createSchemaManager()->dropDatabase($database);
+$dbalContext->getDbalConnection()->createSchemaManager()->createDatabase($database);
+$dbalContext->getDbalConnection()->executeQuery('USE '.$database);
 $dbalContext->createDataBaseTable();
 
 echo 'MySQL Database is updated'.\PHP_EOL;

docker/bin/refresh-postgres-database.php

@@ -8,7 +8,9 @@
 
 $dbalContext = (new DbalConnectionFactory($dsn))->createContext();
 
-$dbalContext->getDbalConnection()->getSchemaManager()->dropAndCreateDatabase('postgres');
+$database = 'postgres';
+$dbalContext->getDbalConnection()->createSchemaManager()->dropDatabase($database);
+$dbalContext->getDbalConnection()->createSchemaManager()->createDatabase($database);
 $dbalContext->createDataBaseTable();
 
 echo 'Postgresql Database is updated'.\PHP_EOL;

pkg/dbal/DbalConnectionFactory.php

@@ -6,6 +6,7 @@
 
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\DriverManager;
+use Doctrine\DBAL\Tools\DsnParser;
 use Enqueue\Dsn\Dsn;
 use Interop\Queue\ConnectionFactory;
 use Interop\Queue\Context;
@@ -142,13 +143,35 @@ private function parseDsn(string $dsn, ?array $config = null): array
             ];
         }
 
+        if (class_exists(DsnParser::class)) { // DBAL >= 4
+            if ($dsnHasProtocolOnly) {
+                $dsn = $parsedDsn->getScheme().'://root@localhost';
+            }
+
+            $doctrineSupported = [];
+            foreach ($supported as $k => $v) {
+                $doctrineSupported[$this->prepareDsnForDoctrine($k)] = $this->prepareDsnForDoctrine($v);
+            }
+            $dsnParser = new DsnParser($doctrineSupported);
+
+            return [
+                'lazy' => true,
+                'connection' => $dsnParser->parse($this->prepareDsnForDoctrine($dsn)),
+            ];
+        }
+
+        $dsn = $dsnHasProtocolOnly ?
+            $doctrineScheme.'://root@localhost' :
+            str_replace($parsedDsn->getScheme(), $doctrineScheme, $dsn);
+
         return [
             'lazy' => true,
-            'connection' => [
-                'url' => $dsnHasProtocolOnly ?
-                    $doctrineScheme.'://root@localhost' :
-                    str_replace($parsedDsn->getScheme(), $doctrineScheme, $dsn),
-            ],
+            'connection' => ['url' => $dsn],
         ];
     }
+
+    private function prepareDsnForDoctrine(string $dsn): string
+    {
+        return preg_replace('/^([a-z0-9]+)\+pdo/i', 'pdo-$1', $dsn);
+    }
 }

pkg/dbal/DbalContext.php

@@ -209,7 +209,7 @@ public function getDbalConnection(): Connection
 
     public function createDataBaseTable(): void
     {
-        $sm = $this->getDbalConnection()->getSchemaManager();
+        $sm = $this->getDbalConnection()->createSchemaManager();
 
         if ($sm->tablesExist([$this->getTableName()])) {
             return;
@@ -223,7 +223,7 @@ public function createDataBaseTable(): void
         $table->addColumn('headers', DbalType::TEXT, ['notnull' => false]);
         $table->addColumn('properties', DbalType::TEXT, ['notnull' => false]);
         $table->addColumn('redelivered', DbalType::BOOLEAN, ['notnull' => false]);
-        $table->addColumn('queue', DbalType::STRING);
+        $table->addColumn('queue', DbalType::STRING, ['length' => 255]);
         $table->addColumn('priority', DbalType::SMALLINT, ['notnull' => false]);
         $table->addColumn('delayed_until', DbalType::BIGINT, ['notnull' => false]);
         $table->addColumn('time_to_live', DbalType::BIGINT, ['notnull' => false]);

pkg/dbal/Tests/Spec/Mysql/CreateDbalContextTrait.php

@@ -16,8 +16,8 @@ protected function createDbalContext()
 
         $context = $factory->createContext();
 
-        if ($context->getDbalConnection()->getSchemaManager()->tablesExist([$context->getTableName()])) {
-            $context->getDbalConnection()->getSchemaManager()->dropTable($context->getTableName());
+        if ($context->getDbalConnection()->createSchemaManager()->tablesExist([$context->getTableName()])) {
+            $context->getDbalConnection()->createSchemaManager()->dropTable($context->getTableName());
         }
 
         $context->createDataBaseTable();

pkg/dbal/Tests/Spec/Postgresql/CreateDbalContextTrait.php

@@ -16,8 +16,8 @@ protected function createDbalContext()
 
         $context = $factory->createContext();
 
-        if ($context->getDbalConnection()->getSchemaManager()->tablesExist([$context->getTableName()])) {
-            $context->getDbalConnection()->getSchemaManager()->dropTable($context->getTableName());
+        if ($context->getDbalConnection()->createSchemaManager()->tablesExist([$context->getTableName()])) {
+            $context->getDbalConnection()->createSchemaManager()->dropTable($context->getTableName());
         }
 
         $context->createDataBaseTable();