Fix MySQL & PostgreSQL migrations

wallabag · Dec 14, 2022 · 47bf680 · 47bf680
1 parent ba7aabb
commit 47bf680
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 11 deletions.
diff --git a/app/DoctrineMigrations/Version20161001072726.php b/app/DoctrineMigrations/Version20161001072726.php
@@ -24,9 +24,8 @@ public function up(Schema $schema): void
                     WHERE TABLE_NAME = '" . $this->getTable('entry_tag', WallabagMigration::UN_ESCAPED_TABLE) . "' AND CONSTRAINT_NAME LIKE 'FK_%'
                     AND TABLE_SCHEMA = '" . $this->connection->getDatabase() . "'"
                 );
-                $query->execute();
 
-                foreach ($query->fetchAll() as $fk) {
+                foreach ($query->fetchAssociative() as $fk) {
                     $this->addSql('ALTER TABLE ' . $this->getTable('entry_tag') . ' DROP FOREIGN KEY ' . $fk['CONSTRAINT_NAME']);
                 }
                 break;
@@ -42,9 +41,8 @@ public function up(Schema $schema): void
                     AND    conrelid::regclass::text = '" . $this->getTable('entry_tag', WallabagMigration::UN_ESCAPED_TABLE) . "'
                     AND    n.nspname = 'public';"
                 );
-                $query->execute();
 
-                foreach ($query->fetchAll() as $fk) {
+                foreach ($query->fetchAssociative() as $fk) {
                     $this->addSql('ALTER TABLE ' . $this->getTable('entry_tag') . ' DROP CONSTRAINT ' . $fk['conname']);
                 }
                 break;
@@ -65,9 +63,8 @@ public function up(Schema $schema): void
                     AND COLUMN_NAME = 'entry_id'
                     AND TABLE_SCHEMA = '" . $this->connection->getDatabase() . "'"
                 );
-                $query->execute();
 
-                foreach ($query->fetchAll() as $fk) {
+                foreach ($query->fetchAssociative() as $fk) {
                     $this->addSql('ALTER TABLE ' . $this->getTable('annotation') . ' DROP FOREIGN KEY ' . $fk['CONSTRAINT_NAME']);
                 }
                 break;
@@ -84,9 +81,8 @@ public function up(Schema $schema): void
                     AND    n.nspname = 'public'
                     AND    pg_get_constraintdef(c.oid) LIKE '%entry_id%';"
                 );
-                $query->execute();
 
-                foreach ($query->fetchAll() as $fk) {
+                foreach ($query->fetchAssociative() as $fk) {
                     $this->addSql('ALTER TABLE ' . $this->getTable('annotation') . ' DROP CONSTRAINT ' . $fk['conname']);
                 }
                 break;

diff --git a/app/DoctrineMigrations/Version20170719231144.php b/app/DoctrineMigrations/Version20170719231144.php
@@ -21,13 +21,12 @@ public function up(Schema $schema): void
             GROUP BY LOWER(label)
             HAVING COUNT(*) > 1'
         );
-        $dupTags->execute();
 
-        foreach ($dupTags->fetchAll() as $duplicates) {
+        foreach ($dupTags->fetchAssociative() as $duplicates) {
             $label = $duplicates['lower_label'];
 
             // Retrieve all duplicate tags for a given tag
-            $tags = $this->connection->executeQuery('
+            $tags = $this->connection->query('
                 SELECT id
                 FROM   ' . $this->getTable('tag') . '
                 WHERE  LOWER(label) = :label