From 8d8cc7be79e9796c86117213f12ae9ad40791ae2 Mon Sep 17 00:00:00 2001 From: Yunan NSNT Date: Fri, 18 Dec 2015 00:08:52 +0700 Subject: [PATCH 1/2] set `defaultConnection` value for both `runtime` and `generator` if there is only one connection --- DependencyInjection/PropelExtension.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/DependencyInjection/PropelExtension.php b/DependencyInjection/PropelExtension.php index c374553..da04ef9 100644 --- a/DependencyInjection/PropelExtension.php +++ b/DependencyInjection/PropelExtension.php @@ -36,6 +36,12 @@ class PropelExtension extends Extension $configuration = $this->getConfiguration($configs, $container); $config = $processor->processConfiguration($configuration, $configs); + if (1 === count($config['database']['connections'])) { + $defaultConnection = array_keys($config['database']['connections'])[0]; + $config['runtime']['defaultConnection'] = $defaultConnection; + $config['generator']['defaultConnection'] = $defaultConnection; + } + $container->setParameter('propel.logging', $config['runtime']['logging']); $container->setParameter('propel.configuration', $config); From 301df4331c429dd832929a1950cacecd616be45b Mon Sep 17 00:00:00 2001 From: Yunan NSNT Date: Fri, 18 Dec 2015 10:16:07 +0700 Subject: [PATCH 2/2] check whether the value of defaultConnection have been set or not --- DependencyInjection/PropelExtension.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/DependencyInjection/PropelExtension.php b/DependencyInjection/PropelExtension.php index da04ef9..5a2ebdd 100644 --- a/DependencyInjection/PropelExtension.php +++ b/DependencyInjection/PropelExtension.php @@ -38,8 +38,12 @@ class PropelExtension extends Extension if (1 === count($config['database']['connections'])) { $defaultConnection = array_keys($config['database']['connections'])[0]; - $config['runtime']['defaultConnection'] = $defaultConnection; - $config['generator']['defaultConnection'] = $defaultConnection; + if (!isset($config['runtime']['defaultConnection'])) { + $config['runtime']['defaultConnection'] = $defaultConnection; + } + if (!isset($config['generator']['defaultConnection'])) { + $config['generator']['defaultConnection'] = $defaultConnection; + } } $container->setParameter('propel.logging', $config['runtime']['logging']);