Skip to content

Commit

Permalink
minor #3944 Update dbal.rst (bpiepiora)
Browse files Browse the repository at this point in the history
This PR was submitted for the 2.5 branch but it was merged into the 2.3 branch instead (closes #3944).

Discussion
----------

Update dbal.rst

The SchemaTool throws an error if mapping_types are configured under default.connection. If configured under dbal everything works fine.

Commits
-------

bcfa370 Update dbal.rst
  • Loading branch information
weaverryan committed Aug 16, 2014
2 parents 7e09383 + 8d9389e commit ebaed21
Showing 1 changed file with 6 additions and 18 deletions.
24 changes: 6 additions & 18 deletions cookbook/doctrine/dbal.rst
Original file line number Diff line number Diff line change
Expand Up @@ -141,11 +141,8 @@ mapping type:
# app/config/config.yml
doctrine:
dbal:
connections:
default:
# other connections parameters
mapping_types:
enum: string
mapping_types:
enum: string
.. code-block:: xml
Expand All @@ -158,11 +155,7 @@ mapping type:
<doctrine:config>
<doctrine:dbal>
<doctrine:dbal default-connection="default">
<doctrine:connection>
<!-- other connections parameters -->
<doctrine:mapping-type name="enum">string</doctrine:mapping-type>
</doctrine:connection>
<doctrine:mapping-type name="enum">string</doctrine:mapping-type>
</doctrine:dbal>
</doctrine:config>
</container>
Expand All @@ -172,14 +165,9 @@ mapping type:
// app/config/config.php
$container->loadFromExtension('doctrine', array(
'dbal' => array(
'connections' => array(
'default' => array(
// other connection parameers
'mapping_types' => array(
'enum' => 'string',
),
),
),
mapping_types' => array(
'enum' => 'string',
),
),
));
Expand Down

0 comments on commit ebaed21

Please sign in to comment.