From c0649f73857bec123d5e960fb04f51a3d4ecf5f6 Mon Sep 17 00:00:00 2001
From: Torsten Dittmann <torsten.dittmann@googlemail.com>
Date: Mon, 27 Jun 2022 18:22:29 +0200
Subject: [PATCH] fix: migration

---
 src/Appwrite/Migration/Migration.php   | 4 +---
 src/Appwrite/Migration/Version/V14.php | 7 ++++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/Appwrite/Migration/Migration.php b/src/Appwrite/Migration/Migration.php
index 69f3b856e2..a133af08ac 100644
--- a/src/Appwrite/Migration/Migration.php
+++ b/src/Appwrite/Migration/Migration.php
@@ -106,9 +106,7 @@ abstract class Migration
             if ($collection['$collection'] !== Database::METADATA) {
                 continue;
             }
-            if ($collection['$id'] === 'databases') {
-                continue;
-            }
+
             $sum = 0;
             $nextDocument = null;
             $collectionCount = $this->projectDB->count($collection['$id']);
diff --git a/src/Appwrite/Migration/Version/V14.php b/src/Appwrite/Migration/Version/V14.php
index ff68859418..a7627d859c 100644
--- a/src/Appwrite/Migration/Version/V14.php
+++ b/src/Appwrite/Migration/Version/V14.php
@@ -172,9 +172,6 @@ class V14 extends Migration
                         $id = $collection->getId();
                         $internalId = $collection->getInternalId();
 
-                        if ($this->projectDB->exists(App::getEnv('_APP_DB_SCHEMA', 'appwrite'), "database_1_collection_{$internalId}")) {
-                            return;
-                        }
                         Console::log("- {$id} ({$collection->getAttribute('name')})");
 
                         try {
@@ -196,7 +193,11 @@ class V14 extends Migration
                                     name = 'database_1_collection_{$internalId}'
                                 WHERE _uid = 'collection_{$internalId}';
                             ")->execute();
+                        } catch (\Throwable $th) {
+                            Console::warning($th->getMessage());
+                        }
 
+                        try {
                             $collection
                                 ->setAttribute('databaseId', 'default')
                                 ->setAttribute('databaseInternalId', '1');