Merge pull request #375 from kburton-dev/improve-inferring-model-prop…

…erty-types Improve inferring model property types, based on DB driver
dedoc · May 17, 2024 · 001a37b · 001a37b
2 parents 16ea85a + fa3890c
commit 001a37b
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 15 deletions.
diff --git a/src/Support/InferExtensions/ModelExtension.php b/src/Support/InferExtensions/ModelExtension.php
@@ -56,7 +56,8 @@ public function getPropertyType(PropertyFetchEvent $event): ?Type
 
         if ($attribute = $info->get('attributes')->get($event->getName())) {
             $baseType = $this->getAttributeTypeFromEloquentCasts($attribute['cast'] ?? '')
-                ?? $this->getAttributeTypeFromDbColumnType($attribute['type'] ?? '');
+                ?? $this->getAttributeTypeFromDbColumnType($attribute['type'], $attribute['driver'])
+                ?? new UnknownType("Virtual attribute ({$attribute['name']}) type inference not supported.");
 
             if ($attribute['nullable']) {
                 return Union::wrap([$baseType, new NullType()]);
@@ -72,22 +73,34 @@ public function getPropertyType(PropertyFetchEvent $event): ?Type
         throw new \LogicException('Should not happen');
     }
 
-    private function getAttributeTypeFromDbColumnType(string $columnType): AbstractType
+    /**
+     * MySQL/MariaDB decimal is mapped to a string by PDO.
+     * Floating point numbers and decimals are all mapped to strings when using the pgsql driver.
+     */
+    private function getAttributeTypeFromDbColumnType(?string $columnType, ?string $dbDriverName): ?AbstractType
     {
-        $type = Str::before($columnType, ' ');
-        $typeName = Str::before($type, '(');
-
-        // @todo Fix to native types
-        $attributeType = match ($typeName) {
-            'int', 'integer', 'bigint' => new IntegerType(),
-            'float', 'double', 'decimal' => new FloatType(),
-            'varchar', 'string', 'text', 'datetime' => new StringType(), // string, text - needed?
-            'tinyint', 'bool', 'boolean' => new BooleanType(), // bool, boolean - needed?
-            'json', 'array' => new ArrayType(),
-            default => new UnknownType("unimplemented DB column type [$type]"),
-        };
+        if ($columnType === null) {
+            return null;
+        }
+
+        $typeName = str($columnType)
+            ->before(' ') // strip modifiers from a type name such as `bigint unsigned`
+            ->before('(') // strip the length from a type name such as `tinyint(4)`
+            ->toString();
+
+        if (in_array($typeName, ['int', 'integer', 'tinyint', 'smallint', 'mediumint', 'bigint'])) {
+            return new IntegerType();
+        }
+
+        if ($dbDriverName === 'sqlite' && in_array($typeName, ['float', 'double', 'decimal'])) {
+            return new FloatType();
+        }
+
+        if (in_array($dbDriverName, ['mysql', 'mariadb']) && in_array($typeName, ['float', 'double'])) {
+            return new FloatType();
+        }
 
-        return $attributeType;
+        return new StringType();
     }
 
     /**

diff --git a/src/Support/ResponseExtractor/ModelInfo.php b/src/Support/ResponseExtractor/ModelInfo.php
@@ -163,6 +163,7 @@ protected function getAttributes($model)
         return collect($columns)
             ->values()
             ->map(fn ($column) => [
+                'driver' => $connection->getDriverName(),
                 'name' => $column['name'],
                 'type' => $column['type'],
                 'increments' => $column['auto_increment'],
@@ -226,6 +227,7 @@ protected function getVirtualAttributes($model, $columns)
             })
             ->reject(fn ($cast, $name) => $keyedColumns->has($name))
             ->map(fn ($cast, $name) => [
+                'driver' => null,
                 'name' => $name,
                 'type' => null,
                 'increments' => false,