From ba22ec8c469b5f20a9e81ace7f02d4d93b1ce30b Mon Sep 17 00:00:00 2001 From: Jake Barnby Date: Fri, 24 Jul 2026 13:52:18 +1200 Subject: [PATCH] fix(databases): route createAttribute DDL to the resolved database, not the project DB The databases worker resolves the collection's host database via getDatabasesDB($database) and passes it to deleteAttribute, createIndex and deleteIndex, but createAttribute was called with only $dbForProject. For a database whose collections live on a separate backing (e.g. a dedicated tablesdb/documentsdb/vectorsdb), the physical attribute DDL and its collection lookup then hit the shared project database, which doesn't hold the collection, and the column creation fails "Collection not found". Thread $dbForDatabases into createAttribute and run the createAttribute / createRelationship DDL on it, matching the sibling operations. For a non-dedicated database getDatabasesDB returns the project database, so this is a no-op there; the attributes metadata and cache purges stay on $dbForProject. Co-Authored-By: Claude Opus 4.8 --- .../Modules/Databases/Workers/Databases.php | 8 +- tests/unit/Platform/Workers/DatabasesTest.php | 91 +++++++++++++++++++ 2 files changed, 96 insertions(+), 3 deletions(-) create mode 100644 tests/unit/Platform/Workers/DatabasesTest.php diff --git a/src/Appwrite/Platform/Modules/Databases/Workers/Databases.php b/src/Appwrite/Platform/Modules/Databases/Workers/Databases.php index a6b13857a5..6dae0b15ae 100644 --- a/src/Appwrite/Platform/Modules/Databases/Workers/Databases.php +++ b/src/Appwrite/Platform/Modules/Databases/Workers/Databases.php @@ -93,7 +93,7 @@ class Databases extends Action match (\strval($type)) { DATABASE_TYPE_DELETE_DATABASE => $this->deleteDatabase($database, $dbForProject, $dbForDatabases), DATABASE_TYPE_DELETE_COLLECTION => $this->deleteCollection($database, $collection, $dbForProject, $dbForDatabases), - DATABASE_TYPE_CREATE_ATTRIBUTE => $this->createAttribute($database, $collection, $document, $project, $dbForPlatform, $dbForProject, $queueForRealtime), + DATABASE_TYPE_CREATE_ATTRIBUTE => $this->createAttribute($database, $collection, $document, $project, $dbForPlatform, $dbForProject, $dbForDatabases, $queueForRealtime), DATABASE_TYPE_DELETE_ATTRIBUTE => $this->deleteAttribute($database, $collection, $document, $project, $dbForPlatform, $dbForProject, $dbForDatabases, $queueForRealtime), DATABASE_TYPE_CREATE_INDEX => $this->createIndex($database, $collection, $document, $project, $dbForPlatform, $dbForProject, $dbForDatabases, $queueForRealtime), DATABASE_TYPE_DELETE_INDEX => $this->deleteIndex($database, $collection, $document, $project, $dbForPlatform, $dbForProject, $dbForDatabases, $queueForRealtime), @@ -108,6 +108,7 @@ class Databases extends Action * @param Document $project * @param Database $dbForPlatform * @param Database $dbForProject + * @param Database $dbForDatabases * @param Realtime $queueForRealtime * @return void * @throws Authorization @@ -122,6 +123,7 @@ class Databases extends Action Document $project, Database $dbForPlatform, Database $dbForProject, + Database $dbForDatabases, Realtime $queueForRealtime ): void { if ($collection->isEmpty()) { @@ -183,7 +185,7 @@ class Databases extends Action } if ( - !$dbForProject->createRelationship( + !$dbForDatabases->createRelationship( collection: 'database_' . $database->getSequence() . '_collection_' . $collection->getSequence(), relatedCollection: 'database_' . $database->getSequence() . '_collection_' . $relatedCollection->getSequence(), type: $options['relationType'], @@ -202,7 +204,7 @@ class Databases extends Action } break; default: - if (!$dbForProject->createAttribute('database_' . $database->getSequence() . '_collection_' . $collection->getSequence(), $key, $type, $size, $required, $default, $signed, $array, $format, $formatOptions, $filters)) { + if (!$dbForDatabases->createAttribute('database_' . $database->getSequence() . '_collection_' . $collection->getSequence(), $key, $type, $size, $required, $default, $signed, $array, $format, $formatOptions, $filters)) { throw new Exception('Failed to create attribute/column'); } } diff --git a/tests/unit/Platform/Workers/DatabasesTest.php b/tests/unit/Platform/Workers/DatabasesTest.php new file mode 100644 index 0000000000..4449393fcf --- /dev/null +++ b/tests/unit/Platform/Workers/DatabasesTest.php @@ -0,0 +1,91 @@ + 'attr1', + 'key' => 'note', + 'type' => Database::VAR_STRING, + 'size' => 64, + 'required' => false, + 'default' => null, + ]); + + // The shared project DB owns the `attributes` metadata but must never + // receive the collection DDL for a dedicated backing. + $dbForProject = $this->createMock(Database::class); + $dbForProject->method('getDocument')->willReturnCallback( + fn (string $collection, string $id) => $collection === 'attributes' ? $attribute : new Document() + ); + $dbForProject->method('updateDocument')->willReturnArgument(2); + $dbForProject->expects($this->never())->method('createAttribute'); + + $dbForPlatform = $this->createMock(Database::class); + $dbForPlatform->method('getDocument')->willReturn(new Document(['$id' => 'proj1'])); + + // The resolved (dedicated) backing must receive the physical DDL. + $dbForDatabases = $this->createMock(Database::class); + $dbForDatabases->expects($this->once()) + ->method('createAttribute') + ->willReturn(true); + + $worker = new class () extends Databases { + protected function trigger( + Document $database, + Document $collection, + Document $project, + string $event, + Realtime $queueForRealtime, + Document|null $attribute = null, + Document|null $index = null, + ): void { + } + }; + + $message = new Message([ + 'pid' => 'pid', + 'queue' => 'v1-databases', + 'timestamp' => \time(), + 'payload' => [ + 'type' => DATABASE_TYPE_CREATE_ATTRIBUTE, + 'database' => ['$id' => 'db1', '$sequence' => '30360'], + 'collection' => ['$id' => 'proof', '$sequence' => '1'], + 'document' => ['$id' => 'attr1'], + ], + ]); + + $worker->action( + $message, + new Document(['$id' => 'proj1']), + $dbForPlatform, + $dbForProject, + static fn () => $dbForDatabases, + $this->createStub(Realtime::class), + $this->createStub(Log::class), + ); + } +}