Cast ID attribute to int

Author: fogelito

src/Database/Adapter/Postgres.php

@@ -1030,6 +1030,7 @@ public function createDocument(string $collection, Document $document): Document
             $lastInsertedId = $this->getPDO()->lastInsertId();
             // Sequence can be manually set as well
             $document['$sequence'] ??= $lastInsertedId;
+            $document['$sequence'] = (int)$document['$sequence'];
 
             if (isset($stmtPermissions)) {
                 $this->execute($stmtPermissions);
@@ -1525,7 +1526,7 @@ public function find(string $collection, array $queries = [], ?int $limit = 25,
                 unset($results[$index]['_uid']);
             }
             if (\array_key_exists('_id', $document)) {
-                $results[$index]['$sequence'] = $document['_id'];
+                $results[$index]['$sequence'] = (int)$document['_id'];
                 unset($results[$index]['_id']);
             }
             if (\array_key_exists('_tenant', $document)) {

src/Database/Database.php

@@ -6507,9 +6507,12 @@ public function casting(Document $collection, Document $document): Document
                     case self::VAR_BOOLEAN:
                         $node = (bool)$node;
                         break;
-                    case self::VAR_INTEGER:
-                    case self::VAR_ID:
                     case self::VAR_ID:
+                        if ($this->adapter->getIdAttributeType() === 'int'){
+                            $node = (int)$node;
+                        }
+                        break;
+                    case self::VAR_INTEGER:
                         $node = (int)$node;
                         break;
                     case self::VAR_FLOAT:

src/Database/Document.php

@@ -62,11 +62,11 @@ public function getId(): string
     }
 
     /**
-     * @return string
+     * @return mixed
      */
-    public function getSequence(): string
+    public function getSequence(): mixed
     {
-        return $this->getAttribute('$sequence', '');
+        return $this->getAttribute('$sequence');
     }
 
     /**

tests/e2e/Adapter/Scopes/DocumentTests.php

@@ -97,7 +97,7 @@ public function testCreateDocument(): Document
         // Test create document with manual internal id
         $manualIdDocument = $database->createDocument('documents', new Document([
             '$id' => '56000',
-            '$sequence' => '56000',
+            '$sequence' => 56000,
             '$permissions' => [
                 Permission::read(Role::any()),
                 Permission::read(Role::user(ID::custom('1'))),
@@ -214,7 +214,7 @@ public function testCreateDocument(): Document
 
         try {
             $database->createDocument('documents', new Document([
-                '$sequence' => '0',
+                '$sequence' => 0,
                 '$permissions' => [],
                 'string' => '',
                 'integer_signed' => 1,
@@ -385,7 +385,7 @@ public function testCreateDocumentsWithAutoIncrement(): void
 
         for ($i = $sequence; $i <= ($sequence + $count); $i++) {
             $documents[] = new Document([
-                '$sequence' => (string)$i,
+                '$sequence' => $i,
                 '$permissions' => [
                     Permission::read(Role::any()),
                     Permission::create(Role::any()),
@@ -4370,7 +4370,7 @@ public function testExceptionCaseInsensitiveDuplicate(Document $document): Docum
         $database = static::getDatabase();
 
         $document->setAttribute('$id', 'caseSensitive');
-        $document->setAttribute('$sequence', '200');
+        $document->setAttribute('$sequence', 200);
         $database->createDocument($document->getCollection(), $document);
 
         $document->setAttribute('$id', 'CaseSensitive');