Merge pull request #8 from SOHELAHMED7/126-dont-use-second-db-pgtestdb2-in-pgsql-in-library-source-code

Fix issue 126 - Don't use second db 'pg_test_db_2' in PgSQL in library source code

Author: SOHELAHMED7

Makefile

@@ -34,8 +34,6 @@ up:
 	echo "Waiting for mariadb to start up..."
 	docker-compose exec -T mysql timeout 60s sh -c "while ! (mysql -udbuser -pdbpass -h maria --execute 'SELECT 1;' > /dev/null 2>&1); do echo -n '.'; sleep 0.1 ; done; echo 'ok'" || (docker-compose ps; docker-compose logs; exit 1)
 	echo "Create another test DB for PgSQL ..." # created because of enum in PgSQL are different than MySQL
-	docker-compose exec -T postgres bash -c "psql --username dbuser --dbname testdb -c 'create database pg_test_db_2;'; psql --username dbuser --dbname testdb -c 'grant all privileges on database pg_test_db_2 to dbuser;'" || (docker-compose ps; docker-compose logs; exit 1)
-
 
 cli:
 	docker-compose exec php bash

src/lib/migrations/BaseMigrationBuilder.php

@@ -417,17 +417,19 @@ protected function isNeedUsingExpression(string $fromType, string $toType):bool
     public function tmpSaveNewCol(\cebe\yii2openapi\db\ColumnSchema $columnSchema): \yii\db\ColumnSchema
     {
         $tableName = 'tmp_table_';
-        $db = 'db';
-        if (ApiGenerator::isPostgres() && static::isEnum($columnSchema)) {
-            $db = 'pg_test_db_2';
-        }
 
-        Yii::$app->{$db}->createCommand('DROP TABLE IF EXISTS '.$tableName)->execute();
+        Yii::$app->db->createCommand('DROP TABLE IF EXISTS '.$tableName)->execute();
 
         if (is_string($columnSchema->xDbType) && !empty($columnSchema->xDbType)) {
             $column = [$columnSchema->name.' '.$this->newColStr($columnSchema)];
+            if (ApiGenerator::isPostgres() && static::isEnum($columnSchema)) {
+                $column = strtr($column, ['enum_'.$columnSchema->name => 'tmp_enum_'.$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.'_']);
+            }
         }
 
         // create enum if relevant
@@ -436,19 +438,25 @@ public function tmpSaveNewCol(\cebe\yii2openapi\db\ColumnSchema $columnSchema):
             $allEnumValues = array_map(function ($aValue) {
                 return "'$aValue'";
             }, $allEnumValues);
-            Yii::$app->{$db}->createCommand(
-                'CREATE TYPE enum_'.$columnSchema->name.' AS ENUM('.implode(', ', $allEnumValues).')'
+            Yii::$app->db->createCommand(
+                'CREATE TYPE tmp_enum_'.$columnSchema->name.'_ AS ENUM('.implode(', ', $allEnumValues).')'
             )->execute();
         }
 
-        Yii::$app->{$db}->createCommand()->createTable($tableName, $column)->execute();
+        Yii::$app->db->createCommand()->createTable($tableName, $column)->execute();
 
-        $table = Yii::$app->{$db}->getTableSchema($tableName);
+        $table = Yii::$app->db->getTableSchema($tableName);
 
-        Yii::$app->{$db}->createCommand()->dropTable($tableName)->execute();
+        Yii::$app->db->createCommand()->dropTable($tableName)->execute();
 
         if (ApiGenerator::isPostgres() && static::isEnum($columnSchema)) {// drop enum
-            Yii::$app->{$db}->createCommand('DROP TYPE enum_'.$columnSchema->name)->execute();
+            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');
+            }
+            // 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
+            $table->columns[$columnSchema->name]->dbType = 'enum_'.$columnSchema->name;
         }
 
         return $table->columns[$columnSchema->name];

tests/config/console.php

@@ -53,13 +53,6 @@
             'charset' => 'utf8',
             'tablePrefix'=>'itt_',
         ],
-        'pg_test_db_2' => [
-            'class' => \yii\db\Connection::class,
-            'dsn' => 'pgsql:host=postgres;dbname=pg_test_db_2',
-            'username' => 'dbuser',
-            'password' => 'dbpass',
-            'charset' => 'utf8',
-        ],
         'mysql' => [
             'class' => \yii\db\Connection::class,
             'dsn' => 'mysql:host=mysql;dbname=testdb',