Permalink
Browse files

Merge pull request #851 from exptom/1.7.1-fix

Fix for migrate connection error
  • Loading branch information...
2 parents 25620fc + 06aa3ec commit 10180f952f38b3cdad287237b3ee439015739b0a @willdurand willdurand committed Mar 28, 2014
Showing with 1 addition and 1 deletion.
  1. +1 −1 runtime/lib/Propel.php
View
2 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 . ']');

0 comments on commit 10180f9

Please sign in to comment.