diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php
index c3ec21460..cc1e65ca9 100644
--- a/DependencyInjection/Configuration.php
+++ b/DependencyInjection/Configuration.php
@@ -139,6 +139,7 @@ private function getDbalConnectionsNode()
->scalarNode('schema_filter')->end()
->booleanNode('logging')->defaultValue($this->debug)->end()
->booleanNode('profiling')->defaultValue($this->debug)->end()
+ ->scalarNode('server_version')->end()
->scalarNode('driver_class')->end()
->scalarNode('wrapper_class')->end()
->scalarNode('shard_choser')->end()
diff --git a/DependencyInjection/DoctrineExtension.php b/DependencyInjection/DoctrineExtension.php
index ae151d45b..5de3aba76 100644
--- a/DependencyInjection/DoctrineExtension.php
+++ b/DependencyInjection/DoctrineExtension.php
@@ -236,6 +236,7 @@ protected function getConnectionOptions($connection)
'wrapper_class' => 'wrapperClass',
'keep_slave' => 'keepSlave',
'shard_choser' => 'shardChoser',
+ 'server_version' => 'serverVersion',
) as $old => $new) {
if (isset($options[$old])) {
$options[$new] = $options[$old];
diff --git a/Resources/config/schema/doctrine-1.0.xsd b/Resources/config/schema/doctrine-1.0.xsd
index 1c7d34d26..4773eff4f 100644
--- a/Resources/config/schema/doctrine-1.0.xsd
+++ b/Resources/config/schema/doctrine-1.0.xsd
@@ -36,6 +36,7 @@
+
diff --git a/Tests/DependencyInjection/AbstractDoctrineExtensionTest.php b/Tests/DependencyInjection/AbstractDoctrineExtensionTest.php
index 946f982c2..93dda9c18 100644
--- a/Tests/DependencyInjection/AbstractDoctrineExtensionTest.php
+++ b/Tests/DependencyInjection/AbstractDoctrineExtensionTest.php
@@ -112,6 +112,7 @@ public function testDbalLoadFromXmlSingleConnections()
$this->assertEquals('mysql_user', $config['user']);
$this->assertEquals('mysql_db', $config['dbname']);
$this->assertEquals('/path/to/mysqld.sock', $config['unix_socket']);
+ $this->assertEquals('5.6.20', $config['serverVersion']);
}
public function testDbalLoadSingleMasterSlaveConnection()
diff --git a/Tests/DependencyInjection/Fixtures/config/xml/dbal_service_single_connection.xml b/Tests/DependencyInjection/Fixtures/config/xml/dbal_service_single_connection.xml
index fada4ad26..fe2805841 100644
--- a/Tests/DependencyInjection/Fixtures/config/xml/dbal_service_single_connection.xml
+++ b/Tests/DependencyInjection/Fixtures/config/xml/dbal_service_single_connection.xml
@@ -7,6 +7,6 @@
http://symfony.com/schema/dic/doctrine http://symfony.com/schema/dic/doctrine/doctrine-1.0.xsd">
-
+
diff --git a/Tests/DependencyInjection/Fixtures/config/yml/dbal_service_single_connection.yml b/Tests/DependencyInjection/Fixtures/config/yml/dbal_service_single_connection.yml
index 9db7c3701..df67c5af7 100644
--- a/Tests/DependencyInjection/Fixtures/config/yml/dbal_service_single_connection.yml
+++ b/Tests/DependencyInjection/Fixtures/config/yml/dbal_service_single_connection.yml
@@ -4,3 +4,4 @@ doctrine:
user: mysql_user
password: mysql_s3cr3t
unix_socket: /path/to/mysqld.sock
+ server_version: 5.6.20