diff --git a/DependencyInjection/DoctrineExtension.php b/DependencyInjection/DoctrineExtension.php
index ba76ef9c4..828876cf2 100644
--- 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
index bf1fd58a1..a7a6cfa1e 100644
--- 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
index a1495eec5..7618bb8c3 100644
--- 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 @@
+ InnoDB
diff --git a/Tests/DependencyInjection/Fixtures/config/xml/dbal_service_single_master_slave_connection.xml b/Tests/DependencyInjection/Fixtures/config/xml/dbal_service_single_master_slave_connection.xml
index d4011b17a..d0bf63add 100644
--- a/Tests/DependencyInjection/Fixtures/config/xml/dbal_service_single_master_slave_connection.xml
+++ b/Tests/DependencyInjection/Fixtures/config/xml/dbal_service_single_master_slave_connection.xml
@@ -9,6 +9,7 @@
+ InnoDB
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
index e57b91756..9b0fee476 100644
--- 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/Tests/DependencyInjection/Fixtures/config/yml/dbal_service_single_master_slave_connection.yml b/Tests/DependencyInjection/Fixtures/config/yml/dbal_service_single_master_slave_connection.yml
index b739bf72b..a07e55e3e 100644
--- a/Tests/DependencyInjection/Fixtures/config/yml/dbal_service_single_master_slave_connection.yml
+++ b/Tests/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