Merge pull request #11398 from appwrite/fix-cast

abnegate · web-flow · commit 32ef15f89adf · 2026-02-25T09:58:35.000Z
diff --git a/composer.lock b/composer.lock
diff --git a/src/Appwrite/Platform/Modules/Console/Http/Variables/Get.php b/src/Appwrite/Platform/Modules/Console/Http/Variables/Get.php
@@ -102,6 +102,7 @@ public function action(Response $response, array $platform, Database $dbForProje
             'supportForAttributeResizing' => $adapter->getSupportForAttributeResizing(),
             'supportForSchemas' => $adapter->getSupportForSchemas(),
             'maxIndexLength' => $adapter->getMaxIndexLength(),
+            'supportForIntegerIds' => $adapter->getIdAttributeType() === 'integer',
         ]);
 
         $response->dynamic($variables, Response::MODEL_CONSOLE_VARIABLES);
diff --git a/src/Appwrite/SDK/Specification/Format/OpenAPI3.php b/src/Appwrite/SDK/Specification/Format/OpenAPI3.php
@@ -839,10 +839,14 @@ public function parse(): array
                     case 'string':
                     case 'datetime':
                     case 'payload':
-                    case 'id':
                         $type = 'string';
                         break;
 
+                    case 'id':
+                        $type = 'integer';
+                        $format = $rule['format'] ?? 'int32';
+                        break;
+
                     case 'enum':
                         $type = 'string';
                         break;
diff --git a/src/Appwrite/SDK/Specification/Format/Swagger2.php b/src/Appwrite/SDK/Specification/Format/Swagger2.php
@@ -819,10 +819,14 @@ public function parse(): array
                 switch ($rule['type']) {
                     case 'string':
                     case 'datetime':
-                    case 'id':
                         $type = 'string';
                         break;
 
+                    case 'id':
+                        $type = 'integer';
+                        $format = $rule['format'] ?? 'int32';
+                        break;
+
                     case 'enum':
                         $type = 'string';
                         break;
diff --git a/src/Appwrite/Utopia/Response/Model/ConsoleVariables.php b/src/Appwrite/Utopia/Response/Model/ConsoleVariables.php
@@ -196,6 +196,15 @@ public function __construct()
                     'example' => 768,
                 ]
             )
+            ->addRule(
+                'supportForIntegerIds',
+                [
+                    'type' => self::TYPE_BOOLEAN,
+                    'description' => 'Whether the database adapter uses integer sequence IDs.',
+                    'default' => true,
+                    'example' => true,
+                ]
+            )
         ;
     }
 
diff --git a/src/Appwrite/Utopia/Response/Model/Document.php b/src/Appwrite/Utopia/Response/Model/Document.php
@@ -83,9 +83,8 @@ public function filter(DatabaseDocument $document): DatabaseDocument
         $document->removeAttribute('$collection');
         $document->removeAttribute('$tenant');
 
-        if (!$document->isEmpty()) {
-            $sequence = $document->getAttribute('$sequence', '');
-            $document->setAttribute('$sequence', $sequence);
+        if (!$document->isEmpty() && \is_numeric($document->getAttribute('$sequence', 0))) {
+            $document->setAttribute('$sequence', (int)$document->getAttribute('$sequence', 0));
         }
 
         foreach ($document->getAttributes() as $attribute) {
diff --git a/src/Appwrite/Utopia/Response/Model/Row.php b/src/Appwrite/Utopia/Response/Model/Row.php
@@ -82,8 +82,10 @@ public function filter(DatabaseDocument $document): DatabaseDocument
     {
         $document->removeAttribute('$collection');
         $document->removeAttribute('$tenant');
-        $sequence = $document->getAttribute('$sequence', '');
-        $document->setAttribute('$sequence', $sequence);
+
+        if (!$document->isEmpty() && \is_numeric($document->getAttribute('$sequence', 0))) {
+            $document->setAttribute('$sequence', (int)$document->getAttribute('$sequence', 0));
+        }
 
         foreach ($document->getAttributes() as $column) {
             if (\is_array($column)) {
diff --git a/tests/e2e/Scopes/Scope.php b/tests/e2e/Scopes/Scope.php
@@ -143,6 +143,14 @@ protected function getMaxIndexLength(): int
         return $this->getConsoleVariables()['maxIndexLength'] ?? 768;
     }
 
+    /**
+     * Check if the database adapter uses integer sequence IDs
+     */
+    protected function getSupportForIntegerIds(): bool
+    {
+        return $this->getConsoleVariables()['supportForIntegerIds'] ?? true;
+    }
+
     protected function getLastEmail(int $limit = 1, ?callable $probe = null): array
     {
         $result = [];
diff --git a/tests/e2e/Services/Databases/DatabasesBase.php b/tests/e2e/Services/Databases/DatabasesBase.php
@@ -2567,6 +2567,10 @@ public function testCreateDocument(): void
         $this->assertEquals($document1['body']['birthDay'], '1975-06-12T12:12:55.000+00:00');
         $this->assertTrue(array_key_exists('$sequence', $document1['body']));
 
+        $this->getSupportForIntegerIds()
+            ? $this->assertIsInt($document1['body']['$sequence'])
+            : $this->assertIsString($document1['body']['$sequence']);
+
         $this->assertEquals(201, $document2['headers']['status-code']);
         $this->assertEquals($data['moviesId'], $document2['body'][$this->getContainerIdResponseKey()]);
         $this->assertArrayNotHasKey('$collection', $document2['body']);
@@ -2637,7 +2641,10 @@ public function testUpsertDocument(): void
         /**
          * Resubmit same document, nothing to update
          */
-        $this->assertIsString($document['body']['$sequence']);
+        $this->getSupportForIntegerIds()
+            ? $this->assertIsInt($document['body']['$sequence'])
+            : $this->assertIsString($document['body']['$sequence']);
+
         $upsertData = [
             'title' => 'Thor: Ragnarok',
             'releaseYear' => 2000,

Original file line number	Diff line number	Diff line change
`@@ -196,6 +196,15 @@ public function __construct()`
`196`	`196`	`'example' => 768,`
`197`	`197`	`]`
`198`	`198`	`)`
	`199`	`+ ->addRule(`
	`200`	`+ 'supportForIntegerIds',`
	`201`	`+ [`
	`202`	`+ 'type' => self::TYPE_BOOLEAN,`
	`203`	`+ 'description' => 'Whether the database adapter uses integer sequence IDs.',`
	`204`	`+ 'default' => true,`
	`205`	`+ 'example' => true,`
	`206`	`+ ]`
	`207`	`+ )`
`199`	`208`	`;`
`200`	`209`	`}`
`201`	`210`
Original file line number	Diff line number	Diff line change
`@@ -143,6 +143,14 @@ protected function getMaxIndexLength(): int`
`143`	`143`	`return $this->getConsoleVariables()['maxIndexLength'] ?? 768;`
`144`	`144`	`}`
`145`	`145`
	`146`	`+ /**`
	`147`	`+ * Check if the database adapter uses integer sequence IDs`
	`148`	`+ */`
	`149`	`+ protected function getSupportForIntegerIds(): bool`
	`150`	`+ {`
	`151`	`+ return $this->getConsoleVariables()['supportForIntegerIds'] ?? true;`
	`152`	`+ }`
	`153`	`+`
`146`	`154`	`protected function getLastEmail(int $limit = 1, ?callable $probe = null): array`
`147`	`155`	`{`
`148`	`156`	`$result = [];`