Merge pull request propelorm#851 from exptom/1.7.1-fix

Fix for migrate connection error
mybuilder · Mar 28, 2014 · 10180f9 · 10180f9
2 parents 25620fc + 06aa3ec
commit 10180f9
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/runtime/lib/Propel.php b/runtime/lib/Propel.php
@@ -648,7 +648,7 @@ public static function getSlaveConnection($name)
      */
     public static function initConnection($conparams, $name, $defaultClass = Propel::CLASS_PROPEL_PDO)
     {
-        $adapter = self::getDB($name);
+        $adapter = isset($conparams['adapter']) ? DBAdapter::factory($conparams['adapter']) : self::getDB($name);
 
         if (null === $conparams['dsn']) {
             throw new PropelException('No dsn specified in your connection parameters for datasource [' . $name . ']');