Merge PRs of SOHELAHMED7/yii2-openapi

src/lib/migrations/BaseMigrationBuilder.php

@@ -412,18 +412,22 @@ protected function isNeedUsingExpression(string $fromDbType, string $toDbType):b
     public function tmpSaveNewCol(\cebe\yii2openapi\db\ColumnSchema $columnSchema): \yii\db\ColumnSchema
     {
         $tableName = 'tmp_table_';
+        $tmpEnumName = function (string $columnName): string {
+            return '"tmp_enum_'.$columnName.'_"';
+        };
 
         Yii::$app->db->createCommand('DROP TABLE IF EXISTS '.$tableName)->execute();
 
         if (is_string($columnSchema->xDbType) && !empty($columnSchema->xDbType)) {
-            $column = [$columnSchema->name.' '.$this->newColStr($columnSchema)];
+            $name = MigrationRecordBuilder::quote($columnSchema->name);
+            $column = [$name.' '.$this->newColStr($columnSchema)];
             if (ApiGenerator::isPostgres() && static::isEnum($columnSchema)) {
-                $column = strtr($column, ['enum_'.$columnSchema->name => 'tmp_enum_'.$columnSchema->name.'_']);
+                $column = strtr($column, ['enum_'.$columnSchema->name => $tmpEnumName($columnSchema->name)]);
             }
         } else {
             $column = [$columnSchema->name => $this->newColStr($columnSchema)];
             if (ApiGenerator::isPostgres() && static::isEnum($columnSchema)) {
-                $column[$columnSchema->name] = strtr($column[$columnSchema->name], ['enum_'.$columnSchema->name => 'tmp_enum_'.$columnSchema->name.'_']);
+                $column[$columnSchema->name] = strtr($column[$columnSchema->name], ['enum_'.$columnSchema->name => $tmpEnumName($columnSchema->name)]);
             }
         }
 
@@ -434,7 +438,7 @@ public function tmpSaveNewCol(\cebe\yii2openapi\db\ColumnSchema $columnSchema):
                 return "'$aValue'";
             }, $allEnumValues);
             Yii::$app->db->createCommand(
-                'CREATE TYPE tmp_enum_'.$columnSchema->name.'_ AS ENUM('.implode(', ', $allEnumValues).')'
+                'CREATE TYPE '.$tmpEnumName($columnSchema->name).' AS ENUM('.implode(', ', $allEnumValues).')'
             )->execute();
         }
 
@@ -445,9 +449,9 @@ public function tmpSaveNewCol(\cebe\yii2openapi\db\ColumnSchema $columnSchema):
         Yii::$app->db->createCommand()->dropTable($tableName)->execute();
 
         if (ApiGenerator::isPostgres() && static::isEnum($columnSchema)) {// drop enum
-            Yii::$app->db->createCommand('DROP TYPE tmp_enum_'.$columnSchema->name.'_')->execute();
-            if ($table->columns[$columnSchema->name]->dbType !== 'tmp_enum_'.$columnSchema->name.'_') {
-                throw new \Exception('Unknown error related to PgSQL enum');
+            Yii::$app->db->createCommand('DROP TYPE '.$tmpEnumName($columnSchema->name))->execute();
+            if ('"'.$table->columns[$columnSchema->name]->dbType.'"' !== $tmpEnumName($columnSchema->name)) {
+                throw new \Exception('Unknown error related to PgSQL enum '.$table->columns[$columnSchema->name]->dbType);
             }
             // reset back column enum name to original as we are comparing with current
             // e.g. we get different enum type name such as `enum_status` and `tmp_enum_status_` even there is no change, so below statement fix this issue

src/lib/migrations/MigrationRecordBuilder.php

@@ -33,13 +33,14 @@ final class MigrationRecordBuilder
     public const ADD_FK = MigrationRecordBuilder::INDENT . "\$this->addForeignKey('%s', '%s', '%s', '%s', '%s');";
     public const ADD_PK = MigrationRecordBuilder::INDENT . "\$this->addPrimaryKey('%s', '%s', '%s');";
     public const ADD_COLUMN = MigrationRecordBuilder::INDENT . "\$this->addColumn('%s', '%s', %s);";
+    public const ALTER_COLUMN = MigrationRecordBuilder::INDENT . "\$this->alterColumn('%s', '%s', %s);";
 
-    public const ADD_COLUMN_RAW = MigrationRecordBuilder::INDENT . "\$this->db->createCommand('ALTER TABLE %s ADD COLUMN %s %s')->execute();";
 
-    public const ALTER_COLUMN = MigrationRecordBuilder::INDENT . "\$this->alterColumn('%s', '%s', %s);";
+    public const ADD_COLUMN_RAW = MigrationRecordBuilder::INDENT . "\$this->db->createCommand('ALTER TABLE %s ADD COLUMN %s %s')->execute();";
 
     public const ALTER_COLUMN_RAW = MigrationRecordBuilder::INDENT . "\$this->db->createCommand('ALTER TABLE %s MODIFY %s %s')->execute();";
-    public const ALTER_COLUMN_RAW_PGSQL = MigrationRecordBuilder::INDENT . "\$this->db->createCommand('ALTER TABLE %s ALTER COLUMN %s SET DATA TYPE %s')->execute();";
+
+    public const ALTER_COLUMN_RAW_PGSQL = MigrationRecordBuilder::INDENT . "\$this->db->createCommand('ALTER TABLE %s ALTER COLUMN \"%s\" SET DATA TYPE %s')->execute();";
 
     /**
      * @var \yii\db\Schema
@@ -62,7 +63,8 @@ public function createTable(string $tableAlias, array $columns):string
         $codeColumns = [];
         foreach ($columns as $columnName => $cebeDbColumnSchema) {
             if (is_string($cebeDbColumnSchema->xDbType) && !empty($cebeDbColumnSchema->xDbType)) {
-                $codeColumns[] = $columnName.' '.$this->columnToCode($cebeDbColumnSchema, false)->getCode();
+                $name = static::quote($columnName);
+                $codeColumns[] = $name.' '.$this->columnToCode($cebeDbColumnSchema, false)->getCode();
             } else {
                 $codeColumns[$columnName] = $this->columnToCode($cebeDbColumnSchema, false)->getCode();
             }
@@ -79,7 +81,8 @@ public function addColumn(string $tableAlias, ColumnSchema $column):string
     {
         if (is_string($column->xDbType) && !empty($column->xDbType)) {
             $converter = $this->columnToCode($column, false);
-            return sprintf(self::ADD_COLUMN_RAW, $tableAlias, $column->name, $converter->getCode());
+            $name = static::quote($column->name);
+            return sprintf(self::ADD_COLUMN_RAW, $tableAlias, $name, $converter->getCode());
         }
 
         $converter = $this->columnToCode($column, false);
@@ -93,6 +96,7 @@ public function addDbColumn(string $tableAlias, ColumnSchema $column):string
     {
         if (property_exists($column, 'xDbType') && is_string($column->xDbType) && !empty($column->xDbType)) {
             $converter = $this->columnToCode($column, true);
+            $name = static::quote($column->name);
             return sprintf(self::ADD_COLUMN_RAW, $tableAlias, $column->name, $converter->getCode());
         }
         $converter = $this->columnToCode($column, true);
@@ -269,4 +273,13 @@ private function columnToCode(
             $alterByXDbType
         ]);
     }
+
+    // https://github.com/cebe/yii2-openapi/issues/127
+    public static function quote(string $columnName): string
+    {
+        if (ApiGenerator::isPostgres()) {
+            return '"'.$columnName.'"';
+        }
+        return $columnName;
+    }
 }

tests/specs/blog/migrations_pgsql_db/m200000_000002_create_table_blog_posts.php

@@ -8,7 +8,7 @@ class m200000_000002_create_table_blog_posts extends \yii\db\Migration
     public function safeUp()
     {
         $this->createTable('{{%blog_posts}}', [
-            0 => 'uid varchar(128) NOT NULL',
+            0 => '"uid" varchar(128) NOT NULL',
             'title' => $this->string(255)->notNull(),
             'slug' => $this->string(200)->null()->defaultValue(null),
             'category_id' => $this->integer()->notNull(),

tests/specs/blog/migrations_pgsql_db/m200000_000004_create_table_post_comments.php

@@ -11,8 +11,8 @@ public function safeUp()
             'id' => $this->bigPrimaryKey(),
             'post_id' => $this->string(128)->notNull(),
             'author_id' => $this->integer()->notNull(),
-            0 => 'message json NOT NULL DEFAULT \'[]\'',
-            1 => 'meta_data json NOT NULL DEFAULT \'[]\'',
+            0 => '"message" json NOT NULL DEFAULT \'[]\'',
+            1 => '"meta_data" json NOT NULL DEFAULT \'[]\'',
             'created_at' => $this->integer()->notNull(),
         ]);
         $this->addForeignKey('fk_post_comments_post_id_blog_posts_uid', '{{%post_comments}}', 'post_id', '{{%blog_posts}}', 'uid');

tests/specs/blog_v2/migrations_pgsql_db/m200000_000001_create_table_v2_tags.php

@@ -10,7 +10,7 @@ public function safeUp()
         $this->execute('CREATE TYPE enum_lang AS ENUM(\'ru\', \'eng\')');
         $this->createTable('{{%v2_tags}}', [
             'id' => $this->bigPrimaryKey(),
-            0 => 'name varchar(100) NOT NULL',
+            0 => '"name" varchar(100) NOT NULL',
             'lang' => 'enum_lang NOT NULL',
         ]);
         $this->createIndex('v2_tags_name_key', '{{%v2_tags}}', 'name', true);

tests/specs/blog_v2/migrations_pgsql_db/m200000_000004_change_table_v2_users.php

@@ -11,7 +11,7 @@ public function safeUp()
         $this->addColumn('{{%v2_users}}', 'login', $this->text()->notNull());
         $this->dropColumn('{{%v2_users}}', 'username');
         $this->alterColumn('{{%v2_users}}', 'created_at', "DROP DEFAULT");
-        $this->db->createCommand('ALTER TABLE {{%v2_users}} ALTER COLUMN email SET DATA TYPE varchar(255)')->execute();
+        $this->db->createCommand('ALTER TABLE {{%v2_users}} ALTER COLUMN "email" SET DATA TYPE varchar(255)')->execute();
         $this->alterColumn('{{%v2_users}}', 'role', 'enum_role USING "role"::enum_role');
         $this->alterColumn('{{%v2_users}}', 'role', "DROP DEFAULT");
         $this->dropIndex('v2_users_username_key', '{{%v2_users}}');

tests/specs/change_column_name/pgsql/app/migrations_pgsql_db/m200000_000000_change_table_column_name_changes.php

@@ -7,7 +7,7 @@ class m200000_000000_change_table_column_name_changes extends \yii\db\Migration
 {
     public function safeUp()
     {
-        $this->db->createCommand('ALTER TABLE {{%column_name_changes}} ADD COLUMN updated_at_2 timestamp NOT NULL')->execute();
+        $this->db->createCommand('ALTER TABLE {{%column_name_changes}} ADD COLUMN "updated_at_2" timestamp NOT NULL')->execute();
         $this->dropColumn('{{%column_name_changes}}', 'updated_at');
     }
 

tests/specs/menu/migrations/m200000_000000_create_table_menus.php

@@ -11,8 +11,8 @@ public function safeUp()
             'id' => $this->bigPrimaryKey(),
             'name' => $this->string(100)->notNull(),
             'parent_id' => $this->bigInteger()->null()->defaultValue(null),
-            0 => 'args text[] NULL DEFAULT \'{"foo","bar","baz"}\'',
-            1 => 'kwargs json NOT NULL DEFAULT \'[{"foo":"bar"},{"buzz":"fizz"}]\'',
+            0 => '"args" text[] NULL DEFAULT \'{"foo","bar","baz"}\'',
+            1 => '"kwargs" json NOT NULL DEFAULT \'[{"foo":"bar"},{"buzz":"fizz"}]\'',
         ]);
         $this->addForeignKey('fk_menus_parent_id_menus_id', '{{%menus}}', 'parent_id', '{{%menus}}', 'id');
     }