Fix multiple issue + add more tests for eunm in Pgsql + other DB

src/lib/ColumnToCode.php

@@ -160,7 +160,7 @@ public function getCode(bool $quoted = false):string
     public function getAlterExpression(bool $addUsingExpression = false):string
     {
         if ($this->isEnum() && ApiGenerator::isPostgres()) {
-            return "'" . sprintf('enum_%1$s USING %1$s::enum_%1$s', $this->column->name) . "'";
+            return "'" . sprintf('enum_%1$s USING "%1$s"::enum_%1$s', $this->column->name) . "'";
         }
         if ($this->column->dbType === 'tsvector') {
             return "'" . $this->rawParts['type'] . "'";

src/lib/migrations/BaseMigrationBuilder.php

@@ -7,6 +7,7 @@
 
 namespace cebe\yii2openapi\lib\migrations;
 
+use cebe\yii2openapi\generator\ApiGenerator;
 use cebe\yii2openapi\lib\ColumnToCode;
 use cebe\yii2openapi\lib\items\DbModel;
 use cebe\yii2openapi\lib\items\ManyToManyRelation;
@@ -203,6 +204,11 @@ function (string $unknownColumn) {
                 // do not adjust existing primary keys
                 continue;
             }
+            // TODO this section is not concretely correct
+            // type can be one of: char, string, text, boolean, smallint, integer, bigint, float, decimal, datetime,
+            // timestamp, time, date, binary, and money.
+            // `enum` is not a part of it
+            // also real DB type required enum values in MySQL and new `TYPE` in PgSQL
             if (!empty($current->enumValues)) {
                 $current->type = 'enum';
                 $current->dbType = 'enum';
@@ -211,6 +217,7 @@ function (string $unknownColumn) {
                 $desired->type = 'enum';
                 $desired->dbType = 'enum';
             }
+            // section end
             $changedAttributes = $this->compareColumns($current, $desired);
             if (empty($changedAttributes)) {
                 continue;
@@ -432,12 +439,25 @@ public function tmpSaveNewCol(\cebe\yii2openapi\db\ColumnSchema $columnSchema):
             $column = [$columnSchema->name => $this->newColStr($columnSchema)];
         }
 
+        // create enum if relevant
+        if (ApiGenerator::isPostgres() && !empty($columnSchema->enumValues)) {
+            $allEnumValues = $columnSchema->enumValues;
+            $allEnumValues = array_map(function ($aValue) {return "'$aValue'";}, $allEnumValues);
+            Yii::$app->db->createCommand(
+                'CREATE TYPE enum_'.$columnSchema->name.' AS ENUM('.implode(', ', $allEnumValues).')'
+            )->execute();
+        }
+
         Yii::$app->db->createCommand()->createTable($tableName, $column)->execute();
 
         $table = Yii::$app->db->getTableSchema($tableName);
 
         Yii::$app->db->createCommand()->dropTable($tableName)->execute();
 
+        if (ApiGenerator::isPostgres() && !empty($columnSchema->enumValues)) {// drop enum
+            Yii::$app->db->createCommand('DROP TYPE enum_'.$columnSchema->name)->execute();
+        }
+
         return $table->columns[$columnSchema->name];
     }
 

src/lib/migrations/MysqlMigrationBuilder.php

@@ -119,6 +119,12 @@ public function modifyCurrent(ColumnSchema $current): void
         if ($current->phpType === 'integer' && $current->defaultValue !== null) {
             $current->defaultValue = (int)$current->defaultValue;
         }
+
+        // TODO this is not concretely correct
+        if (!empty($current->enumValues)) {
+            $current->type = 'enum';
+            $current->dbType = 'enum';
+        }
     }
 
     public function modifyDesired(ColumnSchema $desired): void
@@ -132,6 +138,12 @@ public function modifyDesired(ColumnSchema $desired): void
             $desired->precision = $decimalAttributes['precision'];
             $desired->scale = $decimalAttributes['scale'];
         }
+
+        // TODO this is not concretely correct
+        if (!empty($desired->enumValues)) {
+            $desired->type = 'enum';
+            $desired->dbType = 'enum';
+        }
     }
 
     public function modifyDesiredInContextOfCurrent(ColumnSchema $current, ColumnSchema $desired): void

src/lib/migrations/PostgresMigrationBuilder.php

@@ -63,7 +63,7 @@ protected function buildColumnChanges(ColumnSchema $current, ColumnSchema $desir
             return;
         }
 
-        if (!empty(array_intersect(['type', 'size'], $changed))) {
+        if (!empty(array_intersect(['type', 'size'/*, 'dbType'*/], $changed))) {
             $addUsing = $this->isNeedUsingExpression($desired->type, $current->type);
             $this->migration->addUpCode($this->recordBuilder->alterColumnType($tableName, $desired));
             $this->migration->addDownCode($this->recordBuilder->alterColumnTypeFromDb($tableName, $current, $addUsing));
@@ -207,6 +207,11 @@ public function modifyCurrent(ColumnSchema $current): void
         if ($current->phpType === 'integer' && $current->defaultValue !== null) {
             $current->defaultValue = (int)$current->defaultValue;
         }
+        // TODO this is not concretely correct
+        if (!empty($current->enumValues)) {
+            $current->type = 'enum';
+            $current->dbType = 'enum';
+        }
     }
 
     public function modifyDesired(ColumnSchema $desired): void
@@ -219,6 +224,11 @@ public function modifyDesired(ColumnSchema $desired): void
             $desired->precision = $decimalAttributes['precision'];
             $desired->scale = $decimalAttributes['scale'];
         }
+        // TODO this is not concretely correct
+        if (!empty($desired->enumValues)) {
+            $desired->type = 'enum';
+            $desired->dbType = 'enum';
+        }
     }
 
     public function modifyDesiredInContextOfCurrent(ColumnSchema $current, ColumnSchema $desired): void

tests/specs/enum/enum.yaml

@@ -42,11 +42,11 @@ components:
           type: integer
         device:
           type: string
-          # maxLength: 8
-          # enum:
-          #   - MOBILE
-          #   - TV
-          #   - COMPUTER
-          # default:
-          #   TV
-          # nullable: false
+        connection:
+          type: string
+          enum:
+            - WIRED
+            - WIRELESS
+          default:
+            WIRED
+          nullable: false

tests/unit/EnumTest.php

@@ -64,7 +64,11 @@ public function testEnumToString()
     }
 
     // public function testStringToEnum()
-    // { // TODO
+    // {
+    //     $this->deleteTables();
+    //     $this->createTableForEditEnumToString();
+    //     $testFile = Yii::getAlias("@specs/enum/enum.php");
+    //     $this->runGenerator($testFile, 'mysql');
     // }
 
     // public function testChangeEnumValues()
@@ -93,12 +97,14 @@ private function createTableForEditEnumToString()
             Yii::$app->db->createCommand()->createTable('{{%editcolumns}}', [
                 'id' => 'pk',
                 'device' => 'enum_device NOT NULL DEFAULT \'TV\'',
+                'connection' => 'string'
             ])->execute();
             return;
         }
         Yii::$app->db->createCommand()->createTable('{{%editcolumns}}', [
             'id' => 'pk',
             'device' => 'enum("MOBILE", "TV", "COMPUTER") NOT NULL DEFAULT \'TV\'',
+            'connection' => 'string'
         ])->execute();
     }
 }