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

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

diff --git a/app/DoctrineMigrations/Version20161106113822.php b/app/DoctrineMigrations/Version20161106113822.php
index 5032a8f0563e3cfbe229e5e75dcdeadd9612194f..facc14f4a1bba1acf5729f440f010edc275571bd 100644 (file)
--- a/app/DoctrineMigrations/Version20161106113822.php
+++ b/app/DoctrineMigrations/Version20161106113822.php
@@ -7,6 +7,9 @@ use Doctrine\DBAL\Schema\Schema;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
+/**
+ * Added action_mark_as_read field on config table.
+ */
 class Version20161106113822 extends AbstractMigration implements ContainerAwareInterface
 {
     /**
@@ -35,6 +38,7 @@ class Version20161106113822 extends AbstractMigration implements ContainerAwareI
 
         $configTable->addColumn('action_mark_as_read', 'integer', [
             'default' => 0,
+            'notnull' => false,
         ]);
     }
 
@@ -44,6 +48,9 @@ class Version20161106113822 extends AbstractMigration implements ContainerAwareI
     public function down(Schema $schema)
     {
         $configTable = $schema->getTable($this->getTable('config'));
-        $userTable->dropColumn('action_mark_as_read');
+
+        $this->skipIf(!$configTable->hasColumn('action_mark_as_read'), 'It seems that you already played this migration.');
+
+        $configTable->dropColumn('action_mark_as_read');
     }
 }