Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Fix for ticket #252 #298

Merged
merged 1 commit into from

3 participants

@tboerger

There is already a fix (SHA: 0b34a67) by fzaninotto for the above ticket, but it does not care about custom migration table names. This PR fixes this issue.

@willdurand
Owner

@fzaninotto agreed?

@willdurand
Owner

You may write a unit test by the way..

@fzaninotto
Collaborator

I don't see why it's in relation with #252. It's a fix for another problem. But it seems valid.

@tboerger

@fzaninotto But before your change on #252 it was not relevant for this part. :)

@willdurand willdurand merged commit 14a1702 into from
@willdurand
Owner

@tbpro thank you. Can you port this patch on Propel2 too?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
This page is out of date. Refresh to see the latest.
Showing with 3 additions and 2 deletions.
  1. +3 −2 generator/lib/task/PropelSQLDiffTask.php
View
5 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.');
}
}
-}
Something went wrong with that request. Please try again.