Permalink
Browse files

Merge pull request #298 from Langwhich/master

Fix for ticket #252
  • Loading branch information...
willdurand committed Mar 5, 2012
2 parents 841448e + 41f605a commit 14a17025040abc1efe33c9b27d19558db5fcf334
Showing with 3 additions and 2 deletions.
  1. +3 −2 generator/lib/task/PropelSQLDiffTask.php
@@ -106,7 +106,8 @@ public function main()
}
$manager = new PropelMigrationManager();
$manager->setConnections($connections);
- $manager->setMigrationDir($this->getOutputDirectory());
+ $manager->setMigrationDir($this->getOutputDirectory());
+ $manager->setMigrationTable($this->getGeneratorConfig()->getBuildProperty('migrationTable'));
if ($manager->hasPendingMigrations()) {
throw new Exception('Uncommitted migrations have been found ; you should either execute or delete them before rerunning the \'diff\' task');
@@ -186,4 +187,4 @@ public function main()
$this->log(' Once the migration class is valid, call the "migrate" task to execute it.');
}
}
-}
+}

0 comments on commit 14a1702

Please sign in to comment.