From e6239550077089669696886145c469aeb23c4489 Mon Sep 17 00:00:00 2001 From: Cursor Agent Date: Fri, 28 Aug 2026 11:58:23 +0000 Subject: [PATCH 1/4] Fix TypeError committing bulkDelete with array queries Transaction log queries can be SDK JSON strings or already-decoded {method, attribute, values} arrays. Query::parseQueries() always calls parse(string), which TypeErrors on arrays during commit. Parse each stored query with parseQuery() or parse() so valid array queries commit successfully. Apply the same handling when replaying logs in TransactionState. Fixes CLOUD-3QMK Co-authored-by: Chirag Aggarwal --- src/Appwrite/Databases/TransactionState.php | 34 ++++- .../Http/Databases/Transactions/Update.php | 34 ++++- .../Transactions/TransactionsBase.php | 134 ++++++++++++++++++ 3 files changed, 198 insertions(+), 4 deletions(-) diff --git a/src/Appwrite/Databases/TransactionState.php b/src/Appwrite/Databases/TransactionState.php index 8799ef60e5..6ed83865d4 100644 --- a/src/Appwrite/Databases/TransactionState.php +++ b/src/Appwrite/Databases/TransactionState.php @@ -463,7 +463,7 @@ class TransactionState case 'bulkUpdate': if (isset($data['queries']) && isset($data['data'])) { - $queries = Query::parseQueries($data['queries'] ?? []); + $queries = $this->parseStoredQueries($data['queries'] ?? []); $updateData = $data['data']; foreach ($state[$collectionId] ?? [] as $docId => $entry) { @@ -520,7 +520,7 @@ class TransactionState case 'bulkDelete': if (isset($data['queries'])) { - $queries = Query::parseQueries($data['queries'] ?? []); + $queries = $this->parseStoredQueries($data['queries'] ?? []); $filters = $this->extractFilters($queries); foreach ($state[$collectionId] ?? [] as $docId => $entry) { @@ -738,4 +738,34 @@ class TransactionState return true; } + + /** + * Parse queries stored on a transaction log. + * + * Each query may be an SDK JSON string or an already-decoded + * `{method, attribute, values}` array. + * + * @param array $queries + * @return array + * @throws Exception\Query + */ + private function parseStoredQueries(array $queries): array + { + $parsed = []; + + foreach ($queries as $query) { + if (\is_array($query)) { + $parsed[] = Query::parseQuery($query); + continue; + } + + if (!\is_string($query)) { + throw new Exception\Query('Invalid query. Must be a string or array, got ' . \gettype($query)); + } + + $parsed[] = Query::parse($query); + } + + return $parsed; + } } diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Transactions/Update.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Transactions/Update.php index f70c707c5d..136ae17428 100644 --- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Transactions/Update.php +++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Transactions/Update.php @@ -860,7 +860,7 @@ class Update extends Action \DateTime $createdAt, array &$state ): int { - $queries = Query::parseQueries($data['queries'] ?? []); + $queries = $this->parseStoredQueries($data['queries'] ?? []); $updateData = new Document($data['data']); $dependentDocs = []; @@ -982,7 +982,7 @@ class Update extends Action \DateTime $createdAt, array &$state ): int { - $queries = Query::parseQueries($data['queries'] ?? []); + $queries = $this->parseStoredQueries($data['queries'] ?? []); $count = $dbForProject->deleteDocuments( $collectionId, @@ -1007,4 +1007,34 @@ class Update extends Action return $count; } + + /** + * Parse queries stored on a transaction log. + * + * Each query may be an SDK JSON string or an already-decoded + * `{method, attribute, values}` array. + * + * @param array $queries + * @return array + * @throws QueryException + */ + private function parseStoredQueries(array $queries): array + { + $parsed = []; + + foreach ($queries as $query) { + if (\is_array($query)) { + $parsed[] = Query::parseQuery($query); + continue; + } + + if (!\is_string($query)) { + throw new QueryException('Invalid query. Must be a string or array, got ' . \gettype($query)); + } + + $parsed[] = Query::parse($query); + } + + return $parsed; + } } diff --git a/tests/e2e/Services/Databases/Transactions/TransactionsBase.php b/tests/e2e/Services/Databases/Transactions/TransactionsBase.php index a49b9cf25b..b15636f8c2 100644 --- a/tests/e2e/Services/Databases/Transactions/TransactionsBase.php +++ b/tests/e2e/Services/Databases/Transactions/TransactionsBase.php @@ -2668,6 +2668,140 @@ trait TransactionsBase $this->assertEquals(0, $response['body']['total']); } + /** + * Commit bulkUpdate/bulkDelete with SDK query strings and decoded query arrays. + */ + public function testBulkDeleteAndUpdateWithArrayQueries(): void + { + $database = $this->client->call(Client::METHOD_POST, $this->getDatabaseUrl(), array_merge([ + 'content-type' => 'application/json', + 'x-appwrite-project' => $this->getProject()['$id'], + 'x-appwrite-key' => $this->getProject()['apiKey'] + ]), [ + 'databaseId' => ID::unique(), + 'name' => 'BulkArrayQueriesTestDB' + ]); + + $databaseId = $database['body']['$id']; + + $collection = $this->client->call(Client::METHOD_POST, $this->getContainerUrl($databaseId), array_merge([ + 'content-type' => 'application/json', + 'x-appwrite-project' => $this->getProject()['$id'], + 'x-appwrite-key' => $this->getProject()['apiKey'] + ]), [ + $this->getContainerIdParam() => ID::unique(), + 'name' => 'TestCollection', + 'permissions' => [ + Permission::create(Role::any()), + Permission::read(Role::any()), + Permission::update(Role::any()), + Permission::delete(Role::any()), + ], + ]); + + $collectionId = $collection['body']['$id']; + + if ($this->getSupportForAttributes()) { + $this->client->call(Client::METHOD_POST, $this->getSchemaUrl($databaseId, $collectionId, "string", null), array_merge([ + 'content-type' => 'application/json', + 'x-appwrite-project' => $this->getProject()['$id'], + 'x-appwrite-key' => $this->getProject()['apiKey'] + ]), [ + 'key' => 'name', + 'size' => 256, + 'required' => true, + ]); + + $this->client->call(Client::METHOD_POST, $this->getSchemaUrl($databaseId, $collectionId, "string", null), array_merge([ + 'content-type' => 'application/json', + 'x-appwrite-project' => $this->getProject()['$id'], + 'x-appwrite-key' => $this->getProject()['apiKey'] + ]), [ + 'key' => 'category', + 'size' => 256, + 'required' => false, + ]); + $this->waitForAllAttributes($databaseId, $collectionId); + } + + foreach (['keep_1', 'keep_2', 'drop_1', 'drop_2'] as $id) { + $category = \str_starts_with($id, 'keep') ? 'keep' : 'drop'; + $this->client->call(Client::METHOD_POST, $this->getRecordUrl($databaseId, $collectionId, null), array_merge([ + 'content-type' => 'application/json', + 'x-appwrite-project' => $this->getProject()['$id'], + 'x-appwrite-key' => $this->getProject()['apiKey'] + ]), [ + $this->getRecordIdParam() => $id, + 'data' => [ + 'name' => $id, + 'category' => $category, + ] + ]); + } + + $transaction = $this->client->call(Client::METHOD_POST, $this->getTransactionUrl(), array_merge([ + 'content-type' => 'application/json', + 'x-appwrite-project' => $this->getProject()['$id'], + ], $this->getHeaders())); + + $this->assertEquals(201, $transaction['headers']['status-code']); + $transactionId = $transaction['body']['$id']; + + $response = $this->client->call(Client::METHOD_POST, $this->getTransactionUrl($transactionId) . "/operations", array_merge([ + 'content-type' => 'application/json', + 'x-appwrite-project' => $this->getProject()['$id'], + 'x-appwrite-key' => $this->getProject()['apiKey'] + ]), [ + 'operations' => [ + [ + 'databaseId' => $databaseId, + $this->getContainerIdParam() => $collectionId, + 'action' => 'bulkUpdate', + 'data' => [ + 'queries' => [Query::equal('category', ['keep'])->toArray()], + 'data' => ['name' => 'updated'], + ], + ], + [ + 'databaseId' => $databaseId, + $this->getContainerIdParam() => $collectionId, + 'action' => 'bulkDelete', + 'data' => [ + 'queries' => [ + Query::equal('category', ['drop'])->toString(), + Query::equal('name', ['drop_1', 'drop_2'])->toArray(), + ], + ], + ], + ] + ]); + + $this->assertEquals(201, $response['headers']['status-code']); + + $response = $this->client->call(Client::METHOD_PATCH, $this->getTransactionUrl($transactionId), array_merge([ + 'content-type' => 'application/json', + 'x-appwrite-project' => $this->getProject()['$id'], + 'x-appwrite-key' => $this->getProject()['apiKey'] + ]), [ + 'commit' => true + ]); + + $this->assertEquals(200, $response['headers']['status-code'], \json_encode($response['body'])); + + $response = $this->client->call(Client::METHOD_GET, $this->getRecordUrl($databaseId, $collectionId, null), array_merge([ + 'content-type' => 'application/json', + 'x-appwrite-project' => $this->getProject()['$id'], + ], $this->getHeaders())); + + $this->assertEquals(200, $response['headers']['status-code']); + $this->assertEquals(2, $response['body']['total']); + + foreach ($response['body'][$this->getRecordResource()] as $doc) { + $this->assertEquals('keep', $doc['category']); + $this->assertEquals('updated', $doc['name']); + } + } + /** * Test multiple single route operations in one transaction */ From d67dd4ea42689eced9f6f5d54b5fe2090309a272 Mon Sep 17 00:00:00 2001 From: Chirag Aggarwal Date: Mon, 31 Aug 2026 19:18:45 +0100 Subject: [PATCH 2/4] Test transaction replay with array queries --- src/Appwrite/Databases/TransactionState.php | 2 +- .../Http/Databases/Transactions/Update.php | 33 ++----------------- .../Transactions/TransactionsBase.php | 18 +++++++++- 3 files changed, 20 insertions(+), 33 deletions(-) diff --git a/src/Appwrite/Databases/TransactionState.php b/src/Appwrite/Databases/TransactionState.php index 6ed83865d4..c3082f8e0f 100644 --- a/src/Appwrite/Databases/TransactionState.php +++ b/src/Appwrite/Databases/TransactionState.php @@ -749,7 +749,7 @@ class TransactionState * @return array * @throws Exception\Query */ - private function parseStoredQueries(array $queries): array + public function parseStoredQueries(array $queries): array { $parsed = []; diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Transactions/Update.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Transactions/Update.php index 136ae17428..c8efd4680e 100644 --- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Transactions/Update.php +++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Transactions/Update.php @@ -860,7 +860,7 @@ class Update extends Action \DateTime $createdAt, array &$state ): int { - $queries = $this->parseStoredQueries($data['queries'] ?? []); + $queries = $transactionState->parseStoredQueries($data['queries'] ?? []); $updateData = new Document($data['data']); $dependentDocs = []; @@ -982,7 +982,7 @@ class Update extends Action \DateTime $createdAt, array &$state ): int { - $queries = $this->parseStoredQueries($data['queries'] ?? []); + $queries = $transactionState->parseStoredQueries($data['queries'] ?? []); $count = $dbForProject->deleteDocuments( $collectionId, @@ -1008,33 +1008,4 @@ class Update extends Action return $count; } - /** - * Parse queries stored on a transaction log. - * - * Each query may be an SDK JSON string or an already-decoded - * `{method, attribute, values}` array. - * - * @param array $queries - * @return array - * @throws QueryException - */ - private function parseStoredQueries(array $queries): array - { - $parsed = []; - - foreach ($queries as $query) { - if (\is_array($query)) { - $parsed[] = Query::parseQuery($query); - continue; - } - - if (!\is_string($query)) { - throw new QueryException('Invalid query. Must be a string or array, got ' . \gettype($query)); - } - - $parsed[] = Query::parse($query); - } - - return $parsed; - } } diff --git a/tests/e2e/Services/Databases/Transactions/TransactionsBase.php b/tests/e2e/Services/Databases/Transactions/TransactionsBase.php index b15636f8c2..0361cc7031 100644 --- a/tests/e2e/Services/Databases/Transactions/TransactionsBase.php +++ b/tests/e2e/Services/Databases/Transactions/TransactionsBase.php @@ -2671,8 +2671,9 @@ trait TransactionsBase /** * Commit bulkUpdate/bulkDelete with SDK query strings and decoded query arrays. */ - public function testBulkDeleteAndUpdateWithArrayQueries(): void + public function testUpdateBulkOperationsWithArrayQueries(): void { + // Test for SUCCESS $database = $this->client->call(Client::METHOD_POST, $this->getDatabaseUrl(), array_merge([ 'content-type' => 'application/json', 'x-appwrite-project' => $this->getProject()['$id'], @@ -2778,6 +2779,21 @@ trait TransactionsBase $this->assertEquals(201, $response['headers']['status-code']); + $response = $this->client->call(Client::METHOD_GET, $this->getRecordUrl($databaseId, $collectionId, null), array_merge([ + 'content-type' => 'application/json', + 'x-appwrite-project' => $this->getProject()['$id'], + ], $this->getHeaders()), [ + 'transactionId' => $transactionId + ]); + + $this->assertEquals(200, $response['headers']['status-code']); + $this->assertEquals(2, $response['body']['total']); + + foreach ($response['body'][$this->getRecordResource()] as $doc) { + $this->assertEquals('keep', $doc['category']); + $this->assertEquals('updated', $doc['name']); + } + $response = $this->client->call(Client::METHOD_PATCH, $this->getTransactionUrl($transactionId), array_merge([ 'content-type' => 'application/json', 'x-appwrite-project' => $this->getProject()['$id'], From 208c47c573c3357078f93ec2d560ff1434c853cf Mon Sep 17 00:00:00 2001 From: Chirag Aggarwal Date: Mon, 31 Aug 2026 19:34:52 +0100 Subject: [PATCH 3/4] Reject array queries in transaction operations --- .../Utopia/Database/Validator/Operation.php | 6 ++ .../Transactions/TransactionsBase.php | 64 ++++++------------- 2 files changed, 24 insertions(+), 46 deletions(-) diff --git a/src/Appwrite/Utopia/Database/Validator/Operation.php b/src/Appwrite/Utopia/Database/Validator/Operation.php index 6d50611708..6d85fd703c 100644 --- a/src/Appwrite/Utopia/Database/Validator/Operation.php +++ b/src/Appwrite/Utopia/Database/Validator/Operation.php @@ -177,6 +177,12 @@ class Operation extends Validator $this->description = "Key 'queries' must be an array for {$action}"; return false; } + foreach ($value['data']['queries'] as $query) { + if (!\is_string($query)) { + $this->description = "Key 'data.queries' must contain only strings for {$action}"; + return false; + } + } } // BulkUpdate requires both queries and data diff --git a/tests/e2e/Services/Databases/Transactions/TransactionsBase.php b/tests/e2e/Services/Databases/Transactions/TransactionsBase.php index 0361cc7031..1e68f16ebb 100644 --- a/tests/e2e/Services/Databases/Transactions/TransactionsBase.php +++ b/tests/e2e/Services/Databases/Transactions/TransactionsBase.php @@ -2669,11 +2669,11 @@ trait TransactionsBase } /** - * Commit bulkUpdate/bulkDelete with SDK query strings and decoded query arrays. + * Reject bulkUpdate/bulkDelete with decoded query arrays. */ - public function testUpdateBulkOperationsWithArrayQueries(): void + public function testCreateBulkOperationsWithArrayQueries(): void { - // Test for SUCCESS + // Test for FAILURE $database = $this->client->call(Client::METHOD_POST, $this->getDatabaseUrl(), array_merge([ 'content-type' => 'application/json', 'x-appwrite-project' => $this->getProject()['$id'], @@ -2763,59 +2763,31 @@ trait TransactionsBase 'data' => ['name' => 'updated'], ], ], + ] + ]); + + $this->assertEquals(400, $response['headers']['status-code']); + $this->assertEquals('general_argument_invalid', $response['body']['type']); + + $response = $this->client->call(Client::METHOD_POST, $this->getTransactionUrl($transactionId) . "/operations", array_merge([ + 'content-type' => 'application/json', + 'x-appwrite-project' => $this->getProject()['$id'], + 'x-appwrite-key' => $this->getProject()['apiKey'] + ]), [ + 'operations' => [ [ 'databaseId' => $databaseId, $this->getContainerIdParam() => $collectionId, 'action' => 'bulkDelete', 'data' => [ - 'queries' => [ - Query::equal('category', ['drop'])->toString(), - Query::equal('name', ['drop_1', 'drop_2'])->toArray(), - ], + 'queries' => [Query::equal('category', ['drop'])->toArray()], ], ], ] ]); - $this->assertEquals(201, $response['headers']['status-code']); - - $response = $this->client->call(Client::METHOD_GET, $this->getRecordUrl($databaseId, $collectionId, null), array_merge([ - 'content-type' => 'application/json', - 'x-appwrite-project' => $this->getProject()['$id'], - ], $this->getHeaders()), [ - 'transactionId' => $transactionId - ]); - - $this->assertEquals(200, $response['headers']['status-code']); - $this->assertEquals(2, $response['body']['total']); - - foreach ($response['body'][$this->getRecordResource()] as $doc) { - $this->assertEquals('keep', $doc['category']); - $this->assertEquals('updated', $doc['name']); - } - - $response = $this->client->call(Client::METHOD_PATCH, $this->getTransactionUrl($transactionId), array_merge([ - 'content-type' => 'application/json', - 'x-appwrite-project' => $this->getProject()['$id'], - 'x-appwrite-key' => $this->getProject()['apiKey'] - ]), [ - 'commit' => true - ]); - - $this->assertEquals(200, $response['headers']['status-code'], \json_encode($response['body'])); - - $response = $this->client->call(Client::METHOD_GET, $this->getRecordUrl($databaseId, $collectionId, null), array_merge([ - 'content-type' => 'application/json', - 'x-appwrite-project' => $this->getProject()['$id'], - ], $this->getHeaders())); - - $this->assertEquals(200, $response['headers']['status-code']); - $this->assertEquals(2, $response['body']['total']); - - foreach ($response['body'][$this->getRecordResource()] as $doc) { - $this->assertEquals('keep', $doc['category']); - $this->assertEquals('updated', $doc['name']); - } + $this->assertEquals(400, $response['headers']['status-code']); + $this->assertEquals('general_argument_invalid', $response['body']['type']); } /** From 8182b12c9250a7a30662f1d9fd632140295f4ab5 Mon Sep 17 00:00:00 2001 From: Chirag Aggarwal Date: Mon, 31 Aug 2026 20:05:24 +0100 Subject: [PATCH 4/4] Enforce transaction query input at validation --- src/Appwrite/Databases/TransactionState.php | 34 ++----------------- .../Http/Databases/Transactions/Update.php | 5 ++- 2 files changed, 4 insertions(+), 35 deletions(-) diff --git a/src/Appwrite/Databases/TransactionState.php b/src/Appwrite/Databases/TransactionState.php index c3082f8e0f..8799ef60e5 100644 --- a/src/Appwrite/Databases/TransactionState.php +++ b/src/Appwrite/Databases/TransactionState.php @@ -463,7 +463,7 @@ class TransactionState case 'bulkUpdate': if (isset($data['queries']) && isset($data['data'])) { - $queries = $this->parseStoredQueries($data['queries'] ?? []); + $queries = Query::parseQueries($data['queries'] ?? []); $updateData = $data['data']; foreach ($state[$collectionId] ?? [] as $docId => $entry) { @@ -520,7 +520,7 @@ class TransactionState case 'bulkDelete': if (isset($data['queries'])) { - $queries = $this->parseStoredQueries($data['queries'] ?? []); + $queries = Query::parseQueries($data['queries'] ?? []); $filters = $this->extractFilters($queries); foreach ($state[$collectionId] ?? [] as $docId => $entry) { @@ -738,34 +738,4 @@ class TransactionState return true; } - - /** - * Parse queries stored on a transaction log. - * - * Each query may be an SDK JSON string or an already-decoded - * `{method, attribute, values}` array. - * - * @param array $queries - * @return array - * @throws Exception\Query - */ - public function parseStoredQueries(array $queries): array - { - $parsed = []; - - foreach ($queries as $query) { - if (\is_array($query)) { - $parsed[] = Query::parseQuery($query); - continue; - } - - if (!\is_string($query)) { - throw new Exception\Query('Invalid query. Must be a string or array, got ' . \gettype($query)); - } - - $parsed[] = Query::parse($query); - } - - return $parsed; - } } diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Transactions/Update.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Transactions/Update.php index c8efd4680e..f70c707c5d 100644 --- a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Transactions/Update.php +++ b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Transactions/Update.php @@ -860,7 +860,7 @@ class Update extends Action \DateTime $createdAt, array &$state ): int { - $queries = $transactionState->parseStoredQueries($data['queries'] ?? []); + $queries = Query::parseQueries($data['queries'] ?? []); $updateData = new Document($data['data']); $dependentDocs = []; @@ -982,7 +982,7 @@ class Update extends Action \DateTime $createdAt, array &$state ): int { - $queries = $transactionState->parseStoredQueries($data['queries'] ?? []); + $queries = Query::parseQueries($data['queries'] ?? []); $count = $dbForProject->deleteDocuments( $collectionId, @@ -1007,5 +1007,4 @@ class Update extends Action return $count; } - }