fix: validate array relation $id and improve test reliability

premtsd-code · premtsd-code · commit d13fe04e8ffc · 2026-01-26T14:49:43.000Z
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Action.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Action.php
@@ -261,7 +261,9 @@ protected function validateRelationship(mixed $relation): void
             $relationId = $relation->getAttribute('$id');
         } elseif (\is_string($relation)) {
             $relationId = $relation;
-        } elseif (!(\is_array($relation) && \array_values($relation) !== $relation)) {
+        } elseif (\is_array($relation) && \array_values($relation) !== $relation) {
+            $relationId = $relation['$id'] ?? null;
+        } else {
             throw new Exception(Exception::RELATIONSHIP_VALUE_INVALID, 'Relationship value must be an object or document ID string, not ' . \gettype($relation));
         }
 
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Create.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Create.php
@@ -312,7 +312,9 @@ public function action(string $databaseId, string $documentId, string $collectio
                     $this->validateRelationship($relation);
 
                     if (\is_array($relation) && \array_values($relation) !== $relation) {
-                        $relation['$id'] = ID::unique();
+                        if (!isset($relation['$id'])) {
+                            $relation['$id'] = ID::unique();
+                        }
                         $relation = new Document($relation);
                     }
 
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Update.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Update.php
@@ -204,7 +204,9 @@ public function action(string $databaseId, string $collectionId, string $documen
                     $this->validateRelationship($relation);
 
                     if (\is_array($relation) && \array_values($relation) !== $relation) {
-                        $relation['$id'] = ID::unique();
+                        if (!isset($relation['$id'])) {
+                            $relation['$id'] = ID::unique();
+                        }
                         $relation = new Document($relation);
                     }
 
diff --git a/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Upsert.php b/src/Appwrite/Platform/Modules/Databases/Http/Databases/Collections/Documents/Upsert.php
@@ -214,7 +214,9 @@ public function action(string $databaseId, string $collectionId, string $documen
                     $this->validateRelationship($relation);
 
                     if (\is_array($relation) && \array_values($relation) !== $relation) {
-                        $relation['$id'] = ID::unique();
+                        if (!isset($relation['$id'])) {
+                            $relation['$id'] = ID::unique();
+                        }
                         $relation = new Document($relation);
                     }
 
diff --git a/tests/e2e/Services/Databases/TablesDB/DatabasesBase.php b/tests/e2e/Services/Databases/TablesDB/DatabasesBase.php
@@ -7680,7 +7680,7 @@ public function testInvalidRelationshipDocumentId(array $data): void
         ]);
 
         // Create one-to-many relationship
-        $this->client->call(Client::METHOD_POST, '/tablesdb/' . $databaseId . '/tables/' . $parentTableId . '/columns/relationship', array_merge([
+        $relationship = $this->client->call(Client::METHOD_POST, '/tablesdb/' . $databaseId . '/tables/' . $parentTableId . '/columns/relationship', array_merge([
             'content-type' => 'application/json',
             'x-appwrite-project' => $this->getProject()['$id'],
             'x-appwrite-key' => $this->getProject()['apiKey']
@@ -7690,8 +7690,22 @@ public function testInvalidRelationshipDocumentId(array $data): void
             'twoWay' => false,
             'key' => 'children',
         ]);
+        $this->assertEquals(202, $relationship['headers']['status-code']);
 
-        sleep(1);
+        // Wait for relationship column to be available
+        $maxAttempts = 10;
+        for ($i = 0; $i < $maxAttempts; $i++) {
+            $columns = $this->client->call(Client::METHOD_GET, '/tablesdb/' . $databaseId . '/tables/' . $parentTableId . '/columns', array_merge([
+                'content-type' => 'application/json',
+                'x-appwrite-project' => $this->getProject()['$id'],
+                'x-appwrite-key' => $this->getProject()['apiKey']
+            ]));
+            $columnKeys = array_column($columns['body']['columns'], 'key');
+            if (in_array('children', $columnKeys)) {
+                break;
+            }
+            usleep(200000);
+        }
 
         // ID too long (>36 chars) should fail
         $response = $this->client->call(Client::METHOD_POST, '/tablesdb/' . $databaseId . '/tables/' . $parentTableId . '/rows', array_merge([

Original file line number	Diff line number	Diff line change
`@@ -312,7 +312,9 @@ public function action(string $databaseId, string $documentId, string $collectio`
`312`	`312`	`$this->validateRelationship($relation);`
`313`	`313`
`314`	`314`	`if (\is_array($relation) && \array_values($relation) !== $relation) {`
`315`		`- $relation['$id'] = ID::unique();`
	`315`	`+ if (!isset($relation['$id'])) {`
	`316`	`+ $relation['$id'] = ID::unique();`
	`317`	`+ }`
`316`	`318`	`$relation = new Document($relation);`
`317`	`319`	`}`
`318`	`320`
Original file line number	Diff line number	Diff line change
`@@ -204,7 +204,9 @@ public function action(string $databaseId, string $collectionId, string $documen`
`204`	`204`	`$this->validateRelationship($relation);`
`205`	`205`
`206`	`206`	`if (\is_array($relation) && \array_values($relation) !== $relation) {`
`207`		`- $relation['$id'] = ID::unique();`
	`207`	`+ if (!isset($relation['$id'])) {`
	`208`	`+ $relation['$id'] = ID::unique();`
	`209`	`+ }`
`208`	`210`	`$relation = new Document($relation);`
`209`	`211`	`}`
`210`	`212`
Original file line number	Diff line number	Diff line change
`@@ -214,7 +214,9 @@ public function action(string $databaseId, string $collectionId, string $documen`
`214`	`214`	`$this->validateRelationship($relation);`
`215`	`215`
`216`	`216`	`if (\is_array($relation) && \array_values($relation) !== $relation) {`
`217`		`- $relation['$id'] = ID::unique();`
	`217`	`+ if (!isset($relation['$id'])) {`
	`218`	`+ $relation['$id'] = ID::unique();`
	`219`	`+ }`
`218`	`220`	`$relation = new Document($relation);`
`219`	`221`	`}`
`220`	`222`