Merge remote-tracking branch 'origin/master' into 2.3

[github/wallabag/wallabag.git] / app / DoctrineMigrations / Version20170127093841.php

diff --git a/app/DoctrineMigrations/Version20170127093841.php b/app/DoctrineMigrations/Version20170127093841.php
index 384529a1b511d60e143506d770a134ce72674e85..5bfd967025d9d029d59ea179de0dd63d35029c7b 100644 (file)
--- a/app/DoctrineMigrations/Version20170127093841.php
+++ b/app/DoctrineMigrations/Version20170127093841.php
@@ -8,7 +8,7 @@ use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
- * Added indexes on wallabag_entry.is_starred and wallabag_entry.is_archived
+ * Added indexes on wallabag_entry.is_starred and wallabag_entry.is_archived.
  */
 class Version20170127093841 extends AbstractMigration implements ContainerAwareInterface
 {
@@ -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);