From 3e68e533a52b7babf1f5f2e703f8a5045b399d5b Mon Sep 17 00:00:00 2001 From: Chirag Aggarwal Date: Sun, 5 Jul 2026 21:57:09 +0530 Subject: [PATCH 1/2] (fix): skip existing attributes in batch attribute creation Re-running a migration whose attribute batch partially exists (e.g. 1.9.x installs where V24 already created deploymentRetention, startCommand, buildSpecification and runtimeSpecification) caused the whole createAttributes call to fail with Duplicate, so new attributes like providerBranches and providerPaths were never created. Filter out attributes that already exist on the live collection before batching, return early when nothing is left, and fall back to per-attribute creation if the batch still hits a duplicate. --- src/Appwrite/Migration/Migration.php | 46 +++++++++++++++-- .../unit/Migration/MigrationVersionsTest.php | 51 +++++++++++++++++++ 2 files changed, 93 insertions(+), 4 deletions(-) diff --git a/src/Appwrite/Migration/Migration.php b/src/Appwrite/Migration/Migration.php index 96f16ca57f..82e9983dc2 100644 --- a/src/Appwrite/Migration/Migration.php +++ b/src/Appwrite/Migration/Migration.php @@ -317,7 +317,19 @@ abstract class Migration $attributes = $collection['attributes']; $attributeKeys = \array_column($collection['attributes'], '$id'); + $database->purgeCachedCollection($collectionId); + + $existingIds = \array_map( + fn ($attribute) => $attribute->getId(), + $database->getCollection($collectionId)->getAttribute('attributes', []) + ); + foreach ($attributeIds as $attributeId) { + if (\in_array($attributeId, $existingIds)) { + Console::warning("Skipping attribute \"{$attributeId}\" in collection {$collectionId}: Attribute already exists"); + continue; + } + $attributeKey = \array_search($attributeId, $attributeKeys); if ($attributeKey === false) { @@ -334,10 +346,36 @@ abstract class Migration $attributesToCreate[] = $attribute; } - $database->createAttributes( - collection: $collectionId, - attributes: $attributesToCreate, - ); + if (empty($attributesToCreate)) { + return; + } + + try { + $database->createAttributes( + collection: $collectionId, + attributes: $attributesToCreate, + ); + } catch (Duplicate) { + foreach ($attributesToCreate as $attribute) { + try { + $database->createAttribute( + collection: $collectionId, + id: $attribute['$id'], + type: $attribute['type'], + size: $attribute['size'], + required: $attribute['required'], + default: $attribute['default'], + signed: $attribute['signed'] ?? true, + array: $attribute['array'] ?? false, + format: $attribute['format'] ?? '', + formatOptions: $attribute['formatOptions'] ?? [], + filters: $attribute['filters'], + ); + } catch (Duplicate) { + Console::warning("Skipping attribute \"{$attribute['$id']}\" in collection {$collectionId}: Attribute already exists"); + } + } + } } /** diff --git a/tests/unit/Migration/MigrationVersionsTest.php b/tests/unit/Migration/MigrationVersionsTest.php index 6274d0820c..7726ece210 100644 --- a/tests/unit/Migration/MigrationVersionsTest.php +++ b/tests/unit/Migration/MigrationVersionsTest.php @@ -132,4 +132,55 @@ final class MigrationVersionsTest extends TestCase $this->assertArrayHasKey('firstSeen', $attributes); $this->assertArrayHasKey('lastSeen', $attributes); } + + public function testCreateAttributesFromCollectionSkipsExistingAttributes(): void + { + require_once __DIR__ . '/../../../app/init.php'; + + $authorization = new Authorization(); + $database = new Database(new Memory(), new Cache(new NoCache())); + $database + ->setAuthorization($authorization) + ->setDatabase('migrationV24Functions') + ->setNamespace('migration_functions_' . \uniqid()); + $database->create(); + $database->createCollection('functions'); + + $migration = new V24(); + $migration->setProject( + new Document(['$id' => 'project', '$sequence' => '1']), + $database, + $database, + $authorization, + ); + + $existing = [ + 'deploymentRetention', + 'startCommand', + 'buildSpecification', + 'runtimeSpecification', + ]; + $new = [ + 'providerBranches', + 'providerPaths', + ]; + + \ob_start(); + try { + $migration->createAttributesFromCollection($database, 'functions', $existing); + $migration->createAttributesFromCollection($database, 'functions', [...$existing, ...$new]); + $migration->createAttributesFromCollection($database, 'functions', [...$existing, ...$new]); + } finally { + \ob_end_clean(); + } + + $attributes = []; + foreach ($database->getCollection('functions')->getAttribute('attributes', []) as $attribute) { + $attributes[] = $attribute instanceof Document ? $attribute->getAttribute('$id') : ($attribute['$id'] ?? ''); + } + + foreach ([...$existing, ...$new] as $id) { + $this->assertContains($id, $attributes); + } + } } From 958fe4d5146e1d67c41df2ed713f4bb4682b4faf Mon Sep 17 00:00:00 2001 From: Chirag Aggarwal Date: Sun, 5 Jul 2026 22:01:10 +0530 Subject: [PATCH 2/2] (fix): use strict comparison for existing attribute check --- src/Appwrite/Migration/Migration.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Appwrite/Migration/Migration.php b/src/Appwrite/Migration/Migration.php index 82e9983dc2..b37846b642 100644 --- a/src/Appwrite/Migration/Migration.php +++ b/src/Appwrite/Migration/Migration.php @@ -325,7 +325,7 @@ abstract class Migration ); foreach ($attributeIds as $attributeId) { - if (\in_array($attributeId, $existingIds)) { + if (\in_array($attributeId, $existingIds, true)) { Console::warning("Skipping attribute \"{$attributeId}\" in collection {$collectionId}: Attribute already exists"); continue; }