fix: align bigint handling and validator refactors from PR feedback

Agent-Logs-Url: https://github.com/utopia-php/database/sessions/8522088a-f191-48f9-9d1b-4ab793aa8e45

Co-authored-by: ArnabChatterjee20k <83803257+ArnabChatterjee20k@users.noreply.github.com>

Author: Copilot

src/Database/Database.php

@@ -2122,6 +2122,10 @@ public function createAttribute(string $collection, string $id, string $type, in
             $filters = array_unique($filters);
         }
 
+        if ($type === self::VAR_BIGINT) {
+            $size = 0;
+        }
+
         $existsInSchema = false;
 
         $schemaAttributes = $this->adapter->getSupportForSchemaAttributes()
@@ -2315,6 +2319,10 @@ public function createAttributes(string $collection, array $attributes): bool
                 $attribute['filters'] = [];
             }
 
+            if ($attribute['type'] === self::VAR_BIGINT) {
+                $attribute['size'] = 0;
+            }
+
             $existsInSchema = false;
 
             try {
@@ -2487,6 +2495,10 @@ private function validateAttribute(
         array $filters,
         ?array $schemaAttributes = null
     ): Document {
+        if ($type === self::VAR_BIGINT) {
+            $size = 0;
+        }
+
         $attribute = new Document([
             '$id' => ID::custom($id),
             'key' => $id,
@@ -2519,12 +2531,12 @@ private function validateAttribute(
             supportForVectors: $this->adapter->getSupportForVectors(),
             supportForSpatialAttributes: $this->adapter->getSupportForSpatialAttributes(),
             supportForObject: $this->adapter->getSupportForObject(),
+            supportUnsignedBigInt: $this->adapter->getSupportForUnsignedBigInt(),
             attributeCountCallback: fn () => $this->adapter->getCountOfAttributes($collectionClone),
             attributeWidthCallback: fn () => $this->adapter->getAttributeWidth($collectionClone),
             filterCallback: fn ($id) => $this->adapter->filter($id),
             isMigrating: $this->isMigrating(),
             sharedTables: $this->getSharedTables(),
-            supportUnsignedBigInt: $this->adapter->getSupportForUnsignedBigInt(),
         );
 
         $validator->isValid($attribute);
@@ -2877,6 +2889,10 @@ public function updateAttribute(string $collection, string $id, ?string $type =
         $formatOptions ??= $attribute->getAttribute('formatOptions');
         $filters ??= $attribute->getAttribute('filters');
 
+        if ($type === self::VAR_BIGINT) {
+            $size = 0;
+        }
+
         if ($required === true && !\is_null($default)) {
             $default = null;
         }
@@ -2920,14 +2936,6 @@ public function updateAttribute(string $collection, string $id, ?string $type =
                 }
                 break;
             case self::VAR_BIGINT:
-                $sizeString = BigIntValidator::normalizeUnsignedString((string)$size);
-                $limit = (!$signed && $this->adapter->getSupportForUnsignedBigInt())
-                    ? BigIntValidator::UNSIGNED_MAX
-                    : BigIntValidator::SIGNED_MAX;
-
-                if (BigIntValidator::compareUnsignedStrings($sizeString, $limit) > 0) {
-                    throw new DatabaseException('Max size allowed for bigint is: ' . BigIntValidator::formatIntegerString($limit));
-                }
                 break;
             case self::VAR_FLOAT:
             case self::VAR_BOOLEAN:
@@ -5599,8 +5607,8 @@ public function createDocument(string $collection, Document $document): Document
                 $this->adapter->getMinDateTime(),
                 $this->adapter->getMaxDateTime(),
                 $this->adapter->getSupportForAttributes(),
-                null,
-                $this->adapter->getSupportForUnsignedBigInt()
+                $this->adapter->getSupportForUnsignedBigInt(),
+                null
             );
             if (!$structure->isValid($document)) {
                 throw new StructureException($structure->getDescription());
@@ -5709,8 +5717,8 @@ public function createDocuments(
                     $this->adapter->getMinDateTime(),
                     $this->adapter->getMaxDateTime(),
                     $this->adapter->getSupportForAttributes(),
-                    null,
-                    $this->adapter->getSupportForUnsignedBigInt()
+                    $this->adapter->getSupportForUnsignedBigInt(),
+                    null
                 );
                 if (!$validator->isValid($document)) {
                     throw new StructureException($validator->getDescription());
@@ -6282,8 +6290,8 @@ public function updateDocument(string $collection, string $id, Document $documen
                     $this->adapter->getMinDateTime(),
                     $this->adapter->getMaxDateTime(),
                     $this->adapter->getSupportForAttributes(),
-                    $old,
-                    $this->adapter->getSupportForUnsignedBigInt()
+                    $this->adapter->getSupportForUnsignedBigInt(),
+                    $old
                 );
                 if (!$structureValidator->isValid($document)) { // Make sure updated structure still apply collection rules (if any)
                     throw new StructureException($structureValidator->getDescription());
@@ -7297,8 +7305,8 @@ public function upsertDocumentsWithIncrease(
                     $this->adapter->getMinDateTime(),
                     $this->adapter->getMaxDateTime(),
                     $this->adapter->getSupportForAttributes(),
-                    $old->isEmpty() ? null : $old,
-                    $this->adapter->getSupportForUnsignedBigInt()
+                    $this->adapter->getSupportForUnsignedBigInt(),
+                    $old->isEmpty() ? null : $old
                 );
 
                 if (!$validator->isValid($document)) {

src/Database/Validator/Attribute.php

@@ -55,12 +55,12 @@ public function __construct(
         protected bool $supportForVectors = false,
         protected bool $supportForSpatialAttributes = false,
         protected bool $supportForObject = false,
+        protected bool $supportUnsignedBigInt = false,
         protected mixed $attributeCountCallback = null,
         protected mixed $attributeWidthCallback = null,
         protected mixed $filterCallback = null,
         protected bool $isMigrating = false,
         protected bool $sharedTables = false,
-        protected bool $supportUnsignedBigInt = false,
     ) {
         // Keep backwards compatibility for existing validator construction sites.
         if ($this->maxBigIntLength === 0) {

src/Database/Validator/Query/Filter.php

@@ -32,7 +32,7 @@ public function __construct(
         private readonly int $maxValuesCount = 5000,
         private readonly \DateTime $minAllowedDate = new \DateTime('0000-01-01'),
         private readonly \DateTime $maxAllowedDate = new \DateTime('9999-12-31'),
-        private bool $supportForAttributes = true,
+        private readonly bool $supportForAttributes = true,
         private readonly bool $supportUnsignedBigInt = true
     ) {
         foreach ($attributes as $attribute) {

src/Database/Validator/Structure.php

@@ -109,8 +109,8 @@ public function __construct(
         private readonly \DateTime $minAllowedDate = new \DateTime('0000-01-01'),
         private readonly \DateTime $maxAllowedDate = new \DateTime('9999-12-31'),
         private bool $supportForAttributes = true,
-        private readonly ?Document $currentDocument = null,
-        private readonly bool $supportUnsignedBigInt = true
+        private readonly bool $supportUnsignedBigInt = true,
+        private readonly ?Document $currentDocument = null
     ) {
     }
 
@@ -340,7 +340,7 @@ protected function checkForInvalidAttributeValues(Document $document, array $str
             // BIGINT accepts both PHP int and numeric strings.
             // If the numeric string is within PHP's int range, normalize it to an int
             // so downstream code gets a numeric value without precision loss.
-            if ($type === Database::VAR_BIGINT && \is_string($value) && $this->isBigIntStringWithinPhpIntRange($value, $signed)) {
+            if ($type === Database::VAR_BIGINT && \is_string($value) && BigInt::fitsPhpInt($value, $signed)) {
                 $normalized = (int)$value;
                 $document->setAttribute($key, $normalized);
                 $value = $normalized;
@@ -461,11 +461,6 @@ protected function checkForInvalidAttributeValues(Document $document, array $str
         return true;
     }
 
-    public function isBigIntStringWithinPhpIntRange(string $value, bool $signed): bool
-    {
-        return BigInt::fitsPhpInt($value, $signed);
-    }
-
     /**
      * Is array
      *

tests/e2e/Adapter/Scopes/AttributeTests.php

@@ -2222,7 +2222,7 @@ public function testCreateAttributesIntegerSizeLimit(): void
     }
 
 
-    public function testCreateAttributesBigIntIgnoresSizeLimit(): void
+    public function testCreateAttributesBigIntIgnoresSizeMetadata(): void
     {
         /** @var Database $database */
         $database = $this->getDatabase();
@@ -2235,13 +2235,10 @@ public function testCreateAttributesBigIntIgnoresSizeLimit(): void
         $collectionName = 'bigint_ignores_size_limit';
         $database->createCollection($collectionName);
 
-        $limit = $database->getAdapter()->getLimitForBigInt() / 2;
-        $size = (int)$limit + 1;
-
         $attributes = [[
             '$id' => 'foo',
             'type' => Database::VAR_BIGINT,
-            'size' => $size,
+            'size' => 9999,
             'required' => false
         ]];
 
@@ -2252,10 +2249,10 @@ public function testCreateAttributesBigIntIgnoresSizeLimit(): void
         $attrs = $collection->getAttribute('attributes');
         $this->assertCount(1, $attrs);
         $this->assertEquals('foo', $attrs[0]['$id']);
-        $this->assertEquals($size, $attrs[0]['size']);
+        $this->assertEquals(0, $attrs[0]['size']);
     }
 
-    public function testCreateAttributesBigIntValidationSignedUnsignedAndSizeMetadata(): void
+    public function testCreateAttributesBigIntValidationSignedUnsignedAndMetadata(): void
     {
         /** @var Database $database */
         $database = $this->getDatabase();
@@ -2301,18 +2298,6 @@ public function testCreateAttributesBigIntValidationSignedUnsignedAndSizeMetadat
         $this->assertEquals(0, $signedAttribute['size']);
         $this->assertEquals(0, $unsignedAttribute['size']);
 
-        // Signed overflow check (only when we can build an int beyond adapter signed max).
-        $signedLimit = (int)$database->getAdapter()->getLimitForBigInt();
-        if ($signedLimit < \PHP_INT_MAX) {
-            try {
-                $database->updateAttribute($collectionName, 'signed_bigint', size: $signedLimit + 1);
-                $this->fail('Expected DatabaseException for signed bigint size overflow');
-            } catch (\Throwable $e) {
-                $this->assertInstanceOf(DatabaseException::class, $e);
-                $this->assertStringContainsString('Max size allowed for bigint', $e->getMessage());
-            }
-        }
-
         $largeUnsignedAttribute = [[
             '$id' => 'unsigned_bigint_large',
             'type' => Database::VAR_BIGINT,