X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=app%2FDoctrineMigrations%2FVersion20170719231144.php;h=93fe7f26031c44fe426f51ff78601fbc9776b6eb;hb=2a1ceb67b4400f46f4d3067e887ff54aa906f0a2;hp=9a6f3e938a0f751144715245ad0eca4f89e88f7c;hpb=98869090f6d113fa47dc80f9941749840c1442e8;p=github%2Fwallabag%2Fwallabag.git

diff --git a/app/DoctrineMigrations/Version20170719231144.php b/app/DoctrineMigrations/Version20170719231144.php
index 9a6f3e93..93fe7f26 100644
--- a/app/DoctrineMigrations/Version20170719231144.php
+++ b/app/DoctrineMigrations/Version20170719231144.php
@@ -2,26 +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;
 
 /**
  * Changed tags to lowercase.
  */
-class Version20170719231144 extends AbstractMigration implements ContainerAwareInterface
+class Version20170719231144 extends WallabagMigration
 {
-    /**
-     * @var ContainerInterface
-     */
-    private $container;
-
-    public function setContainer(ContainerInterface $container = null)
-    {
-        $this->container = $container;
-    }
-
     /**
      * @param Schema $schema
      */
@@ -67,7 +55,7 @@ class Version20170719231144 extends AbstractMigration implements ContainerAwareI
             }
 
             // Just in case...
-            if (count($ids) > 0) {
+            if (\count($ids) > 0) {
                 // Merge tags
                 $this->addSql('
                     UPDATE ' . $this->getTable('entry_tag') . '
@@ -75,7 +63,7 @@ class Version20170719231144 extends AbstractMigration implements ContainerAwareI
                     WHERE  tag_id IN (' . implode(',', $ids) . ')
                         AND entry_id NOT IN (
                            SELECT entry_id
-                           FROM ' . $this->getTable('entry_tag') . '
+                           FROM (SELECT * FROM ' . $this->getTable('entry_tag') . ') AS _entry_tag
                            WHERE tag_id = ' . $newId . '
                         )'
                 );
@@ -108,9 +96,4 @@ class Version20170719231144 extends AbstractMigration implements ContainerAwareI
     {
         throw new SkipMigrationException('Too complex ...');
     }
-
-    private function getTable($tableName)
-    {
-        return $this->container->getParameter('database_table_prefix') . $tableName;
-    }
 }