diff --git a/src/Symfony/Bundle/DoctrineBundle/DependencyInjection/DoctrineExtension.php b/src/Symfony/Bundle/DoctrineBundle/DependencyInjection/DoctrineExtension.php
index 955fe4b33f0d..b2f6a8a33ec0 100644
--- a/src/Symfony/Bundle/DoctrineBundle/DependencyInjection/DoctrineExtension.php
+++ b/src/Symfony/Bundle/DoctrineBundle/DependencyInjection/DoctrineExtension.php
@@ -125,7 +125,7 @@ public function dbalLoad($config, ContainerBuilder $container)
if (isset($connection['options'])) {
$driverOptions['driverOptions'] = $connection['options'];
}
- foreach (array('dbname', 'host', 'user', 'password', 'path', 'port', 'unix_socket') as $key) {
+ foreach (array('dbname', 'host', 'user', 'password', 'path', 'memory', 'port', 'unix_socket', 'charset') as $key) {
if (isset($connection[$key])) {
$driverOptions[$key] = $connection[$key];
}
diff --git a/src/Symfony/Bundle/DoctrineBundle/Resources/config/schema/doctrine-1.0.xsd b/src/Symfony/Bundle/DoctrineBundle/Resources/config/schema/doctrine-1.0.xsd
index 9e58993ca3c5..12a2c43a8d9c 100644
--- a/src/Symfony/Bundle/DoctrineBundle/Resources/config/schema/doctrine-1.0.xsd
+++ b/src/Symfony/Bundle/DoctrineBundle/Resources/config/schema/doctrine-1.0.xsd
@@ -21,6 +21,9 @@
+
+
+
@@ -39,6 +42,9 @@
+
+
+