[DoctrineBundle] Added memory and charset options

Added missing driver options (memory, used by sqlite; charset, used by oci) to the supported configuration options supported by DoctrineBundle.
symfony · Jul 16, 2010 · 1bc973e · 1bc973e
1 parent b828617
commit 1bc973e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git 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
@@ -21,6 +21,9 @@
     <xsd:attribute name="driver" type="xsd:string" />
     <xsd:attribute name="options" type="xsd:string" />
     <xsd:attribute name="path" type="xsd:string" />
+    <xsd:attribute name="unix_socket" type="xsd:string" />
+    <xsd:attribute name="memory" type="xsd:boolean" />
+    <xsd:attribute name="charset" type="xsd:string" />
   </xsd:complexType>
 
   <xsd:complexType name="connections">
@@ -39,6 +42,9 @@
     <xsd:attribute name="driver" type="xsd:string" />
     <xsd:attribute name="options" type="xsd:string" />
     <xsd:attribute name="path" type="xsd:string" />
+    <xsd:attribute name="unix_socket" type="xsd:string" />
+    <xsd:attribute name="memory" type="xsd:boolean" />
+    <xsd:attribute name="charset" type="xsd:string" />
     <xsd:attribute name="configuration_class" type="xsd:string" />
     <xsd:attribute name="event_manager_class" type="xsd:string" />
     <xsd:attribute name="wrapper_class" type="xsd:string" />