ID / Sequence attribute use as int

Author: fogelito

src/Database/Adapter/MariaDB.php

@@ -910,6 +910,8 @@ public function createDocument(string $collection, Document $document): Document
                 throw new DatabaseException('Error creating document empty "$sequence"');
             }
 
+            $document['$sequence'] = (int)$document['$sequence'];
+
             if (isset($stmtPermissions)) {
                 $stmtPermissions->execute();
             }
@@ -1640,7 +1642,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/Adapter/SQL.php

@@ -369,7 +369,7 @@ public function getDocument(string $collection, string $id, array $queries = [],
         $document = $document[0];
 
         if (\array_key_exists('_id', $document)) {
-            $document['$sequence'] = $document['_id'];
+            $document['$sequence'] = (int)$document['_id'];
             unset($document['_id']);
         }
         if (\array_key_exists('_uid', $document)) {

src/Database/Database.php

@@ -6508,6 +6508,8 @@ public function casting(Document $collection, Document $document): Document
                         $node = (bool)$node;
                         break;
                     case self::VAR_INTEGER:
+                    case self::VAR_ID:
+                    case self::VAR_ID:
                         $node = (int)$node;
                         break;
                     case self::VAR_FLOAT:

src/Database/Validator/Sequence.php

@@ -46,14 +46,15 @@ public function isValid($value): bool
             return false;
         }
 
-        if (gettype($value) !== 'string') {
-            return false;
-        }
-
         if ($this->idAttributeType === 'string') {
             return preg_match('/^[a-f0-9]{24}$/i', $value) === 1;
         } elseif ($this->idAttributeType === 'int') {
-            $validator = new Integer(loose: true);
+
+            if (gettype($value) !== 'integer') {
+                return false;
+            }
+
+            $validator = new Integer();
             if (!$validator->isValid($value)) {
                 return false;
             }

tests/e2e/Adapter/Scopes/DocumentTests.php

@@ -67,7 +67,7 @@ public function testCreateDocument(): Document
             'colors' => ['pink', 'green', 'blue'],
             'empty' => [],
             'with-dash' => 'Works',
-            'id' => '1000000',
+            'id' => 1000000,
         ]));
 
         $this->assertNotEmpty(true, $document->getId());
@@ -91,8 +91,8 @@ public function testCreateDocument(): Document
         $this->assertEquals(['pink', 'green', 'blue'], $document->getAttribute('colors'));
         $this->assertEquals([], $document->getAttribute('empty'));
         $this->assertEquals('Works', $document->getAttribute('with-dash'));
-        $this->assertIsString($document->getAttribute('id'));
-        $this->assertEquals('1000000', $document->getAttribute('id'));
+        $this->assertIsInt($document->getAttribute('id'));
+        $this->assertEquals(1000000, $document->getAttribute('id'));
 
         // Test create document with manual internal id
         $manualIdDocument = $database->createDocument('documents', new Document([
@@ -270,7 +270,7 @@ public function testCreateDocument(): Document
          * Insert ID attribute with '0'
          */
         $documentId0 = $database->createDocument('documents', new Document([
-            'id' => '0',
+            'id' => 0,
             '$permissions' => [Permission::read(Role::any())],
             'string' => '',
             'integer_signed' => 1,
@@ -285,21 +285,20 @@ public function testCreateDocument(): Document
             'with-dash' => '',
         ]));
         $this->assertNotEmpty(true, $documentId0->getSequence());
-        $this->assertIsString($documentId0->getAttribute('id'));
-        $this->assertEquals('0', $documentId0->getAttribute('id'));
+        $this->assertIsInt($documentId0->getAttribute('id'));
+        $this->assertEquals(0, $documentId0->getAttribute('id'));
 
         $documentId0 = $database->getDocument('documents', $documentId0->getId());
         $this->assertNotEmpty(true, $documentId0->getSequence());
-        $this->assertIsString($documentId0->getAttribute('id'));
-        $this->assertEquals('0', $documentId0->getAttribute('id'));
+        $this->assertIsInt($documentId0->getAttribute('id'));
+        $this->assertEquals(0, $documentId0->getAttribute('id'));
 
         $documentId0 = $database->findOne('documents', [
-            query::equal('id', ['0'])
+            query::equal('id', [0])
         ]);
         $this->assertNotEmpty(true, $documentId0->getSequence());
-        $this->assertIsString($documentId0->getAttribute('id'));
-        $this->assertEquals('0', $documentId0->getAttribute('id'));
-
+        $this->assertIsInt($documentId0->getAttribute('id'));
+        $this->assertEquals(0, $documentId0->getAttribute('id'));
 
         return $document;
     }