Merge pull request #915 from alcaeus/fix-default-table-option-rewriting

Don't rewrite defaultTableOptions in sharded or master/slave connections
doctrine · Feb 3, 2019 · 9fbabc9 · 9fbabc9
2 parents ae68d54 + 3622a34
commit 9fbabc9
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 2 deletions.
diff --git a/DependencyInjection/DoctrineExtension.php b/DependencyInjection/DoctrineExtension.php
@@ -251,6 +251,7 @@ protected function getConnectionOptions($connection)
                 'master' => true,
                 'shards' => true,
                 'serverVersion' => true,
+                'defaultTableOptions' => true,
                 // included by safety but should have been unset already
                 'logging' => true,
                 'profiling' => true,
@@ -285,6 +286,7 @@ protected function getConnectionOptions($connection)
                 'global' => true,
                 'shards' => true,
                 'serverVersion' => true,
+                'defaultTableOptions' => true,
                 // included by safety but should have been unset already
                 'logging' => true,
                 'profiling' => true,

diff --git a/Tests/DependencyInjection/AbstractDoctrineExtensionTest.php b/Tests/DependencyInjection/AbstractDoctrineExtensionTest.php
@@ -118,7 +118,6 @@ public function testDbalLoadSingleMasterSlaveConnection()
                 'dbname' => 'mysql_db',
                 'host' => 'localhost',
                 'unix_socket' => '/path/to/mysqld.sock',
-                'defaultTableOptions' => [],
             ],
             $param['master']
         );
@@ -133,6 +132,7 @@ public function testDbalLoadSingleMasterSlaveConnection()
             ],
             $param['slaves']['slave1']
         );
+        $this->assertEquals(['engine' => 'InnoDB'], $param['defaultTableOptions']);
     }
 
     public function testDbalLoadPoolShardingConnection()
@@ -152,7 +152,6 @@ public function testDbalLoadPoolShardingConnection()
                 'dbname' => 'mysql_db',
                 'host' => 'localhost',
                 'unix_socket' => '/path/to/mysqld.sock',
-                'defaultTableOptions' => [],
             ],
             $param['global']
         );
@@ -168,6 +167,7 @@ public function testDbalLoadPoolShardingConnection()
             ],
             $param['shards'][0]
         );
+        $this->assertEquals(['engine' => 'InnoDB'], $param['defaultTableOptions']);
     }
 
     public function testDbalLoadSavepointsForNestedTransactions()

diff --git a/Tests/DependencyInjection/Fixtures/config/xml/dbal_service_pool_sharding_connection.xml b/Tests/DependencyInjection/Fixtures/config/xml/dbal_service_pool_sharding_connection.xml
@@ -9,6 +9,7 @@
     <config>
         <dbal dbname="mysql_db" user="mysql_user" password="mysql_s3cr3t" unix-socket="/path/to/mysqld.sock" shard-choser-service="foo.shard_choser">
             <shard id="1" dbname="shard_db" user="shard_user" password="shard_s3cr3t" unix-socket="/path/to/mysqld_shard.sock" />
+            <default-table-option name="engine">InnoDB</default-table-option>
         </dbal>
     </config>
 </srv:container>
diff --git a/...s/DependencyInjection/Fixtures/config/xml/dbal_service_single_master_slave_connection.xml b/...s/DependencyInjection/Fixtures/config/xml/dbal_service_single_master_slave_connection.xml
@@ -9,6 +9,7 @@
     <config>
         <dbal dbname="mysql_db" user="mysql_user" password="mysql_s3cr3t" unix-socket="/path/to/mysqld.sock" keep-slave="true">
             <slave name="slave1" dbname="slave_db" user="slave_user" password="slave_s3cr3t" unix-socket="/path/to/mysqld_slave.sock" />
+            <default-table-option name="engine">InnoDB</default-table-option>
         </dbal>
     </config>
 </srv:container>
diff --git a/Tests/DependencyInjection/Fixtures/config/yml/dbal_service_pool_sharding_connection.yml b/Tests/DependencyInjection/Fixtures/config/yml/dbal_service_pool_sharding_connection.yml
@@ -5,6 +5,8 @@ doctrine:
         password: mysql_s3cr3t
         unix_socket: /path/to/mysqld.sock
         shard_choser_service: foo.shard_choser
+        default_table_options:
+            engine: InnoDB
         shards:
             -
                 id: 1

diff --git a/...s/DependencyInjection/Fixtures/config/yml/dbal_service_single_master_slave_connection.yml b/...s/DependencyInjection/Fixtures/config/yml/dbal_service_single_master_slave_connection.yml
@@ -5,6 +5,8 @@ doctrine:
         password: mysql_s3cr3t
         unix_socket: /path/to/mysqld.sock
         keep_slave: true
+        default_table_options:
+            engine: InnoDB
         slaves:
             slave1:
                 user: slave_user