Merge branch '2.0'
This commit is contained in:
commit
cb9d7908d8
|
@ -184,6 +184,7 @@ class Configuration implements ConfigurationInterface
|
||||||
->useAttributeAsKey('name')
|
->useAttributeAsKey('name')
|
||||||
->prototype('array')
|
->prototype('array')
|
||||||
->children()
|
->children()
|
||||||
|
->scalarNode('driver')->defaultValue('mysql')->end()
|
||||||
->scalarNode('user')->defaultValue('root')->end()
|
->scalarNode('user')->defaultValue('root')->end()
|
||||||
->scalarNode('password')->defaultValue('')->end()
|
->scalarNode('password')->defaultValue('')->end()
|
||||||
->scalarNode('dsn')->defaultValue('')->end()
|
->scalarNode('dsn')->defaultValue('')->end()
|
||||||
|
|
|
@ -81,11 +81,17 @@ propel:
|
||||||
attributes: {}
|
attributes: {}
|
||||||
# default_connection: default
|
# default_connection: default
|
||||||
# connections:
|
# connections:
|
||||||
# default:
|
# default:
|
||||||
# driver: mysql
|
# driver: mysql
|
||||||
# user: root
|
# user: root
|
||||||
# password: null
|
# password: null
|
||||||
# dsn: mysql:host=localhost;dbname=test
|
# dsn: mysql:host=localhost;dbname=test
|
||||||
|
# slaves:
|
||||||
|
# slave_server_1:
|
||||||
|
# user: root
|
||||||
|
# password: null
|
||||||
|
# dsn: mysql:host=localhost;dbname=test_slave_1
|
||||||
|
#
|
||||||
# options:
|
# options:
|
||||||
# ATTR_PERSISTENT: false
|
# ATTR_PERSISTENT: false
|
||||||
# attributes:
|
# attributes:
|
||||||
|
|
Loading…
Reference in a new issue