wip fix string -> int typecast

atk4 · May 23, 2024 · 24f948c · 24f948c
1 parent eeafc6d
commit 24f948c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/Field.php b/src/Field.php
@@ -179,6 +179,7 @@ public function normalize($value)
 
                     break;
                 case 'integer':
+                case 'bigint':
                 case 'float':
                 case 'decimal':
                 case 'atk4_money':

diff --git a/src/Persistence.php b/src/Persistence.php
@@ -348,6 +348,7 @@ private function _typecastPreField(Field $field, $value, bool $fromLoad)
             switch ($field->type) {
                 case 'boolean':
                 case 'integer':
+                case 'bigint':
                     $value = preg_replace('~\s+|,~', '', $value);
 
                     break;
@@ -362,6 +363,7 @@ private function _typecastPreField(Field $field, $value, bool $fromLoad)
             switch ($field->type) {
                 case 'boolean':
                 case 'integer':
+                case 'bigint':
                 case 'float':
                 case 'decimal':
                 case 'atk4_money':
@@ -378,6 +380,7 @@ private function _typecastPreField(Field $field, $value, bool $fromLoad)
                 case 'string':
                 case 'text':
                 case 'integer':
+                case 'bigint':
                 case 'float':
                 case 'decimal':
                 case 'atk4_money':
@@ -507,6 +510,7 @@ protected function _typecastSaveField(Field $field, $value)
         }
 
         $res = Type::getType($field->type)->convertToDatabaseValue($value, $this->getDatabasePlatform());
+
         if (is_resource($res) && get_resource_type($res) === 'stream') {
             $res = stream_get_contents($res);
         }
@@ -527,7 +531,7 @@ protected function _typecastLoadField(Field $field, $value)
         $value = $this->_typecastPreField($field, $value, true);
 
         // TODO casting optionally to null should be handled by type itself solely
-        if ($value === '' && in_array($field->type, ['boolean', 'integer', 'float', 'decimal', 'datetime', 'date', 'time', 'json', 'object'], true)) {
+        if ($value === '' && in_array($field->type, ['boolean', 'integer', 'bigint', 'float', 'decimal', 'datetime', 'date', 'time', 'json', 'object'], true)) {
             return null;
         }
 
@@ -556,7 +560,10 @@ protected function _typecastLoadField(Field $field, $value)
         }
 
         $res = Type::getType($field->type)->convertToPHPValue($value, $this->getDatabasePlatform());
-        if (is_resource($res) && get_resource_type($res) === 'stream') {
+
+        if ($field->type === 'bigint' && $res === (string) (int) $res) {
+            $res = (int) $res;
+        } elseif (is_resource($res) && get_resource_type($res) === 'stream') {
             $res = stream_get_contents($res);
         }