Fix-Enum on MariaDb

Author: siggi-k

README.md

@@ -250,15 +250,15 @@ $this->alterColumn('{{%company}}', 'name', $this->string(128)->notNull());
 
 ### Handling of `NOT NULL` constraints (#required, #nullable)
 
-e.g. attribute = 'alpha'.
+e.g. attribute = 'my_property'.
 
 1) If you define attribute neither "required" nor via "nullable", then it is by default:
    ALLOW 'NOT NULL'
  ```yaml
   test_table:
     required:
     properties:
-      alpha:
+      my_property:
         type: string
 ```
 
@@ -267,9 +267,9 @@ e.g. attribute = 'alpha'.
  ```yaml
   test_table:
     required:
-     - alpha
+     - my_property
     properties:
-      alpha:
+      my_property:
         type: string
 ```
 
@@ -278,9 +278,9 @@ e.g. attribute = 'alpha'.
  ```yaml
   test_table:
     required:
-      - alpha
+      - my_property
     properties:
-      alpha:
+      my_property:
         type: string
         nullable: true
 ```
@@ -290,11 +290,24 @@ FORBIDDEN 'NOT NULL'
   test_table:
     required:
     properties:
-      alpha:
+      my_property:
         type: string
         nullable: false
 ```
 
+### Handling of `enum` (#enum, #MariaDb)
+It work on MariaDb.
+
+ ```yaml
+  test_table:
+    properties:
+      my_property:
+        enum:
+          - one
+          - two
+          - three
+```
+
 ## Screenshots
 
 Gii Generator Form:

src/lib/ColumnToCode.php

@@ -147,7 +147,7 @@ public function isJson():bool
 
     public function isEnum():bool
     {
-        return StringHelper::startsWith($this->column->dbType, 'enum');
+        return !empty($this->column->enumValues);
     }
 
     public static function escapeQuotes(string $str):string
@@ -208,11 +208,7 @@ private function resolve():void
         if ($dbType === 'varchar') {
             $type = $dbType = 'string';
         }
-        if ($this->fromDb === true) {
-            $this->isBuiltinType = isset((new ColumnSchemaBuilder(''))->categoryMap[$type]);
-        } else {
-            $this->isBuiltinType = isset((new ColumnSchemaBuilder(''))->categoryMap[$dbType]);
-        }
+        $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';
@@ -235,6 +231,23 @@ private function resolve():void
         $this->resolveDefaultValue();
     }
 
+    /**
+     * @param $type
+     * @param $dbType
+     * @return bool
+     */
+    private function getIsBuiltinType($type, $dbType)
+    {
+        if ($this->isEnum() && $this->isMariaDb()){
+            return false;
+        }
+        if ($this->fromDb === true){
+            return isset((new ColumnSchemaBuilder(''))->categoryMap[$type]);
+        } else {
+            return  isset((new ColumnSchemaBuilder(''))->categoryMap[$dbType]);
+        }
+    }
+
     private function resolveEnumType():void
     {
         if ($this->isPostgres()) {
@@ -314,10 +327,18 @@ private function resolveDefaultValue():void
     private function isDefaultAllowed():bool
     {
         $type = strtolower($this->column->dbType);
-        if ($type === 'tsvector') {
-            return false;
+        switch ($type){
+            case 'tsvector':
+                return false;
+            case 'blob':
+            case 'geometry':
+            case 'text':
+            case 'json':
+                return ($this->isMysql() && !$this->isMariaDb()) === false;
+            case 'enum':
+            default:
+                return true;
         }
-        return !($this->isMysql() && !$this->isMariaDb() && in_array($type, ['blob', 'geometry', 'text', 'json']));
     }
 
     private function typeWithoutSize(string $type):string

src/lib/items/DbModel.php

@@ -139,8 +139,7 @@ public function getEnumAttributes():array
         return array_filter(
             $this->attributes,
             static function (Attribute $attribute) {
-                return !$attribute->isVirtual && StringHelper::startsWith($attribute->dbType, 'enum')
-                    && !empty($attribute->enumValues);
+                return !$attribute->isVirtual && !empty($attribute->enumValues);
             }
         );
     }

src/lib/migrations/BaseMigrationBuilder.php

@@ -205,6 +205,10 @@ function (string $unknownColumn) {
                 $current->type = 'enum';
                 $current->dbType = 'enum';
             }
+            if (!empty($desired->enumValues)) {
+                $desired->type = 'enum';
+                $desired->dbType = 'enum';
+            }
             $changedAttributes = $this->compareColumns($current, $desired);
             if (empty($changedAttributes)) {
                 continue;

src/lib/migrations/MysqlMigrationBuilder.php

@@ -66,7 +66,7 @@ protected function compareColumns(ColumnSchema $current, ColumnSchema $desired):
 
     protected function createEnumMigrations():void
     {
-        // Postgres only case
+        // execute via default
     }
 
     protected function isDbDefaultSize(ColumnSchema $current):bool