X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=app%2FDoctrineMigrations%2FVersion20160410190541.php;h=5e5cae35c3185f84d8bd470d11b7918bf7f3f2e7;hb=6ed2627bb35561e32d702fbe67247349dd67453e;hp=80bcd12a96adbb7894e4c645336fff479fbda33a;hpb=7a340375c30531e0983deacdbfe39f13cb961005;p=github%2Fwallabag%2Fwallabag.git diff --git a/app/DoctrineMigrations/Version20160410190541.php b/app/DoctrineMigrations/Version20160410190541.php index 80bcd12a..5e5cae35 100644 --- a/app/DoctrineMigrations/Version20160410190541.php +++ b/app/DoctrineMigrations/Version20160410190541.php @@ -8,7 +8,7 @@ use Symfony\Component\DependencyInjection\ContainerAwareInterface; use Symfony\Component\DependencyInjection\ContainerInterface; /** - * Added foreign keys for account resetting + * Added foreign keys for account resetting. */ class Version20160410190541 extends AbstractMigration implements ContainerAwareInterface { @@ -34,7 +34,7 @@ class Version20160410190541 extends AbstractMigration implements ContainerAwareI { $entryTable = $schema->getTable($this->getTable('entry')); - $this->skipIf($entryTable->hasColumn('uid'), 'It seems that you already played this migration.'); + $this->skipIf($entryTable->hasColumn('uid') || $entryTable->hasColumn('uuid'), 'It seems that you already played this migration.'); $entryTable->addColumn('uid', 'string', [ 'notnull' => false,