X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=app%2FDoctrineMigrations%2FVersion20160410190541.php;h=c2360937447c0987d178b112845abe19af88ee5e;hb=a4d55a9161144f7e0daafff8da13dabc9e090ae2;hp=5de53d4b18b9f44e0f8ed1954418e3b81bbd70b3;hpb=73f7eabb6e10cff09a79105b6525e3c269e3cf08;p=github%2Fwallabag%2Fwallabag.git

diff --git a/app/DoctrineMigrations/Version20160410190541.php b/app/DoctrineMigrations/Version20160410190541.php
index 5de53d4b..c2360937 100644
--- a/app/DoctrineMigrations/Version20160410190541.php
+++ b/app/DoctrineMigrations/Version20160410190541.php
@@ -24,46 +24,12 @@ class Version20160410190541 extends AbstractMigration implements ContainerAwareI
         return $this->container->getParameter('database_table_prefix').$tableName;
     }
 
-    private function hasColumn($tableName, $columnName)
-    {
-        switch ($this->connection->getDatabasePlatform()->getName()) {
-            case 'sqlite':
-                $rows = $this->connection->executeQuery('pragma table_info('.$tableName.')')->fetchAll();
-                foreach ($rows as $column) {
-                    if (strcasecmp($column['name'], $columnName) === 0) {
-                        return true;
-                    }
-                }
-
-                return false;
-            case 'mysql':
-                $rows = $this->connection->executeQuery('SHOW COLUMNS FROM '.$tableName)->fetchAll();
-                foreach ($rows as $column) {
-                    if (strcasecmp($column['Field'], $columnName) === 0) {
-                        return true;
-                    }
-                }
-
-                return false;
-            case 'postgresql':
-                $sql = sprintf("SELECT count(*)
-                    FROM information_schema.columns
-                    WHERE table_schema = 'public' AND table_name = '%s' AND column_name = '%s'",
-                    $tableName,
-                    $columnName
-                );
-                $result = $this->connection->executeQuery($sql)->fetch();
-
-                return  $result['count'] > 0;
-        }
-    }
-
     /**
      * @param Schema $schema
      */
     public function up(Schema $schema)
     {
-        $this->skipIf($this->hasColumn($this->getTable('entry'), 'uuid'), 'It seems that you already played this migration.');
+        $this->skipIf($schema->getTable($this->getTable('entry'))->hasColumn('uuid'), 'It seems that you already played this migration.');
 
         if ($this->connection->getDatabasePlatform()->getName() == 'postgresql') {
             $this->addSql('ALTER TABLE "'.$this->getTable('entry').'" ADD uuid UUID DEFAULT NULL');