Remove Sequence type

Author: fogelito

src/Database/Adapter/SQL.php

@@ -1003,7 +1003,6 @@ public function getAttributeWidth(Document $collection): int
             }
 
             switch ($attribute['type']) {
-                case Database::VAR_SEQUENCE:
                 case Database::VAR_ID:
                     $total += 8; //  BIGINT 8 bytes
                     break;

src/Database/Database.php

@@ -41,11 +41,10 @@ class Database
     public const VAR_BOOLEAN = 'boolean';
     public const VAR_DATETIME = 'datetime';
     public const VAR_ID = 'id';
-    public const VAR_SEQUENCE = 'sequence';
 
     // VAR_ID types
-    public const VAR_ID_INT = 'integer_';
-    public const VAR_ID_MONGO = 'mongo_';
+    public const VAR_ID_INT = '_integer';
+    public const VAR_ID_MONGO = '_mongo';
 
     public const INT_MAX = 2147483647;
     public const BIG_INT_MAX = PHP_INT_MAX;
@@ -172,7 +171,7 @@ class Database
         ],
         [
             '$id' => '$sequence',
-            'type' => self::VAR_SEQUENCE,
+            'type' => self::VAR_ID,
             'size' => 0,
             'required' => true,
             'signed' => true,

src/Database/Validator/Queries/Documents.php

@@ -40,7 +40,7 @@ public function __construct(
         $attributes[] = new Document([
             '$id' => '$sequence',
             'key' => '$sequence',
-            'type' => Database::VAR_SEQUENCE,
+            'type' => Database::VAR_ID,
             'array' => false,
         ]);
         $attributes[] = new Document([

src/Database/Validator/Query/Filter.php

@@ -108,12 +108,8 @@ protected function isValidAttributeAndValues(string $attribute, array $values, s
             $validator = null;
 
             switch ($attributeType) {
-                case Database::VAR_SEQUENCE:
-                    $validator = new Sequence($this->idAttributeType, true);
-                    break;
-
                 case Database::VAR_ID:
-                    $validator = new Sequence($this->idAttributeType, false);
+                    $validator = new Sequence($this->idAttributeType, $attribute === '$sequence');
                     break;
 
                 case Database::VAR_STRING:

src/Database/Validator/Sequence.php

@@ -46,24 +46,22 @@ public function isValid($value): bool
             return false;
         }
 
-        if ($this->idAttributeType === Database::VAR_ID_MONGO) {
-            return preg_match('/^[a-f0-9]{24}$/i', $value) === 1;
-        } elseif ($this->idAttributeType === Database::VAR_ID_INT) {
-            $validator = new Integer(loose: true);
-            if (!$validator->isValid($value)) {
-                return false;
-            }
+        switch ($this->idAttributeType) {
+            case Database::VAR_ID_MONGO:
+                return preg_match('/^[a-f0-9]{24}$/i', $value) === 1;
 
-            $start = ($this->primary) ? 1 : 0;
+            case Database::VAR_ID_INT:
+                $validator = new Integer(loose: true);
+                if (!$validator->isValid($value)) {
+                    return false;
+                }
 
-            $validator = new Range($start, Database::BIG_INT_MAX, Database::VAR_INTEGER);
-            if (!$validator->isValid($value)) {
-                return false;
-            }
+                $start = ($this->primary) ? 1 : 0;
+                $validator = new Range($start, Database::BIG_INT_MAX, Database::VAR_INTEGER);
+                return $validator->isValid($value);
 
-            return true;
+            default:
+                return false;
         }
-
-        return false;
     }
 }

src/Database/Validator/Structure.php

@@ -32,7 +32,7 @@ class Structure extends Validator
         ],
         [
             '$id' => '$sequence',
-            'type' => Database::VAR_SEQUENCE,
+            'type' => Database::VAR_ID,
             'size' => 0,
             'required' => false,
             'signed' => true,
@@ -316,12 +316,8 @@ protected function checkForInvalidAttributeValues(array $structure, array $keys)
             $validators = [];
 
             switch ($type) {
-                case Database::VAR_SEQUENCE:
-                    $validators[] = new Sequence($this->idAttributeType, true);
-                    break;
-
                 case Database::VAR_ID:
-                    $validators[] = new Sequence($this->idAttributeType, false);
+                    $validators[] = new Sequence($this->idAttributeType, $attribute['$id'] === '$sequence');
                     break;
 
                 case Database::VAR_STRING: