Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 1bc973e

Browse filesBrowse files
Brandon Turnerfabpot
Brandon Turner
authored andcommitted
[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.
1 parent b828617 commit 1bc973e
Copy full SHA for 1bc973e

File tree

Expand file treeCollapse file tree

2 files changed

+7
-1
lines changed
Filter options
Expand file treeCollapse file tree

2 files changed

+7
-1
lines changed

‎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
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ public function dbalLoad($config, ContainerBuilder $container)
125125
if (isset($connection['options'])) {
126126
$driverOptions['driverOptions'] = $connection['options'];
127127
}
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) {
129129
if (isset($connection[$key])) {
130130
$driverOptions[$key] = $connection[$key];
131131
}

‎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
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@
2121
<xsd:attribute name="driver" type="xsd:string" />
2222
<xsd:attribute name="options" type="xsd:string" />
2323
<xsd:attribute name="path" type="xsd:string" />
24+
<xsd:attribute name="unix_socket" type="xsd:string" />
25+
<xsd:attribute name="memory" type="xsd:boolean" />
26+
<xsd:attribute name="charset" type="xsd:string" />
2427
</xsd:complexType>
2528

2629
<xsd:complexType name="connections">
@@ -39,6 +42,9 @@
3942
<xsd:attribute name="driver" type="xsd:string" />
4043
<xsd:attribute name="options" type="xsd:string" />
4144
<xsd:attribute name="path" type="xsd:string" />
45+
<xsd:attribute name="unix_socket" type="xsd:string" />
46+
<xsd:attribute name="memory" type="xsd:boolean" />
47+
<xsd:attribute name="charset" type="xsd:string" />
4248
<xsd:attribute name="configuration_class" type="xsd:string" />
4349
<xsd:attribute name="event_manager_class" type="xsd:string" />
4450
<xsd:attribute name="wrapper_class" type="xsd:string" />

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.