X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=app%2FDoctrineMigrations%2FVersion20170405182620.php;h=798c72af9e2018893a7c7842c0964eab609ce3b1;hb=2ca2ed39fd9bcaa212185ce4434cea44f3d2f4ba;hp=c1ae7df9a017e41ca1e34d7a344840cec913a537;hpb=7b0b3622ab2dd909028481b294c91f88a5682671;p=github%2Fwallabag%2Fwallabag.git

diff --git a/app/DoctrineMigrations/Version20170405182620.php b/app/DoctrineMigrations/Version20170405182620.php
index c1ae7df9..798c72af 100644
--- a/app/DoctrineMigrations/Version20170405182620.php
+++ b/app/DoctrineMigrations/Version20170405182620.php
@@ -2,34 +2,14 @@
 
 namespace Application\Migrations;
 
-use Doctrine\DBAL\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
+use Wallabag\CoreBundle\Doctrine\WallabagMigration;
 
 /**
  * Add published_at and published_by in `entry` table.
  */
-class Version20170405182620 extends AbstractMigration implements ContainerAwareInterface
+class Version20170405182620 extends WallabagMigration
 {
-    /**
-     * @var ContainerInterface
-     */
-    private $container;
-
-    public function setContainer(ContainerInterface $container = null)
-    {
-        $this->container = $container;
-    }
-
-    private function getTable($tableName)
-    {
-        return $this->container->getParameter('database_table_prefix').$tableName;
-    }
-
-    /**
-     * @param Schema $schema
-     */
     public function up(Schema $schema)
     {
         $entryTable = $schema->getTable($this->getTable('entry'));
@@ -40,14 +20,13 @@ class Version20170405182620 extends AbstractMigration implements ContainerAwareI
             'notnull' => false,
         ]);
 
+        $this->skipIf($entryTable->hasColumn('published_by'), 'It seems that you already played this migration.');
+
         $entryTable->addColumn('published_by', 'text', [
             'notnull' => false,
         ]);
     }
 
-    /**
-     * @param Schema $schema
-     */
     public function down(Schema $schema)
     {
         $entryTable = $schema->getTable($this->getTable('entry'));
@@ -55,6 +34,9 @@ class Version20170405182620 extends AbstractMigration implements ContainerAwareI
         $this->skipIf(!$entryTable->hasColumn('published_at'), 'It seems that you already played this migration.');
 
         $entryTable->dropColumn('published_at');
+
+        $this->skipIf(!$entryTable->hasColumn('published_by'), 'It seems that you already played this migration.');
+
         $entryTable->dropColumn('published_by');
     }
 }