allow configuring schema manager factory

Author: dmaicher

Command/CreateDatabaseDoctrineCommand.php

@@ -65,7 +65,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         // Need to get rid of _every_ occurrence of dbname from connection configuration and we have already extracted all relevant info from url
         unset($params['dbname'], $params['path'], $params['url']);
 
-        $tmpConnection = DriverManager::getConnection($params);
+        $tmpConnection = DriverManager::getConnection($params, $connection->getConfiguration());
 
         $schemaManager           = method_exists($tmpConnection, 'createSchemaManager')
             ? $tmpConnection->createSchemaManager()

Command/DropDatabaseDoctrineCommand.php

@@ -88,7 +88,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         // Reopen connection without database name set
         // as some vendors do not allow dropping the database connected to.
         $connection->close();
-        $connection         = DriverManager::getConnection($params);
+        $connection         = DriverManager::getConnection($params, $connection->getConfiguration());
         $schemaManager      = method_exists($connection, 'createSchemaManager')
             ? $connection->createSchemaManager()
             : $connection->getSchemaManager();

DependencyInjection/Configuration.php

@@ -195,6 +195,9 @@ private function getDbalConnectionsNode(): ArrayNodeDefinition
                     ->useAttributeAsKey('name')
                     ->prototype('scalar')->end()
                 ->end()
+                ->scalarNode('schema_manager_factory')
+                    ->defaultValue('doctrine.dbal.default_schema_manager_factory')
+                ->end()
             ->end();
 
         // dbal < 2.11

DependencyInjection/DoctrineExtension.php

@@ -241,6 +241,8 @@ protected function loadDbalConnection($name, array $connection, ContainerBuilder
             ManagerRegistryAwareConnectionProvider::class,
             new Definition(ManagerRegistryAwareConnectionProvider::class, [$container->getDefinition('doctrine')])
         );
+
+        $configuration->addMethodCall('setSchemaManagerFactory', [new Reference($connection['schema_manager_factory'])]);
     }
 
     /**
@@ -264,6 +266,7 @@ protected function getConnectionOptions(array $connection): array
         }
 
         unset($options['override_url']);
+        unset($options['schema_manager_factory']);
 
         $options += $connectionDefaults;
 

Resources/config/dbal.xml

@@ -97,5 +97,7 @@
             <tag name="controller.service_arguments" />
         </service>
 
+        <service id="doctrine.dbal.default_schema_manager_factory" class="Doctrine\DBAL\Schema\DefaultSchemaManagerFactory" />
+
     </services>
 </container>

Resources/config/schema/doctrine-1.0.xsd

@@ -38,6 +38,7 @@
         <xsd:attribute name="profiling-collect-backtrace" type="xsd:string" default="false" />
         <xsd:attribute name="profiling-collect-schema-errors" type="xsd:string" default="true" />
         <xsd:attribute name="server-version" type="xsd:string" />
+        <xsd:attribute name="schema-manager-factory" type="xsd:string" default="doctrine.dbal.default_schema_manager_factory" />
         <xsd:attribute name="use-savepoints" type="xsd:boolean" />
         <xsd:attributeGroup ref="driver-config" />
     </xsd:attributeGroup>

Tests/DependencyInjection/AbstractDoctrineExtensionTest.php

@@ -235,6 +235,23 @@ public function testDbalLoadSavepointsForNestedTransactions(): void
         $this->assertCount(0, $calls);
     }
 
+    public function testDbalSchemaManagerFactory(): void
+    {
+        $container = $this->loadContainer('dbal_schema_manager_factory');
+
+        $this->assertDICDefinitionMethodCallOnce(
+            $container->getDefinition('doctrine.dbal.default_schema_manager_factory_connection.configuration'),
+            'setSchemaManagerFactory',
+            [new Reference('doctrine.dbal.default_schema_manager_factory')]
+        );
+
+        $this->assertDICDefinitionMethodCallOnce(
+            $container->getDefinition('doctrine.dbal.custom_schema_manager_factory_connection.configuration'),
+            'setSchemaManagerFactory',
+            [new Reference('custom_factory')]
+        );
+    }
+
     public function testLoadSimpleSingleConnection(): void
     {
         if (! interface_exists(EntityManagerInterface::class)) {
@@ -1025,9 +1042,7 @@ public function testDbalSchemaFilterNewConfig(): void
         }
     }
 
-    /**
-     * @group legacy
-     */
+    /** @group legacy */
     public function testWellKnownSchemaFilterDefaultTables(): void
     {
         $container = $this->getContainer([]);
@@ -1063,9 +1078,7 @@ public function testWellKnownSchemaFilterDefaultTables(): void
         $this->assertTrue($filter->__invoke('anything_else'));
     }
 
-    /**
-     * @group legacy
-     */
+    /** @group legacy */
     public function testWellKnownSchemaFilterOverriddenTables(): void
     {
         $container = $this->getContainer([]);

Tests/DependencyInjection/Fixtures/config/xml/dbal_schema_manager_factory.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" ?>
+
+<srv:container xmlns="http://symfony.com/schema/dic/doctrine"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:srv="http://symfony.com/schema/dic/services"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd
+                        http://symfony.com/schema/dic/doctrine http://symfony.com/schema/dic/doctrine/doctrine-1.0.xsd">
+
+    <config>
+        <dbal default-connection="custom_schema_manager_factory">
+            <connection name="default_schema_manager_factory" />
+            <connection name="custom_schema_manager_factory" schema-manager-factory="custom_factory" />
+        </dbal>
+    </config>
+</srv:container>

Tests/DependencyInjection/Fixtures/config/yml/dbal_schema_manager_factory.yml

@@ -0,0 +1,7 @@
+doctrine:
+    dbal:
+        default_connection: custom_schema_manager_factory
+        connections:
+            default_schema_manager_factory: ~
+            custom_schema_manager_factory:
+                schema_manager_factory: custom_factory

composer.json

@@ -31,7 +31,7 @@
     "require": {
         "php": "^7.4 || ^8.0",
         "doctrine/cache": "^1.11 || ^2.0",
-        "doctrine/dbal": "^3.4.0",
+        "doctrine/dbal": "^3.6.0",
         "doctrine/persistence": "^2.2 || ^3",
         "doctrine/sql-formatter": "^1.0.1",
         "symfony/cache": "^5.4 || ^6.0",