]> git.immae.eu Git - github/wallabag/wallabag.git/commitdiff
Fixed check on index 2789/head
authorNicolas Lœuillet <nicolas@loeuillet.org>
Fri, 27 Jan 2017 11:10:52 +0000 (12:10 +0100)
committerNicolas Lœuillet <nicolas@loeuillet.org>
Fri, 27 Jan 2017 13:11:21 +0000 (14:11 +0100)
app/DoctrineMigrations/Version20170127093841.php

index 384529a1b511d60e143506d770a134ce72674e85..20c79479b97c79376f31b2b51650a54d62b4ec9e 100644 (file)
@@ -36,8 +36,7 @@ class Version20170127093841 extends AbstractMigration implements ContainerAwareI
     public function up(Schema $schema)
     {
         $entryTable = $schema->getTable($this->getTable('entry'));
-        $this->skipIf($entryTable->hasIndex($this->indexStarredName), 'It seems that you already played this migration.');
-        $this->skipIf($entryTable->hasIndex($this->indexStarredName), 'It seems that you already played this migration.');
+        $this->skipIf($entryTable->hasIndex($this->indexStarredName) && $entryTable->hasIndex($this->indexArchivedName), 'It seems that you already played this migration.');
 
         $entryTable->addIndex(['is_starred'], $this->indexStarredName);
         $entryTable->addIndex(['is_archived'], $this->indexArchivedName);
@@ -49,8 +48,7 @@ class Version20170127093841 extends AbstractMigration implements ContainerAwareI
     public function down(Schema $schema)
     {
         $entryTable = $schema->getTable($this->getTable('entry'));
-        $this->skipIf(false === $entryTable->hasIndex($this->indexStarredName), 'It seems that you already played this migration.');
-        $this->skipIf(false === $entryTable->hasIndex($this->indexStarredName), 'It seems that you already played this migration.');
+        $this->skipIf(false === $entryTable->hasIndex($this->indexStarredName) && false === $entryTable->hasIndex($this->indexArchivedName), 'It seems that you already played this migration.');
 
         $entryTable->dropIndex($this->indexStarredName);
         $entryTable->dropIndex($this->indexArchivedName);