deblan/propel-bundle
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #309 from K-Phoen/infer-default-connection

Browse source 
Fix default connection detection when not explicitly set in the config
This commit is contained in:
Toni Uebernickel 2015-06-10 20:56:30 +02:00
parent e3903ffad3 67eeb882e7
commit 1701a4e67d
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Command/AbstractCommand.php
View file

@ -354,7 +354,7 @@ abstract class AbstractCommand extends ContainerAwareCommand
{
$config = $this->getContainer()->getParameter('propel.configuration');
return $config['generator']['defaultConnection'];
return !empty($config['generator']['defaultConnection']) ? $config['generator']['defaultConnection'] : key($config['database']['connections']);
}
/**

3
PropelBundle.php
View file

@ -55,9 +55,10 @@ class PropelBundle extends Bundle
protected function configureConnections()
{
$config = $this->container->getParameter('propel.configuration');
$defaultConnection = !empty($config['runtime']['defaultConnection']) ? $config['runtime']['defaultConnection'] : key($config['database']['connections']);
$serviceContainer = Propel::getServiceContainer();
$serviceContainer->setDefaultDatasource($config['runtime']['defaultConnection']);
$serviceContainer->setDefaultDatasource($defaultConnection);
foreach ($config['database']['connections'] as $name => $config) {
if (!empty($config['slaves'])) {