fix-db16-collection-creation

Meldiron · Meldiron · commit 2d841648bb03 · 2025-05-09T08:37:51.000Z
diff --git a/src/Database/Database.php b/src/Database/Database.php
@@ -1288,7 +1288,14 @@ public function createCollection(string $id, array $attributes = [], array $inde
             }
         }
 
-        $this->adapter->createCollection($id, $attributes, $indexes);
+        try {
+            $this->adapter->createCollection($id, $attributes, $indexes);
+        } catch (DuplicateException $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) {
             return new Document(self::COLLECTION);

Original file line number	Diff line number	Diff line change
`@@ -1288,7 +1288,14 @@ public function createCollection(string $id, array $attributes = [], array $inde`
`1288`	`1288`	`}`
`1289`	`1289`	`}`
`1290`	`1290`
`1291`		`- $this->adapter->createCollection($id, $attributes, $indexes);`
	`1291`	`+ try {`
	`1292`	`+ $this->adapter->createCollection($id, $attributes, $indexes);`
	`1293`	`+ } catch (DuplicateException $e) {`
	`1294`	`+ // HACK: Metadata should still be updated, can be removed when null tenant collections are supported.`
	`1295`	`+ if (!$this->adapter->getSharedTables() \|\| !$this->isMigrating()) {`
	`1296`	`+ throw $e;`
	`1297`	`+ }`
	`1298`	`+ }`
`1292`	`1299`
`1293`	`1300`	`if ($id === self::METADATA) {`
`1294`	`1301`	`return new Document(self::COLLECTION);`