Merge pull request propelorm#392 from havvg/1.5

use scalar for default connection alias

Author: havvg

Command/AbstractCommand.php

@@ -383,6 +383,10 @@ protected function createBuildTimeFile($file)
 
         $propelConfiguration = $container->get('propel.configuration');
         foreach ($propelConfiguration['datasources'] as $name => $datasource) {
+            if (is_scalar($datasource)) {
+                continue;
+            }
+
             $xml .= strtr(<<<EOT
       <datasource id="%name%">
         <adapter>%adapter%</adapter>

Command/SqlInsertCommand.php

@@ -111,6 +111,10 @@ protected function getConnections()
 
         $connections = array();
         foreach ($propelConfiguration['datasources'] as $name => $config) {
+            if (is_scalar($config)) {
+                continue;
+            }
+
             $connections[$name] = $config['connection'];
         }
 

DependencyInjection/PropelExtension.php

@@ -126,7 +126,7 @@ protected function dbalLoad(array $config, ContainerBuilder $container)
 
         // Alias the default connection if not defined
         if (!isset($c['datasources']['default'])) {
-            $c['datasources']['default'] = $c['datasources'][$connectionName];
+            $c['datasources']['default'] = $connectionName;
         }
 
         $container->getDefinition('propel.configuration')->setArguments(array($c));