symfony
diff --git a/‎src/Symfony/Bundle/DoctrineBundle/DependencyInjection/DoctrineExtension.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/DoctrineBundle/DependencyInjection/DoctrineExtension.php
+1-1Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Bundle/DoctrineBundle/DependencyInjection/DoctrineExtension.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/DoctrineBundle/DependencyInjection/DoctrineExtension.php
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Bundle/DoctrineBundle/Resources/config/schema/doctrine-1.0.xsd
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/DoctrineBundle/Resources/config/schema/doctrine-1.0.xsd
+6Lines changed: 6 additions & 0 deletions b/‎src/Symfony/Bundle/DoctrineBundle/Resources/config/schema/doctrine-1.0.xsd
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/DoctrineBundle/Resources/config/schema/doctrine-1.0.xsd
+6Lines changed: 6 additions & 0 deletions
@@ -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];
                 }
 
@@ -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" />
Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ public function dbalLoad($config, ContainerBuilder $container)`
`125`	`125`	`if (isset($connection['options'])) {`
`126`	`126`	`$driverOptions['driverOptions'] = $connection['options'];`
`127`	`127`	`}`
`128`		`- foreach (array('dbname', 'host', 'user', 'password', 'path', 'port', 'unix_socket') as $key) {`
	`128`	`+ foreach (array('dbname', 'host', 'user', 'password', 'path', 'memory', 'port', 'unix_socket', 'charset') as $key) {`
`129`	`129`	`if (isset($connection[$key])) {`
`130`	`130`	`$driverOptions[$key] = $connection[$key];`
`131`	`131`	`}`