Fix-numeric (mariaDb)

Author: siggi-k

README.md

@@ -309,6 +309,37 @@ It work on MariaDb.
           - three
 ```
 
+### Handling of `numeric` (#numeric, #MariaDb)
+precision-default = 10
+scale-default = 2
+
+- You can define attribute like "numeric(precision,scale)":
+ ```yaml
+  test_table:
+    properties:
+      my_property:
+        x-db-type: decimal(12,4)
+```
+DB-Result = decimal(12,4)
+
+- You can define attribute like "numeric(precision)" with default scale-default = 2:
+ ```yaml
+  test_table:
+    properties:
+      my_property:
+        x-db-type: decimal(12)
+```
+DB-Result = decimal(12,2)
+
+- You can define attribute like "numeric" with precision-default = 10 and scale-default = 2:
+ ```yaml
+  test_table:
+    properties:
+      my_property:
+        x-db-type: decimal
+```
+DB-Result = decimal(10,2)
+
 ## Screenshots
 
 Gii Generator Form:

src/lib/ColumnToCode.php

@@ -150,6 +150,56 @@ public function isEnum():bool
         return !empty($this->column->enumValues);
     }
 
+    public function isDecimal()
+    {
+        return self::isDecimalByDbType($this->column->dbType);
+    }
+
+    /**
+     * @param $dbType
+     * @return array|false
+     */
+    public static function isDecimalByDbType($dbType)
+    {
+        $precision = null;
+        $scale = null;
+
+        // https://runebook.dev/de/docs/mariadb/decimal/index
+        $precisionDefault = 10;
+        $scaleDefault = 2;
+
+        preg_match_all('/(decimal\()+(\d)+(,)+(\d)+(\))/', $dbType, $matches);
+        if (!empty($matches[4][0])) {
+            $precision = $matches[2][0];
+            $scale = $matches[4][0];
+        }
+
+        if (empty($precision)){
+            preg_match_all('/(decimal\()+(\d)+(\))/', $dbType, $matches);
+            if (!empty($matches[2][0])) {
+                $precision = $matches[2][0];
+                $scale = $scaleDefault;
+            }
+        }
+
+        if (empty($precision)){
+            if (strtolower($dbType) === 'decimal'){
+                $precision = $precisionDefault;
+                $scale = $scaleDefault;
+            }
+        }
+
+        if (empty($precision)){
+            return false;
+        }
+
+        return [
+            'precision' => (int)$precision,
+            'scale' => (int)$scale,
+            'dbType' => "decimal($precision,$scale)",
+        ];
+    }
+
     public static function escapeQuotes(string $str):string
     {
         return str_replace(["'", '"', '$'], ["\\'", "\\'", '\$'], $str);
@@ -208,7 +258,6 @@ private function resolve():void
         if ($dbType === 'varchar') {
             $type = $dbType = 'string';
         }
-        $this->isBuiltinType = $this->getIsBuiltinType($type, $dbType);
         $fluentSize = $this->column->size ? '(' . $this->column->size . ')' : '()';
         $rawSize = $this->column->size ? '(' . $this->column->size . ')' : '';
         $this->rawParts['nullable'] = $this->column->allowNull ? 'NULL' : 'NOT NULL';
@@ -223,11 +272,17 @@ private function resolve():void
                 $this->column->dbType . (strpos($this->column->dbType, '(') !== false ? '' : $rawSize);
         } elseif ($this->isEnum()) {
             $this->resolveEnumType();
+        } elseif ($this->isDecimal()) {
+            $this->fluentParts['type'] = $dbType;
+            $this->rawParts['type'] = $dbType;
         } else {
             $this->fluentParts['type'] = $type . $fluentSize;
             $this->rawParts['type'] =
                 $this->column->dbType . (strpos($this->column->dbType, '(') !== false ? '' : $rawSize);
         }
+        
+        $this->isBuiltinType = $this->getIsBuiltinType($type, $dbType);
+
         $this->resolveDefaultValue();
     }
 

src/lib/migrations/MysqlMigrationBuilder.php

@@ -7,6 +7,7 @@
 
 namespace cebe\yii2openapi\lib\migrations;
 
+use cebe\yii2openapi\lib\ColumnToCode;
 use cebe\yii2openapi\lib\items\DbIndex;
 use yii\base\NotSupportedException;
 use yii\db\ColumnSchema;
@@ -56,6 +57,19 @@ protected function compareColumns(ColumnSchema $current, ColumnSchema $desired):
         if ($current->type === $desired->type && !$desired->size && $this->isDbDefaultSize($current)) {
             $desired->size = $current->size;
         }
+        
+        if ($decimalAttributes = ColumnToCode::isDecimalByDbType($desired->dbType)){
+            $desired->precision = $decimalAttributes['precision'];
+            $desired->scale = $decimalAttributes['scale'];
+            $desired->type = 'decimal';
+            $desired->size = $decimalAttributes['precision'];
+            foreach (['precision', 'scale', 'dbType'] as $decimalAttr) {
+                if ($current->$decimalAttr !== $desired->$decimalAttr) {
+                    $changedAttributes[] = $decimalAttr;
+                }
+            }
+        }
+        
         foreach (['type', 'size', 'allowNull', 'defaultValue', 'enumValues'] as $attr) {
             if ($current->$attr !== $desired->$attr) {
                 $changedAttributes[] = $attr;