Merge pull request #571 from utopia-php/fix-collection-delete-v1

Fix: collection deletion on V1

Author: abnegate

src/Database/Adapter/MariaDB.php

@@ -331,9 +331,13 @@ public function deleteCollection(string $id): bool
 
         $sql = $this->trigger(Database::EVENT_COLLECTION_DELETE, $sql);
 
-        return $this->getPDO()
-            ->prepare($sql)
-            ->execute();
+        try {
+            return $this->getPDO()
+                ->prepare($sql)
+                ->execute();
+        } catch (PDOException $e) {
+            throw $this->processException($e);
+        }
     }
 
     /**

src/Database/Database.php

@@ -1449,7 +1449,14 @@ public function deleteCollection(string $id): bool
             $this->deleteRelationship($collection->getId(), $relationship->getId());
         }
 
-        $this->adapter->deleteCollection($id);
+        try {
+            $this->adapter->deleteCollection($id);
+        } catch (NotFoundException $e) {
+            // HACK: Metadata should still be updated, can be removed when null tenant collections are supported.
+            if (!$this->adapter->getSharedTables() || !$this->isMigrating()) {
+                throw $e;
+            }
+        }
 
         if ($id === self::METADATA) {
             $deleted = true;