From 40e7c8f8592ebe38d2f420d7eb95b7ccdc281554 Mon Sep 17 00:00:00 2001
From: Sohel Ahmed Mesaniya <sam.wankaner@gmail.com>
Date: Fri, 7 Jul 2023 15:46:41 +0530
Subject: [PATCH 01/71] Initial commit of this PR

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 7677e7aa..2dd85db3 100644
--- a/README.md
+++ b/README.md
@@ -530,3 +530,4 @@ Professional support, consulting as well as software development services are av
 https://www.cebe.cc/en/contact
 
 Development of this library is sponsored by [cebe.:cloud: "Your Professional Deployment Platform"](https://cebe.cloud).
+

From 186045dc08da70dc0edd4d549484f664c3b2ad37 Mon Sep 17 00:00:00 2001
From: Sohel Ahmed Mesaniya <sam.wankaner@gmail.com>
Date: Fri, 7 Jul 2023 16:59:01 +0530
Subject: [PATCH 02/71] Add failing test

---
 README.md                                     |  7 ++++-
 .../132_create_migration_for_drop_table.php   | 13 +++++++++
 .../132_create_migration_for_drop_table.yaml  | 29 +++++++++++++++++++
 tests/unit/IssueFixTest.php                   | 27 +++++++++++++++++
 4 files changed, 75 insertions(+), 1 deletion(-)
 create mode 100644 tests/specs/issue_fix/132_create_migration_for_drop_table/132_create_migration_for_drop_table.php
 create mode 100644 tests/specs/issue_fix/132_create_migration_for_drop_table/132_create_migration_for_drop_table.yaml

diff --git a/README.md b/README.md
index 2dd85db3..8675503a 100644
--- a/README.md
+++ b/README.md
@@ -273,6 +273,12 @@ Provide custom column name in case of relationship column. Example:
               - x-fk-column-name: redelivery_of # this will create `redelivery_of` column instead of `redelivery_of_id`
 ```
 
+
+### `x-keep-tables`
+
+You may ... TODO docs for https://github.com/cebe/yii2-openapi/issues/132
+
+
 ## Many-to-Many relation definition
 
 There are two ways for define many-to-many relations:
@@ -530,4 +536,3 @@ Professional support, consulting as well as software development services are av
 https://www.cebe.cc/en/contact
 
 Development of this library is sponsored by [cebe.:cloud: "Your Professional Deployment Platform"](https://cebe.cloud).
-
diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/132_create_migration_for_drop_table.php b/tests/specs/issue_fix/132_create_migration_for_drop_table/132_create_migration_for_drop_table.php
new file mode 100644
index 00000000..7fe5327f
--- /dev/null
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/132_create_migration_for_drop_table.php
@@ -0,0 +1,13 @@
+<?php
+
+return [
+    'openApiPath' => '@specs/issue_fix/132_create_migration_for_drop_table/132_create_migration_for_drop_table.yaml',
+    'generateUrls' => false,
+    'generateModels' => true,
+    'excludeModels' => [
+        'Error',
+    ],
+    'generateControllers' => false,
+    'generateMigrations' => true,
+    'generateModelFaker' => false,
+];
diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/132_create_migration_for_drop_table.yaml b/tests/specs/issue_fix/132_create_migration_for_drop_table/132_create_migration_for_drop_table.yaml
new file mode 100644
index 00000000..a48e1a15
--- /dev/null
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/132_create_migration_for_drop_table.yaml
@@ -0,0 +1,29 @@
+openapi: "3.0.0"
+info:
+  version: 1.0.0
+  title: 132_create_migration_for_drop_table \#132
+paths:
+  /:
+    get:
+      summary: List
+      operationId: list
+      responses:
+        '200':
+          description: The information
+
+components:
+  schemas:
+    Pristine:
+      type: object
+      description: 132_create_migration_for_drop_table
+      required:
+        - id
+      properties:
+        id:
+          type: integer
+        billing_factor:
+          description: integer between 0 and 100, default value 100
+          type: integer
+          default: 100
+          nullable: false
+          x-faker: '$faker->numberBetween(0, 100)'
diff --git a/tests/unit/IssueFixTest.php b/tests/unit/IssueFixTest.php
index 9a64de11..508f9824 100644
--- a/tests/unit/IssueFixTest.php
+++ b/tests/unit/IssueFixTest.php
@@ -65,6 +65,7 @@ private function deleteTables()
         $this->deleteTableForQuoteInAlterColumn();
         $this->deleteTableForTimestampIssue143();
         $this->deleteTablesForWrongMigrationForPgsqlForStringVarcharDatatype149();
+        $this->deleteTablesForCreateMigrationForDropTable132();
     }
 
     private function deleteTablesForFloatIssue()
@@ -272,4 +273,30 @@ public function testNullableFalseInRequired()
         ]);
         $this->checkFiles($actualFiles, $expectedFiles);
     }
+
+    // Create migration for drop table if a entire schema is deleted from OpenAPI spec #132
+    // https://github.com/cebe/yii2-openapi/issues/132
+    public function testCreateMigrationForDropTable132()
+    {
+        $testFile = Yii::getAlias("@specs/issue_fix/132_create_migration_for_drop_table/132_create_migration_for_drop_table.php");
+        $this->deleteTablesForNoSyntaxError107();
+        $this->createTableForNoSyntaxError107();
+        $this->runGenerator($testFile, 'mysql');
+        // ... TODO
+        $this->deleteTables();
+    }
+
+    private function createTableForCreateMigrationForDropTable132()
+    {
+        Yii::$app->db->createCommand()->createTable('{{%fruits}}', [
+            'id' => 'pk',
+            'name' => 'string(150)',
+        ])->execute();
+    }
+
+    private function deleteTablesForCreateMigrationForDropTable132()
+    {
+        Yii::$app->db->createCommand('DROP TABLE IF EXISTS {{%fruits}}')->execute();
+    }
+
 }

From 242ecde72204d4b104a7272dbbb58a6b4ad1f49f Mon Sep 17 00:00:00 2001
From: Sohel Ahmed Mesaniya <sam.wankaner@gmail.com>
Date: Mon, 10 Jul 2023 22:23:52 +0530
Subject: [PATCH 03/71] WIP

---
 README.md                                     | 22 +++++++++++++++++++
 src/lib/SchemaToDatabase.php                  |  2 +-
 src/lib/generators/MigrationsGenerator.php    | 15 +++++++++++++
 src/lib/items/MigrationModel.php              |  3 ++-
 .../132_create_migration_for_drop_table.yaml  | 10 +++++++++
 tests/unit/IssueFixTest.php                   |  6 ++++-
 6 files changed, 55 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 8675503a..2a248b39 100644
--- a/README.md
+++ b/README.md
@@ -536,3 +536,25 @@ Professional support, consulting as well as software development services are av
 https://www.cebe.cc/en/contact
 
 Development of this library is sponsored by [cebe.:cloud: "Your Professional Deployment Platform"](https://cebe.cloud).
+
+
+---
+
+
+TODO
+
+foreach dbmodels
+  grab table names
+
+create list of all table names
+---
+fetch all table name list from DB (SQL query)
+
+find the diff
+
+create drop table mig diff tables
+
+consider `x-keep-table`
+
+
+
diff --git a/src/lib/SchemaToDatabase.php b/src/lib/SchemaToDatabase.php
index 0e93ff29..5cdcb799 100644
--- a/src/lib/SchemaToDatabase.php
+++ b/src/lib/SchemaToDatabase.php
@@ -88,7 +88,7 @@ public function prepareModels():array
             if ($junctions->isJunctionSchema($schemaName)) {
                 $schemaName = $junctions->trimPrefix($schemaName);
             }
-            /**@var \cebe\yii2openapi\lib\AttributeResolver $resolver */
+            /** @var \cebe\yii2openapi\lib\AttributeResolver $resolver */
             $resolver = Yii::createObject(AttributeResolver::class, [$schemaName, $schema, $junctions, $this->config]);
             $models[$schemaName] = $resolver->resolve();
         }
diff --git a/src/lib/generators/MigrationsGenerator.php b/src/lib/generators/MigrationsGenerator.php
index 4b5ddee0..309a91f3 100644
--- a/src/lib/generators/MigrationsGenerator.php
+++ b/src/lib/generators/MigrationsGenerator.php
@@ -110,6 +110,21 @@ public function generate():CodeFiles
     public function buildMigrations():array
     {
         $junctions = [];
+
+        // MySQL
+        // MariaDB TODO
+        // PgSQL TODO
+        $sql='SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES';
+        $tables = Yii::$app->db
+                 ->createCommand($sql)
+                 ->queryAll();
+        var_dump($tables); die;
+
+
+        foreach ($this->models as $model) {var_dump($model->tableAlias);}
+
+        var_dump(array_keys($this->models)); die;
+
         foreach ($this->models as $model) {
             $migration = $this->createBuilder($model)->build();
             if ($migration->notEmpty()) {
diff --git a/src/lib/items/MigrationModel.php b/src/lib/items/MigrationModel.php
index a8ba6611..2f4bcdb6 100644
--- a/src/lib/items/MigrationModel.php
+++ b/src/lib/items/MigrationModel.php
@@ -132,7 +132,8 @@ public function addUpCode($code, bool $toTop = false):MigrationModel
         return $this;
     }
 
-    /**add down code, by default to top
+    /**
+     * Add down code, by default to top
      * @param array|string $code
      * @param bool         $toBottom
      * @return $this
diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/132_create_migration_for_drop_table.yaml b/tests/specs/issue_fix/132_create_migration_for_drop_table/132_create_migration_for_drop_table.yaml
index a48e1a15..23915a2f 100644
--- a/tests/specs/issue_fix/132_create_migration_for_drop_table/132_create_migration_for_drop_table.yaml
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/132_create_migration_for_drop_table.yaml
@@ -27,3 +27,13 @@ components:
           default: 100
           nullable: false
           x-faker: '$faker->numberBetween(0, 100)'
+    Foo:
+      type: object
+      description: 132_create_migration_for_drop_table
+      required:
+        - id
+      properties:
+        id:
+          type: integer
+        factor:
+          type: integer
diff --git a/tests/unit/IssueFixTest.php b/tests/unit/IssueFixTest.php
index 508f9824..141c677d 100644
--- a/tests/unit/IssueFixTest.php
+++ b/tests/unit/IssueFixTest.php
@@ -292,11 +292,15 @@ private function createTableForCreateMigrationForDropTable132()
             'id' => 'pk',
             'name' => 'string(150)',
         ])->execute();
+        Yii::$app->db->createCommand()->createTable('{{%pristines}}', [
+            'id' => 'pk',
+            'name' => 'string(150)',
+        ])->execute();
     }
 
     private function deleteTablesForCreateMigrationForDropTable132()
     {
         Yii::$app->db->createCommand('DROP TABLE IF EXISTS {{%fruits}}')->execute();
+        Yii::$app->db->createCommand('DROP TABLE IF EXISTS {{%pristines}}')->execute();
     }
-
 }

From c489f22ecc12cfb77b3d329eeb238453d88848ce Mon Sep 17 00:00:00 2001
From: Sohel Ahmed Mesaniya <sam.wankaner@gmail.com>
Date: Thu, 30 May 2024 20:53:57 +0530
Subject: [PATCH 04/71] Design: WIP

---
 src/lib/generators/MigrationsGenerator.php         | 14 +++++++-------
 .../132_create_migration_for_drop_table.yaml       |  5 ++++-
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/lib/generators/MigrationsGenerator.php b/src/lib/generators/MigrationsGenerator.php
index 309a91f3..07ec7081 100644
--- a/src/lib/generators/MigrationsGenerator.php
+++ b/src/lib/generators/MigrationsGenerator.php
@@ -114,16 +114,16 @@ public function buildMigrations():array
         // MySQL
         // MariaDB TODO
         // PgSQL TODO
-        $sql='SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES';
-        $tables = Yii::$app->db
-                 ->createCommand($sql)
-                 ->queryAll();
-        var_dump($tables); die;
+        // $sql='SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES';
+        // $tables = Yii::$app->db
+        //          ->createCommand($sql)
+        //          ->queryAll();
+        // var_dump($tables); die;
 
 
-        foreach ($this->models as $model) {var_dump($model->tableAlias);}
+        // foreach ($this->models as $model) {var_dump($model->tableAlias);}
 
-        var_dump(array_keys($this->models)); die;
+        // var_dump(array_keys($this->models)); die;
 
         foreach ($this->models as $model) {
             $migration = $this->createBuilder($model)->build();
diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/132_create_migration_for_drop_table.yaml b/tests/specs/issue_fix/132_create_migration_for_drop_table/132_create_migration_for_drop_table.yaml
index 23915a2f..9f5bb53e 100644
--- a/tests/specs/issue_fix/132_create_migration_for_drop_table/132_create_migration_for_drop_table.yaml
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/132_create_migration_for_drop_table.yaml
@@ -2,6 +2,9 @@ openapi: "3.0.0"
 info:
   version: 1.0.0
   title: 132_create_migration_for_drop_table \#132
+x-delete-tables:  # don't use x-keep-table
+  - abc
+  - def
 paths:
   /:
     get:
@@ -13,7 +16,7 @@ paths:
 
 components:
   schemas:
-    Pristine:
+    Pristine: # if you remove this entire schema and want to remove its table then you need to add its table name in `x-delete-tables`
       type: object
       description: 132_create_migration_for_drop_table
       required:

From d4e0d887846a64ad7292c2905963a18bba7edc61 Mon Sep 17 00:00:00 2001
From: Sohel Ahmed Mesaniya <sam.wankaner@gmail.com>
Date: Fri, 31 May 2024 17:17:27 +0530
Subject: [PATCH 05/71] WIP

---
 src/generator/ApiGenerator.php                | 39 ++++++++++---------
 src/lib/SchemaToDatabase.php                  |  2 +-
 src/lib/migrations/BaseMigrationBuilder.php   |  3 +-
 src/lib/migrations/MysqlMigrationBuilder.php  |  8 ++--
 .../132_create_migration_for_drop_table.yaml  | 21 ++--------
 tests/unit/IssueFixTest.php                   |  2 +-
 6 files changed, 34 insertions(+), 41 deletions(-)

diff --git a/src/generator/ApiGenerator.php b/src/generator/ApiGenerator.php
index f930f949..eca7aaf2 100644
--- a/src/generator/ApiGenerator.php
+++ b/src/generator/ApiGenerator.php
@@ -7,9 +7,9 @@
 
 namespace cebe\yii2openapi\generator;
 
-use yii\db\mysql\Schema as MySqlSchema;
-use SamIT\Yii2\MariaDb\Schema as MariaDbSchema;
-use yii\db\pgsql\Schema as PgSqlSchema;
+use cebe\openapi\exceptions\IOException;
+use cebe\openapi\exceptions\TypeErrorException;
+use cebe\openapi\exceptions\UnresolvableReferenceException;
 use cebe\openapi\Reader;
 use cebe\openapi\spec\OpenApi;
 use cebe\yii2openapi\lib\Config;
@@ -22,7 +22,10 @@
 use cebe\yii2openapi\lib\generators\UrlRulesGenerator;
 use cebe\yii2openapi\lib\PathAutoCompletion;
 use cebe\yii2openapi\lib\SchemaToDatabase;
+use Exception;
 use Yii;
+use yii\db\mysql\Schema as MySqlSchema;
+use yii\db\pgsql\Schema as PgSqlSchema;
 use yii\gii\CodeFile;
 use yii\gii\Generator;
 use yii\helpers\Html;
@@ -176,7 +179,7 @@ class ApiGenerator extends Generator
     private $_openApiWithoutRef;
 
     /**
-     * @var \cebe\yii2openapi\lib\Config $config
+     * @var Config $config
      **/
     private $config;
 
@@ -283,11 +286,11 @@ public function rules()
 
     /**
      * @param $attribute
-     * @throws \cebe\openapi\exceptions\IOException
-     * @throws \cebe\openapi\exceptions\TypeErrorException
-     * @throws \cebe\openapi\exceptions\UnresolvableReferenceException
+     * @throws IOException
+     * @throws TypeErrorException
+     * @throws UnresolvableReferenceException
      */
-    public function validateSpec($attribute):void
+    public function validateSpec($attribute): void
     {
         if ($this->ignoreSpecErrors) {
             return;
@@ -299,7 +302,7 @@ public function validateSpec($attribute):void
         }
     }
 
-    public function validateUrlPrefixes($attribute):void
+    public function validateUrlPrefixes($attribute): void
     {
         if (empty($this->urlPrefixes)) {
             return;
@@ -427,7 +430,7 @@ public function stickyAttributes()
         );
     }
 
-    public function makeConfig():Config
+    public function makeConfig(): Config
     {
         if (!$this->config) {
             $props = get_object_vars($this);
@@ -489,12 +492,12 @@ public function generate():array
     }
 
     /**
-     * @return \cebe\openapi\spec\OpenApi
-     * @throws \cebe\openapi\exceptions\IOException
-     * @throws \cebe\openapi\exceptions\TypeErrorException
-     * @throws \cebe\openapi\exceptions\UnresolvableReferenceException
+     * @return OpenApi
+     * @throws IOException
+     * @throws TypeErrorException
+     * @throws UnresolvableReferenceException
      */
-    protected function getOpenApiWithoutReferences():OpenApi
+    protected function getOpenApiWithoutReferences(): OpenApi
     {
         if ($this->_openApiWithoutRef === null) {
             $file = Yii::getAlias($this->openApiPath);
@@ -507,17 +510,17 @@ protected function getOpenApiWithoutReferences():OpenApi
         return $this->_openApiWithoutRef;
     }
 
-    public static function isPostgres():bool
+    public static function isPostgres(): bool
     {
         return Yii::$app->db->schema instanceof PgSqlSchema;
     }
 
-    public static function isMysql():bool
+    public static function isMysql(): bool
     {
         return (Yii::$app->db->schema instanceof MySqlSchema && !static::isMariaDb());
     }
 
-    public static function isMariaDb():bool
+    public static function isMariaDb(): bool
     {
         return strpos(Yii::$app->db->schema->getServerVersion(), 'MariaDB') !== false;
     }
diff --git a/src/lib/SchemaToDatabase.php b/src/lib/SchemaToDatabase.php
index 5cdcb799..b5e74c26 100644
--- a/src/lib/SchemaToDatabase.php
+++ b/src/lib/SchemaToDatabase.php
@@ -50,7 +50,7 @@
  *                  minLength: #(numeric value, can be applied for validation rules)
  *                  default: #(int|string, default value, used for database migration and model rules)
  *                  x-db-type: #(Custom database type like JSON, JSONB, CHAR, VARCHAR, UUID, etc )
- *                  x-faker: #(custom faker generator, for ex '$faker->gender')
+ *                  x-faker: #(custom faker generator, for ex '$faker->gender'; PHP code as string)
  *                  description: #(optional, used for comment)
  */
 class SchemaToDatabase
diff --git a/src/lib/migrations/BaseMigrationBuilder.php b/src/lib/migrations/BaseMigrationBuilder.php
index d4c49c21..015e155b 100644
--- a/src/lib/migrations/BaseMigrationBuilder.php
+++ b/src/lib/migrations/BaseMigrationBuilder.php
@@ -201,6 +201,7 @@ function (string $unknownColumn) {
         $this->buildColumnsDrop($columnsForDrop);
         foreach ($columnsForChange as $commonColumn) {
             $current = $this->tableSchema->columns[$commonColumn];
+            /** @var \cebe\yii2openapi\db\ColumnSchema|\yii\db\ColumnSchema $desired */
             $desired = $this->newColumns[$commonColumn];
             if ($current->isPrimaryKey || in_array($desired->dbType, ['pk', 'upk', 'bigpk', 'ubigpk'])) {
                 // do not adjust existing primary keys
@@ -432,7 +433,7 @@ public function tmpSaveNewCol(string $tableAlias, \cebe\yii2openapi\db\ColumnSch
             $name = MigrationRecordBuilder::quote($columnSchema->name);
             $column = [$name.' '.$this->newColStr($tmpTableName, $columnSchema)];
             if (ApiGenerator::isPostgres() && static::isEnum($columnSchema)) {
-                $column = strtr($column, [$innerEnumTypeName => $tmpEnumName($columnSchema->name)]);
+                $column = strtr($column[0], [$innerEnumTypeName => $tmpEnumName($columnSchema->name)]);
             }
         } else {
             $column = [$columnSchema->name => $this->newColStr($tmpTableName, $columnSchema)];
diff --git a/src/lib/migrations/MysqlMigrationBuilder.php b/src/lib/migrations/MysqlMigrationBuilder.php
index 42354df3..98598e44 100644
--- a/src/lib/migrations/MysqlMigrationBuilder.php
+++ b/src/lib/migrations/MysqlMigrationBuilder.php
@@ -45,7 +45,7 @@ protected function compareColumns(ColumnSchema $current, ColumnSchema $desired):
         $this->modifyDesired($desired);
         $this->modifyDesiredInContextOfCurrent($current, $desired);
 
-        // Why this is needed? Often manually created ColumnSchem instance have dbType 'varchar' with size 255 and ColumnSchema fetched from db have 'varchar(255)'. So varchar !== varchar(255). such normal mistake was leading to errors. So desired column is saved in temporary table and it is fetched from that temp. table and then compared with current ColumnSchema
+        // Why this is needed? Often manually created ColumnSchema instance have dbType 'varchar' with size 255 and ColumnSchema fetched from db have 'varchar(255)'. So varchar !== varchar(255). such normal mistake was leading to errors. So desired column is saved in temporary table and it is fetched from that temp. table and then compared with current ColumnSchema
         $desiredFromDb = $this->tmpSaveNewCol($tableAlias, $desired);
 
         $this->modifyDesiredInContextOfDesiredFromDb($desired, $desiredFromDb);
@@ -121,6 +121,8 @@ public static function getColumnSchemaBuilderClass(): string
             return \yii\db\mysql\ColumnSchemaBuilder::class;
         } elseif (ApiGenerator::isMariaDb()) {
             return \SamIT\Yii2\MariaDb\ColumnSchemaBuilder::class;
+        } else {
+            throw new \Exception('Unknown database');
         }
     }
 
@@ -134,7 +136,7 @@ public function modifyCurrent(ColumnSchema $current): void
 
     public function modifyDesired(ColumnSchema $desired): void
     {
-        /** @var $desired cebe\yii2openapi\db\ColumnSchema|\yii\db\mysql\ColumnSchema */
+        /** @var $desired \cebe\yii2openapi\db\ColumnSchema|\yii\db\mysql\ColumnSchema */
         if ($desired->phpType === 'int' && $desired->defaultValue !== null) {
             $desired->defaultValue = (int)$desired->defaultValue;
         }
@@ -148,7 +150,7 @@ public function modifyDesired(ColumnSchema $desired): void
     public function modifyDesiredInContextOfCurrent(ColumnSchema $current, ColumnSchema $desired): void
     {
         /** @var $current \yii\db\mysql\ColumnSchema */
-        /** @var $desired cebe\yii2openapi\db\ColumnSchema|\yii\db\mysql\ColumnSchema */
+        /** @var $desired \cebe\yii2openapi\db\ColumnSchema|\yii\db\mysql\ColumnSchema */
         if ($current->dbType === 'tinyint(1)' && $desired->type === 'boolean') {
             if (is_bool($desired->defaultValue) || is_string($desired->defaultValue)) {
                 $desired->defaultValue = (int)$desired->defaultValue;
diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/132_create_migration_for_drop_table.yaml b/tests/specs/issue_fix/132_create_migration_for_drop_table/132_create_migration_for_drop_table.yaml
index 9f5bb53e..7acd5abc 100644
--- a/tests/specs/issue_fix/132_create_migration_for_drop_table/132_create_migration_for_drop_table.yaml
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/132_create_migration_for_drop_table.yaml
@@ -2,9 +2,10 @@ openapi: "3.0.0"
 info:
   version: 1.0.0
   title: 132_create_migration_for_drop_table \#132
+
 x-delete-tables:  # don't use x-keep-table
-  - abc
-  - def
+  - itt_fruits
+
 paths:
   /:
     get:
@@ -16,21 +17,7 @@ paths:
 
 components:
   schemas:
-    Pristine: # if you remove this entire schema and want to remove its table then you need to add its table name in `x-delete-tables`
-      type: object
-      description: 132_create_migration_for_drop_table
-      required:
-        - id
-      properties:
-        id:
-          type: integer
-        billing_factor:
-          description: integer between 0 and 100, default value 100
-          type: integer
-          default: 100
-          nullable: false
-          x-faker: '$faker->numberBetween(0, 100)'
-    Foo:
+    Foo: # if you remove this entire schema and want to remove its table then you need to add its table name in `x-delete-tables`
       type: object
       description: 132_create_migration_for_drop_table
       required:
diff --git a/tests/unit/IssueFixTest.php b/tests/unit/IssueFixTest.php
index 6edc9dfa..44b3596b 100644
--- a/tests/unit/IssueFixTest.php
+++ b/tests/unit/IssueFixTest.php
@@ -282,7 +282,7 @@ public function testCreateMigrationForDropTable132()
         $testFile = Yii::getAlias("@specs/issue_fix/132_create_migration_for_drop_table/132_create_migration_for_drop_table.php");
         $this->deleteTablesForNoSyntaxError107();
         $this->createTableForNoSyntaxError107();
-        $this->runGenerator($testFile, 'mysql');
+        $this->runGenerator($testFile);
         // ... TODO
         $this->deleteTables();
     }

From be522312749dd31370d2db32fdf0ab3032ab2cff Mon Sep 17 00:00:00 2001
From: Sohel Ahmed Mesaniya <sam.wankaner@gmail.com>
Date: Fri, 31 May 2024 19:22:19 +0530
Subject: [PATCH 06/71] WIP

---
 src/generator/ApiGenerator.php              | 12 +++++--
 src/lib/generators/MigrationsGenerator.php  | 36 +++++++++++++++++++--
 src/lib/migrations/BaseMigrationBuilder.php |  7 +++-
 3 files changed, 48 insertions(+), 7 deletions(-)

diff --git a/src/generator/ApiGenerator.php b/src/generator/ApiGenerator.php
index eca7aaf2..208c8dd0 100644
--- a/src/generator/ApiGenerator.php
+++ b/src/generator/ApiGenerator.php
@@ -460,11 +460,12 @@ public function makeConfig(): Config
      * Please refer to [[\yii\gii\generators\controller\Generator::generate()]] as an example
      * on how to implement this method.
      * @return CodeFile[] a list of code files to be created.
-     * @throws \Exception
+     * @throws Exception
      */
-    public function generate():array
+    public function generate(): array
     {
         $config = $this->makeConfig();
+
         $actionsGenerator = $this->useJsonApi
             ? Yii::createObject(JsonActionGenerator::class, [$config])
             : Yii::createObject(RestActionGenerator::class, [$config]);
@@ -485,7 +486,12 @@ public function generate():array
         $modelsGenerator = Yii::createObject(ModelsGenerator::class, [$config, $models]);
         $files->merge($modelsGenerator->generate());
 
-        $migrationsGenerator = Yii::createObject(MigrationsGenerator::class, [$config, $models, Yii::$app->db]);
+        $tablesToDrop = null;
+        if (isset($config->getOpenApi()->{'x-delete-tables'})) {
+            $tablesToDrop = $config->getOpenApi()->{'x-delete-tables'}; // for removed (components) schemas
+        }
+
+        $migrationsGenerator = Yii::createObject(MigrationsGenerator::class, [$config, $models, Yii::$app->db, $tablesToDrop]);
         $files->merge($migrationsGenerator->generate());
 
         return $files->all();
diff --git a/src/lib/generators/MigrationsGenerator.php b/src/lib/generators/MigrationsGenerator.php
index 07ec7081..d1abbd9b 100644
--- a/src/lib/generators/MigrationsGenerator.php
+++ b/src/lib/generators/MigrationsGenerator.php
@@ -12,6 +12,7 @@
 use cebe\yii2openapi\lib\items\DbModel;
 use cebe\yii2openapi\lib\items\MigrationModel;
 use cebe\yii2openapi\lib\migrations\BaseMigrationBuilder;
+use cebe\yii2openapi\lib\migrations\MigrationRecordBuilder;
 use cebe\yii2openapi\lib\migrations\MysqlMigrationBuilder;
 use cebe\yii2openapi\lib\migrations\PostgresMigrationBuilder;
 use Exception;
@@ -52,7 +53,9 @@ class MigrationsGenerator
      **/
     protected $sorted;
 
-    public function __construct(Config $config, array $models, Connection $db)
+    public ?array $tablesToDrop = null;
+
+    public function __construct(Config $config, array $models, Connection $db, array $tablesToDrop = null)
     {
         $this->config = $config;
         $this->models = array_filter($models, static function ($model) {
@@ -60,6 +63,7 @@ public function __construct(Config $config, array $models, Connection $db)
         });
         $this->files = new CodeFiles([]);
         $this->db = $db;
+        $this->tablesToDrop = $tablesToDrop;
     }
 
     /**
@@ -126,6 +130,8 @@ public function buildMigrations():array
         // var_dump(array_keys($this->models)); die;
 
         foreach ($this->models as $model) {
+            /** @var DbModel $model */
+
             $migration = $this->createBuilder($model)->build();
             if ($migration->notEmpty()) {
                 $this->migrations[$model->tableAlias] = $migration;
@@ -141,6 +147,30 @@ public function buildMigrations():array
                 $junctions[] = $relation->viaTableName;
             }
         }
+
+        // for deleted schema, create migration for drop table
+        foreach ($this->tablesToDrop as $tableName) {
+            $table = Yii::$app->db->schema->getTableSchema($tableName);
+            if ($table) {
+
+                $dbModelHere = new DbModel([
+                    'pkName' => $table->primaryKey,
+                    'name' => $table->name,
+                    'tableName' => $tableName,
+                ]);
+                $mm = new MigrationModel($dbModelHere);
+                $builder = new MigrationRecordBuilder($this->db->getSchema());
+                $mm->addUpCode($builder->dropTable($tableName))
+                    ->addDownCode($builder->createTable($tableName, $table->columns))
+                ;
+                if ($mm->notEmpty()) {
+                    var_dump('$this->migrations'); die;
+                    $this->migrations[$tableName] = $mm;
+                }
+            }
+        }
+
+
         return !empty($this->migrations) ? $this->sortMigrationsByDeps() : [];
     }
 
@@ -150,9 +180,9 @@ public function buildMigrations():array
     protected function createBuilder(DbModel $model):BaseMigrationBuilder
     {
         if ($this->db->getDriverName() === 'pgsql') {
-            return Yii::createObject(PostgresMigrationBuilder::class, [$this->db, $model]);
+            return Yii::createObject(PostgresMigrationBuilder::class, [$this->db, $model, $this->tablesToDrop]);
         }
-        return Yii::createObject(MysqlMigrationBuilder::class, [$this->db, $model]);
+        return Yii::createObject(MysqlMigrationBuilder::class, [$this->db, $model, $this->tablesToDrop]);
     }
 
     /**
diff --git a/src/lib/migrations/BaseMigrationBuilder.php b/src/lib/migrations/BaseMigrationBuilder.php
index 015e155b..48572904 100644
--- a/src/lib/migrations/BaseMigrationBuilder.php
+++ b/src/lib/migrations/BaseMigrationBuilder.php
@@ -52,6 +52,8 @@ abstract class BaseMigrationBuilder
      */
     protected $recordBuilder;
 
+    public ?array $tablesToDrop = null;
+
     /**
      * MigrationBuilder constructor.
      * @param \yii\db\Connection                  $db
@@ -59,12 +61,13 @@ abstract class BaseMigrationBuilder
      * @throws \yii\base\InvalidConfigException
      * @throws \yii\base\NotSupportedException
      */
-    public function __construct(Connection $db, DbModel $model)
+    public function __construct(Connection $db, DbModel $model, ?array $tablesToDrop = null)
     {
         $this->db = $db;
         $this->model = $model;
         $this->tableSchema = $db->getTableSchema($model->getTableAlias(), true);
         $this->recordBuilder = Yii::createObject(MigrationRecordBuilder::class, [$db->getSchema()]);
+        $this->tablesToDrop = $tablesToDrop;
     }
 
     /**
@@ -113,6 +116,7 @@ public function buildJunction(ManyToManyRelation $relation):MigrationModel
      */
     public function buildFresh():MigrationModel
     {
+//        var_dump('in 2'); die;
         $this->migration = Yii::createObject(MigrationModel::class, [$this->model, true, null, []]);
         $this->newColumns = $this->model->attributesToColumnSchema();
         if (empty($this->newColumns)) {
@@ -221,6 +225,7 @@ function (string $unknownColumn) {
         } else {
             $this->buildRelations();
         }
+
         return $this->migration;
     }
 

From 6c7e792a776896032be639b81c9af775f794ae50 Mon Sep 17 00:00:00 2001
From: Sohel Ahmed Mesaniya <sam.wankaner@gmail.com>
Date: Tue, 4 Jun 2024 19:39:15 +0530
Subject: [PATCH 07/71] WIP

---
 src/generator/ApiGenerator.php                         |  7 +------
 src/lib/SchemaToDatabase.php                           | 10 ++++++++++
 src/lib/generators/MigrationsGenerator.php             |  5 ++---
 src/lib/items/DbModel.php                              |  6 ++++++
 .../132_create_migration_for_drop_table.yaml           |  5 +++--
 5 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/src/generator/ApiGenerator.php b/src/generator/ApiGenerator.php
index 208c8dd0..770aa9c6 100644
--- a/src/generator/ApiGenerator.php
+++ b/src/generator/ApiGenerator.php
@@ -486,12 +486,7 @@ public function generate(): array
         $modelsGenerator = Yii::createObject(ModelsGenerator::class, [$config, $models]);
         $files->merge($modelsGenerator->generate());
 
-        $tablesToDrop = null;
-        if (isset($config->getOpenApi()->{'x-delete-tables'})) {
-            $tablesToDrop = $config->getOpenApi()->{'x-delete-tables'}; // for removed (components) schemas
-        }
-
-        $migrationsGenerator = Yii::createObject(MigrationsGenerator::class, [$config, $models, Yii::$app->db, $tablesToDrop]);
+        $migrationsGenerator = Yii::createObject(MigrationsGenerator::class, [$config, $models, Yii::$app->db/*, $tablesToDrop*/]);
         $files->merge($migrationsGenerator->generate());
 
         return $files->all();
diff --git a/src/lib/SchemaToDatabase.php b/src/lib/SchemaToDatabase.php
index b5e74c26..abe33cdf 100644
--- a/src/lib/SchemaToDatabase.php
+++ b/src/lib/SchemaToDatabase.php
@@ -92,6 +92,16 @@ public function prepareModels():array
             $resolver = Yii::createObject(AttributeResolver::class, [$schemaName, $schema, $junctions, $this->config]);
             $models[$schemaName] = $resolver->resolve();
         }
+
+        // for drop table/schema https://github.com/cebe/yii2-openapi/issues/132
+        $tablesToDrop = null;
+        if (isset($this->config->getOpenApi()->{'x-delete-tables'})) {
+            $tablesToDrop = $this->config->getOpenApi()->{'x-delete-tables'}; // for removed (components) schemas
+        }
+        foreach ($tablesToDrop as $table) {
+
+        }
+
         foreach ($models as  $model) {
             foreach ($model->many2many as $relation) {
                 if (isset($models[$relation->viaModelName])) {
diff --git a/src/lib/generators/MigrationsGenerator.php b/src/lib/generators/MigrationsGenerator.php
index d1abbd9b..f14a2654 100644
--- a/src/lib/generators/MigrationsGenerator.php
+++ b/src/lib/generators/MigrationsGenerator.php
@@ -161,16 +161,15 @@ public function buildMigrations():array
                 $mm = new MigrationModel($dbModelHere);
                 $builder = new MigrationRecordBuilder($this->db->getSchema());
                 $mm->addUpCode($builder->dropTable($tableName))
-                    ->addDownCode($builder->createTable($tableName, $table->columns))
+                    ->addDownCode($builder->dropTable($tableName))
                 ;
                 if ($mm->notEmpty()) {
-                    var_dump('$this->migrations'); die;
+//                    var_dump('$this->migrations'); die;
                     $this->migrations[$tableName] = $mm;
                 }
             }
         }
 
-
         return !empty($this->migrations) ? $this->sortMigrationsByDeps() : [];
     }
 
diff --git a/src/lib/items/DbModel.php b/src/lib/items/DbModel.php
index 4f174370..2de1697c 100644
--- a/src/lib/items/DbModel.php
+++ b/src/lib/items/DbModel.php
@@ -76,6 +76,12 @@ class DbModel extends BaseObject
 
     public $isNotDb = false;
 
+    /**
+     * @var bool
+     * Drop table if schema is removed. Also see `x-delete-tables`
+     */
+    public $drop = false;
+
     public function getTableAlias():string
     {
         return '{{%' . $this->tableName . '}}';
diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/132_create_migration_for_drop_table.yaml b/tests/specs/issue_fix/132_create_migration_for_drop_table/132_create_migration_for_drop_table.yaml
index 7acd5abc..ac8cc41b 100644
--- a/tests/specs/issue_fix/132_create_migration_for_drop_table/132_create_migration_for_drop_table.yaml
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/132_create_migration_for_drop_table.yaml
@@ -3,8 +3,9 @@ info:
   version: 1.0.0
   title: 132_create_migration_for_drop_table \#132
 
-x-delete-tables:  # don't use x-keep-table
-  - itt_fruits
+x-deleted-schemas:  # don't use x-keep-table, x-delete-tables
+  - Fruit # itt_fruits
+  - Mango: the_mango # custom table name; `x-table`
 
 paths:
   /:

From 56d4bb538696bc20905c84d7565abc5fe3a25d59 Mon Sep 17 00:00:00 2001
From: Carsten Brandt <mail@cebe.cc>
Date: Tue, 4 Jun 2024 17:27:09 +0200
Subject: [PATCH 08/71] Update README.md

note for moved package
---
 README.md | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 711b2a1c..f488dc2f 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,10 @@
 # yii2-openapi
 
+>
+> **This repository has been moved to <https://github.com/php-openapi/yii2-openapi>.**  
+> **Please use the new package `php-openapi/yii2-openapi` instead.**
+>
+
 REST API application generator for Yii2, openapi 3.0 YAML -> Yii2.
 
 Base on [Gii, the Yii Framework Code Generator](https://www.yiiframework.com/extension/yiisoft/yii2-gii).
@@ -36,7 +41,7 @@ Currently available features:
 
 ## Install
 
-    composer require cebe/yii2-openapi:^2.0@beta
+    composer require php-openapi/yii2-openapi:^2.0@beta
 
 ## Usage
 

From 8d047c547b4f3d186686a4455e7a5c629592b0e6 Mon Sep 17 00:00:00 2001
From: Sohel Ahmed Mesaniya <sam.wankaner@gmail.com>
Date: Wed, 12 Jun 2024 21:10:55 +0530
Subject: [PATCH 09/71] Create attributes from column schemas and more - WIP

---
 src/db/ColumnSchema.php                       |  8 ++
 src/lib/SchemaToDatabase.php                  | 83 ++++++++++++++++---
 src/lib/generators/MigrationsGenerator.php    |  4 +-
 src/lib/items/DbModel.php                     |  4 +-
 src/lib/openapi/ComponentSchema.php           |  3 +-
 .../132_create_migration_for_drop_table.yaml  |  8 +-
 6 files changed, 91 insertions(+), 19 deletions(-)

diff --git a/src/db/ColumnSchema.php b/src/db/ColumnSchema.php
index 71127a24..e8e8092b 100644
--- a/src/db/ColumnSchema.php
+++ b/src/db/ColumnSchema.php
@@ -25,4 +25,12 @@ class ColumnSchema extends \yii\db\ColumnSchema
      * ```
      */
     public $xDbType;
+
+    public function toAttribute(): \cebe\yii2openapi\lib\items\Attribute
+    {
+        return new Attribute('id', [
+            'phpType' => 'int',
+            'dbType' => 'pk' // TODO resume from here
+        ]);
+    }
 }
diff --git a/src/lib/SchemaToDatabase.php b/src/lib/SchemaToDatabase.php
index abe33cdf..55147714 100644
--- a/src/lib/SchemaToDatabase.php
+++ b/src/lib/SchemaToDatabase.php
@@ -7,11 +7,14 @@
 
 namespace cebe\yii2openapi\lib;
 
+use cebe\yii2openapi\lib\items\DbModel;
 use cebe\yii2openapi\lib\items\JunctionSchemas;
+use cebe\yii2openapi\lib\items\MigrationModel;
+use cebe\yii2openapi\lib\migrations\MigrationRecordBuilder;
 use cebe\yii2openapi\lib\openapi\ComponentSchema;
 use Yii;
 use yii\base\Exception;
-use yii\helpers\StringHelper;
+use yii\helpers\{StringHelper, ArrayHelper, Inflector};
 use function count;
 
 /**
@@ -93,15 +96,6 @@ public function prepareModels():array
             $models[$schemaName] = $resolver->resolve();
         }
 
-        // for drop table/schema https://github.com/cebe/yii2-openapi/issues/132
-        $tablesToDrop = null;
-        if (isset($this->config->getOpenApi()->{'x-delete-tables'})) {
-            $tablesToDrop = $this->config->getOpenApi()->{'x-delete-tables'}; // for removed (components) schemas
-        }
-        foreach ($tablesToDrop as $table) {
-
-        }
-
         foreach ($models as  $model) {
             foreach ($model->many2many as $relation) {
                 if (isset($models[$relation->viaModelName])) {
@@ -114,7 +108,15 @@ public function prepareModels():array
 
         // TODO generate inverse relations
 
-        return $models;
+        // for drop table/schema https://github.com/cebe/yii2-openapi/issues/132
+        $tablesToDrop = $modelsToDrop = [];
+        if (isset($this->config->getOpenApi()->{'x-deleted-schemas'})) {
+            $tablesToDrop = $this->config->getOpenApi()->{'x-deleted-schemas'}; // for removed (components) schemas
+            $modelsToDrop = static::f7($tablesToDrop);
+
+        }
+
+        return ArrayHelper::merge($models, $modelsToDrop);
     }
 
     /**
@@ -233,4 +235,63 @@ private function canGenerateModel(string $schemaName, ComponentSchema $schema):b
         }
         return true;
     }
+
+    /**
+     * @param array $schemasToDrop. Example:
+     * ```
+     * array(2) {
+     * [0]=>
+     *  string(5) "Fruit"
+     * [1]=>
+     * array(1) {
+     *  ["Mango"]=>
+     *      string(10) "the_mango_table_name"
+     *  }
+     * }
+     * ```
+     * @return DbModel[]
+     */
+    public static function f7(array $schemasToDrop): array // TODO rename
+    {
+        $dbModelsToDrop = [];
+        foreach ($schemasToDrop as $key => $value) {
+            if (is_string($value)) { // schema name
+                $schemaName = $value;
+                $tableName = static::resolveTableNameHere($schemaName);
+            } elseif (is_array($value)) {
+                $schemaName = array_key_first($value);
+                $tableName = $value[$schemaName];
+            } else {
+                throw new \Exception('Malformed list of schemas to delete');
+            }
+
+            $table = Yii::$app->db->schema->getTableSchema("{{%$tableName}}");
+            if ($table) {
+                $dbModelHere = new DbModel([
+                    'pkName' => $table->primaryKey[0],
+                    'name' => $schemaName,
+                    'tableName' => $tableName,
+                    'attributes' => [],
+                    'drop' => true
+                ]);
+                $mm = new MigrationModel($dbModelHere);
+                // $builder = new MigrationRecordBuilder($this->db->getSchema());
+                // $mm->addUpCode($builder->dropTable($tableName))
+                //     ->addDownCode($builder->dropTable($tableName))
+                // ;
+                // if ($mm->notEmpty()) {
+                    // var_dump('$this->migrations'); die;
+                    // $this->migrations[$tableName] = $mm;
+                // }
+            }
+
+        }
+        return $dbModelsToDrop;
+
+    }
+
+    public static function resolveTableNameHere(string $schemaName):string // TODO rename
+    {
+        return Inflector::camel2id(StringHelper::basename(Inflector::pluralize($schemaName)), '_');
+    }
 }
diff --git a/src/lib/generators/MigrationsGenerator.php b/src/lib/generators/MigrationsGenerator.php
index f14a2654..25e53dc3 100644
--- a/src/lib/generators/MigrationsGenerator.php
+++ b/src/lib/generators/MigrationsGenerator.php
@@ -53,9 +53,9 @@ class MigrationsGenerator
      **/
     protected $sorted;
 
-    public ?array $tablesToDrop = null;
+    public array $tablesToDrop = [];
 
-    public function __construct(Config $config, array $models, Connection $db, array $tablesToDrop = null)
+    public function __construct(Config $config, array $models, Connection $db, array $tablesToDrop = [])
     {
         $this->config = $config;
         $this->models = array_filter($models, static function ($model) {
diff --git a/src/lib/items/DbModel.php b/src/lib/items/DbModel.php
index 2de1697c..5473f70b 100644
--- a/src/lib/items/DbModel.php
+++ b/src/lib/items/DbModel.php
@@ -78,7 +78,9 @@ class DbModel extends BaseObject
 
     /**
      * @var bool
-     * Drop table if schema is removed. Also see `x-delete-tables`
+     * Drop table if schema is removed.
+     * @see `x-deleted-schemas` in README.md
+     * @see https://github.com/cebe/yii2-openapi/issues/132
      */
     public $drop = false;
 
diff --git a/src/lib/openapi/ComponentSchema.php b/src/lib/openapi/ComponentSchema.php
index 1fc9f92f..b1293f90 100644
--- a/src/lib/openapi/ComponentSchema.php
+++ b/src/lib/openapi/ComponentSchema.php
@@ -11,6 +11,7 @@
 use cebe\openapi\spec\Reference;
 use cebe\openapi\SpecObjectInterface;
 use cebe\yii2openapi\lib\CustomSpecAttr;
+use cebe\yii2openapi\lib\SchemaToDatabase;
 use Generator;
 use Yii;
 use yii\helpers\Inflector;
@@ -111,7 +112,7 @@ public function isNonDb():bool
     public function resolveTableName(string $schemaName):string
     {
         return $this->schema->{CustomSpecAttr::TABLE} ??
-            Inflector::camel2id(StringHelper::basename(Inflector::pluralize($schemaName)), '_');
+            SchemaToDatabase::resolveTableNameHere($schemaName);
     }
 
     public function hasCustomTableName():bool
diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/132_create_migration_for_drop_table.yaml b/tests/specs/issue_fix/132_create_migration_for_drop_table/132_create_migration_for_drop_table.yaml
index ac8cc41b..24215d48 100644
--- a/tests/specs/issue_fix/132_create_migration_for_drop_table/132_create_migration_for_drop_table.yaml
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/132_create_migration_for_drop_table.yaml
@@ -3,9 +3,9 @@ info:
   version: 1.0.0
   title: 132_create_migration_for_drop_table \#132
 
-x-deleted-schemas:  # don't use x-keep-table, x-delete-tables
-  - Fruit # itt_fruits
-  - Mango: the_mango # custom table name; `x-table`
+x-deleted-schemas:  # don't use x-keep-table, use x-deleted-schemas
+ - Fruit # table name evaluated to `itt_fruits`. `itt_` is prefix
+ - Mango: the_mango7 # custom table name; `x-table`
 
 paths:
   /:
@@ -18,7 +18,7 @@ paths:
 
 components:
   schemas:
-    Foo: # if you remove this entire schema and want to remove its table then you need to add its table name in `x-delete-tables`
+    Foo: # if you remove this entire schema and want to remove its table then you need to add its table name in `x-deleted-schemas`
       type: object
       description: 132_create_migration_for_drop_table
       required:

From 9d901c9fa5cb7a18e255d3d0da9bc87de50e3f20 Mon Sep 17 00:00:00 2001
From: Sohel Ahmed Mesaniya <sam.wankaner@gmail.com>
Date: Thu, 13 Jun 2024 16:40:37 +0530
Subject: [PATCH 10/71] Create delete file (migration) containing important DB
 statements for drop table

---
 src/db/ColumnSchema.php                       |  8 ----
 src/generator/ApiGenerator.php                |  2 +-
 src/lib/SchemaToDatabase.php                  | 31 ++++++++++++--
 src/lib/generators/MigrationsGenerator.php    | 40 +++++++++----------
 src/lib/items/Attribute.php                   |  4 +-
 src/lib/items/MigrationModel.php              | 17 +++++---
 src/lib/migrations/BaseMigrationBuilder.php   | 16 +++++++-
 .../132_create_migration_for_drop_table.yaml  |  2 +-
 8 files changed, 78 insertions(+), 42 deletions(-)

diff --git a/src/db/ColumnSchema.php b/src/db/ColumnSchema.php
index e8e8092b..71127a24 100644
--- a/src/db/ColumnSchema.php
+++ b/src/db/ColumnSchema.php
@@ -25,12 +25,4 @@ class ColumnSchema extends \yii\db\ColumnSchema
      * ```
      */
     public $xDbType;
-
-    public function toAttribute(): \cebe\yii2openapi\lib\items\Attribute
-    {
-        return new Attribute('id', [
-            'phpType' => 'int',
-            'dbType' => 'pk' // TODO resume from here
-        ]);
-    }
 }
diff --git a/src/generator/ApiGenerator.php b/src/generator/ApiGenerator.php
index 770aa9c6..0ea57fb1 100644
--- a/src/generator/ApiGenerator.php
+++ b/src/generator/ApiGenerator.php
@@ -486,7 +486,7 @@ public function generate(): array
         $modelsGenerator = Yii::createObject(ModelsGenerator::class, [$config, $models]);
         $files->merge($modelsGenerator->generate());
 
-        $migrationsGenerator = Yii::createObject(MigrationsGenerator::class, [$config, $models, Yii::$app->db/*, $tablesToDrop*/]);
+        $migrationsGenerator = Yii::createObject(MigrationsGenerator::class, [$config, $models, Yii::$app->db]);
         $files->merge($migrationsGenerator->generate());
 
         return $files->all();
diff --git a/src/lib/SchemaToDatabase.php b/src/lib/SchemaToDatabase.php
index 55147714..dd9eea3e 100644
--- a/src/lib/SchemaToDatabase.php
+++ b/src/lib/SchemaToDatabase.php
@@ -7,6 +7,7 @@
 
 namespace cebe\yii2openapi\lib;
 
+use cebe\yii2openapi\lib\items\Attribute;
 use cebe\yii2openapi\lib\items\DbModel;
 use cebe\yii2openapi\lib\items\JunctionSchemas;
 use cebe\yii2openapi\lib\items\MigrationModel;
@@ -113,7 +114,6 @@ public function prepareModels():array
         if (isset($this->config->getOpenApi()->{'x-deleted-schemas'})) {
             $tablesToDrop = $this->config->getOpenApi()->{'x-deleted-schemas'}; // for removed (components) schemas
             $modelsToDrop = static::f7($tablesToDrop);
-
         }
 
         return ArrayHelper::merge($models, $modelsToDrop);
@@ -271,10 +271,11 @@ public static function f7(array $schemasToDrop): array // TODO rename
                     'pkName' => $table->primaryKey[0],
                     'name' => $schemaName,
                     'tableName' => $tableName,
-                    'attributes' => [],
+                    'attributes' => static::attributesFromColumnSchemas($table->columns),
                     'drop' => true
                 ]);
-                $mm = new MigrationModel($dbModelHere);
+                $dbModelsToDrop[$key] = $dbModelHere;
+//                $mm = new MigrationModel($dbModelHere);
                 // $builder = new MigrationRecordBuilder($this->db->getSchema());
                 // $mm->addUpCode($builder->dropTable($tableName))
                 //     ->addDownCode($builder->dropTable($tableName))
@@ -294,4 +295,28 @@ public static function resolveTableNameHere(string $schemaName):string // TODO r
     {
         return Inflector::camel2id(StringHelper::basename(Inflector::pluralize($schemaName)), '_');
     }
+
+    /**
+     * @return Attribute[]
+     */
+    public static function attributesFromColumnSchemas(array $columnSchemas)
+    {
+        $attributes = [];
+        foreach ($columnSchemas as $columnName => $schema) {
+            /** @var $columnName string */
+            /** @var $schema \yii\db\ColumnSchema */
+            unset($attribute);
+            $attribute = new Attribute($schema->name, [
+                'phpType' => $schema->phpType,
+                'dbType' => $schema->dbType,
+                'nullable' => $schema->allowNull,
+                'size' => $schema->size,
+                // 'limits' => ['min' => null, 'max' => null, 'minLength' => null], // TODO
+                'primary' => $schema->isPrimaryKey,
+                'enumValues' => $schema->enumValues,
+            ]);
+            $attributes[] = $attribute;
+        }
+        return $attributes;
+    }
 }
diff --git a/src/lib/generators/MigrationsGenerator.php b/src/lib/generators/MigrationsGenerator.php
index 25e53dc3..c98980bb 100644
--- a/src/lib/generators/MigrationsGenerator.php
+++ b/src/lib/generators/MigrationsGenerator.php
@@ -149,26 +149,26 @@ public function buildMigrations():array
         }
 
         // for deleted schema, create migration for drop table
-        foreach ($this->tablesToDrop as $tableName) {
-            $table = Yii::$app->db->schema->getTableSchema($tableName);
-            if ($table) {
-
-                $dbModelHere = new DbModel([
-                    'pkName' => $table->primaryKey,
-                    'name' => $table->name,
-                    'tableName' => $tableName,
-                ]);
-                $mm = new MigrationModel($dbModelHere);
-                $builder = new MigrationRecordBuilder($this->db->getSchema());
-                $mm->addUpCode($builder->dropTable($tableName))
-                    ->addDownCode($builder->dropTable($tableName))
-                ;
-                if ($mm->notEmpty()) {
-//                    var_dump('$this->migrations'); die;
-                    $this->migrations[$tableName] = $mm;
-                }
-            }
-        }
+//        foreach ($this->tablesToDrop as $tableName) {
+//            $table = Yii::$app->db->schema->getTableSchema($tableName);
+//            if ($table) {
+//
+//                $dbModelHere = new DbModel([
+//                    'pkName' => $table->primaryKey,
+//                    'name' => $table->name,
+//                    'tableName' => $tableName,
+//                ]);
+//                $mm = new MigrationModel($dbModelHere);
+//                $builder = new MigrationRecordBuilder($this->db->getSchema());
+//                $mm->addUpCode($builder->dropTable($tableName))
+//                    ->addDownCode($builder->dropTable($tableName))
+//                ;
+//                if ($mm->notEmpty()) {
+////                    var_dump('$this->migrations'); die;
+//                    $this->migrations[$tableName] = $mm;
+//                }
+//            }
+//        }
 
         return !empty($this->migrations) ? $this->sortMigrationsByDeps() : [];
     }
diff --git a/src/lib/items/Attribute.php b/src/lib/items/Attribute.php
index 5563162d..f867b3f7 100644
--- a/src/lib/items/Attribute.php
+++ b/src/lib/items/Attribute.php
@@ -53,8 +53,8 @@ class Attribute extends BaseObject
     /**
      * @var string
      * Contains foreign key column name
-     * @example 'redelivery_of'
-     * See usage docs in README for more info
+     * @example 'redelivery_of' instead of 'redelivery_of_id'
+     * @see `x-fk-column-name` in README.md
      */
     public $fkColName;
 
diff --git a/src/lib/items/MigrationModel.php b/src/lib/items/MigrationModel.php
index 2f4bcdb6..7f5f6314 100644
--- a/src/lib/items/MigrationModel.php
+++ b/src/lib/items/MigrationModel.php
@@ -62,13 +62,18 @@ public function __construct(DbModel $model, bool $isFresh = true, ManyToManyRela
         $this->model = $model;
         $this->relation = $relation;
         if ($relation === null) {
-            $this->fileName = $isFresh
-                ? 'create_table_' . $model->tableName
-                : 'change_table_' . $model->tableName;
+            $this->fileName = $model->drop ?
+                'delete_table_' . $model->tableName :
+                    ($isFresh
+                        ? 'create_table_' . $model->tableName
+                        : 'change_table_' . $model->tableName);
         } else {
-            $this->fileName = $isFresh
-                ? 'create_table_' . $relation->viaTableName
-                : 'change_table_' . $relation->viaTableName;
+            $this->fileName =
+                $model->drop ?
+                    'delete_table_' . $relation->viaTableName :
+                    ($isFresh
+                    ? 'create_table_' . $relation->viaTableName
+                    : 'change_table_' . $relation->viaTableName);
         }
     }
 
diff --git a/src/lib/migrations/BaseMigrationBuilder.php b/src/lib/migrations/BaseMigrationBuilder.php
index 48572904..5920dd30 100644
--- a/src/lib/migrations/BaseMigrationBuilder.php
+++ b/src/lib/migrations/BaseMigrationBuilder.php
@@ -116,7 +116,6 @@ public function buildJunction(ManyToManyRelation $relation):MigrationModel
      */
     public function buildFresh():MigrationModel
     {
-//        var_dump('in 2'); die;
         $this->migration = Yii::createObject(MigrationModel::class, [$this->model, true, null, []]);
         $this->newColumns = $this->model->attributesToColumnSchema();
         if (empty($this->newColumns)) {
@@ -175,6 +174,7 @@ public function buildSecondary(?ManyToManyRelation $relation = null):MigrationMo
     {
         $this->migration = Yii::createObject(MigrationModel::class, [$this->model, false, $relation, []]);
         $this->newColumns = $relation->columnSchema ?? $this->model->attributesToColumnSchema();
+        $this->newColumns = $this->model->drop ? [] : $this->newColumns; // TODO refactor
         $wantNames = array_keys($this->newColumns);
         $haveNames = $this->tableSchema->columnNames;
         $columnsForCreate = array_map(
@@ -226,6 +226,8 @@ function (string $unknownColumn) {
             $this->buildRelations();
         }
 
+        $this->buildTablesDrop();
+
         return $this->migration;
     }
 
@@ -253,6 +255,9 @@ protected function buildColumnsCreation(array $columns):void
      */
     protected function buildColumnsDrop(array $columns):void
     {
+        if ($this->model->drop) {
+            return;
+        }
         foreach ($columns as $column) {
             $tableName = $this->model->getTableAlias();
             if ($column->isPrimaryKey && !$column->autoIncrement) {
@@ -580,4 +585,13 @@ public function modifyDesiredInContextOfDesiredFromDb(ColumnSchema $desired, Col
         }
         $desired->dbType = $desiredFromDb->dbType;
     }
+
+    public function buildTablesDrop(): void
+    {
+        if (!$this->model->drop) {
+            return;
+        }
+        $this->migration->addUpCode($this->recordBuilder->dropTable($this->model->tableName) )
+            ->addDownCode($this->recordBuilder->createTable($this->model->tableName, $this->model->attributesToColumnSchema()));
+    }
 }
diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/132_create_migration_for_drop_table.yaml b/tests/specs/issue_fix/132_create_migration_for_drop_table/132_create_migration_for_drop_table.yaml
index 24215d48..84edb4f3 100644
--- a/tests/specs/issue_fix/132_create_migration_for_drop_table/132_create_migration_for_drop_table.yaml
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/132_create_migration_for_drop_table.yaml
@@ -5,7 +5,7 @@ info:
 
 x-deleted-schemas:  # don't use x-keep-table, use x-deleted-schemas
  - Fruit # table name evaluated to `itt_fruits`. `itt_` is prefix
- - Mango: the_mango7 # custom table name; `x-table`
+# - Mango: the_mango7 # custom table name; `x-table`
 
 paths:
   /:

From 6427a61d90fc46e3583ab2e6c23e4e054f8b83e7 Mon Sep 17 00:00:00 2001
From: Sohel Ahmed Mesaniya <sam.wankaner@gmail.com>
Date: Thu, 13 Jun 2024 16:46:17 +0530
Subject: [PATCH 11/71] Cleanup

---
 README.md                                   |  1 -
 src/lib/generators/MigrationsGenerator.php  | 23 +++------------------
 src/lib/migrations/BaseMigrationBuilder.php |  9 +++-----
 3 files changed, 6 insertions(+), 27 deletions(-)

diff --git a/README.md b/README.md
index 25c774b0..3cfe6173 100644
--- a/README.md
+++ b/README.md
@@ -592,7 +592,6 @@ find the diff
 
 create drop table mig diff tables
 
-consider `x-keep-table`
 
 
 
diff --git a/src/lib/generators/MigrationsGenerator.php b/src/lib/generators/MigrationsGenerator.php
index c98980bb..cf977a20 100644
--- a/src/lib/generators/MigrationsGenerator.php
+++ b/src/lib/generators/MigrationsGenerator.php
@@ -53,9 +53,7 @@ class MigrationsGenerator
      **/
     protected $sorted;
 
-    public array $tablesToDrop = [];
-
-    public function __construct(Config $config, array $models, Connection $db, array $tablesToDrop = [])
+    public function __construct(Config $config, array $models, Connection $db)
     {
         $this->config = $config;
         $this->models = array_filter($models, static function ($model) {
@@ -63,7 +61,6 @@ public function __construct(Config $config, array $models, Connection $db, array
         });
         $this->files = new CodeFiles([]);
         $this->db = $db;
-        $this->tablesToDrop = $tablesToDrop;
     }
 
     /**
@@ -115,20 +112,6 @@ public function buildMigrations():array
     {
         $junctions = [];
 
-        // MySQL
-        // MariaDB TODO
-        // PgSQL TODO
-        // $sql='SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES';
-        // $tables = Yii::$app->db
-        //          ->createCommand($sql)
-        //          ->queryAll();
-        // var_dump($tables); die;
-
-
-        // foreach ($this->models as $model) {var_dump($model->tableAlias);}
-
-        // var_dump(array_keys($this->models)); die;
-
         foreach ($this->models as $model) {
             /** @var DbModel $model */
 
@@ -179,9 +162,9 @@ public function buildMigrations():array
     protected function createBuilder(DbModel $model):BaseMigrationBuilder
     {
         if ($this->db->getDriverName() === 'pgsql') {
-            return Yii::createObject(PostgresMigrationBuilder::class, [$this->db, $model, $this->tablesToDrop]);
+            return Yii::createObject(PostgresMigrationBuilder::class, [$this->db, $model]);
         }
-        return Yii::createObject(MysqlMigrationBuilder::class, [$this->db, $model, $this->tablesToDrop]);
+        return Yii::createObject(MysqlMigrationBuilder::class, [$this->db, $model]);
     }
 
     /**
diff --git a/src/lib/migrations/BaseMigrationBuilder.php b/src/lib/migrations/BaseMigrationBuilder.php
index 5920dd30..3031bb1b 100644
--- a/src/lib/migrations/BaseMigrationBuilder.php
+++ b/src/lib/migrations/BaseMigrationBuilder.php
@@ -52,8 +52,6 @@ abstract class BaseMigrationBuilder
      */
     protected $recordBuilder;
 
-    public ?array $tablesToDrop = null;
-
     /**
      * MigrationBuilder constructor.
      * @param \yii\db\Connection                  $db
@@ -61,13 +59,12 @@ abstract class BaseMigrationBuilder
      * @throws \yii\base\InvalidConfigException
      * @throws \yii\base\NotSupportedException
      */
-    public function __construct(Connection $db, DbModel $model, ?array $tablesToDrop = null)
+    public function __construct(Connection $db, DbModel $model)
     {
         $this->db = $db;
         $this->model = $model;
         $this->tableSchema = $db->getTableSchema($model->getTableAlias(), true);
         $this->recordBuilder = Yii::createObject(MigrationRecordBuilder::class, [$db->getSchema()]);
-        $this->tablesToDrop = $tablesToDrop;
     }
 
     /**
@@ -591,7 +588,7 @@ public function buildTablesDrop(): void
         if (!$this->model->drop) {
             return;
         }
-        $this->migration->addUpCode($this->recordBuilder->dropTable($this->model->tableName) )
-            ->addDownCode($this->recordBuilder->createTable($this->model->tableName, $this->model->attributesToColumnSchema()));
+        $this->migration->addUpCode($this->recordBuilder->dropTable($this->model->getTableAlias()) )
+            ->addDownCode($this->recordBuilder->createTable($this->model->getTableAlias(), $this->model->attributesToColumnSchema()));
     }
 }

From aa9ca7135c78c6fc36414e908ea08be3dcd871b9 Mon Sep 17 00:00:00 2001
From: Sohel Ahmed Mesaniya <sam.wankaner@gmail.com>
Date: Thu, 13 Jun 2024 16:46:44 +0530
Subject: [PATCH 12/71] Fix style

---
 src/lib/SchemaToDatabase.php                | 6 +++---
 src/lib/generators/MigrationsGenerator.php  | 2 +-
 src/lib/migrations/BaseMigrationBuilder.php | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/lib/SchemaToDatabase.php b/src/lib/SchemaToDatabase.php
index dd9eea3e..923a78e1 100644
--- a/src/lib/SchemaToDatabase.php
+++ b/src/lib/SchemaToDatabase.php
@@ -15,7 +15,9 @@
 use cebe\yii2openapi\lib\openapi\ComponentSchema;
 use Yii;
 use yii\base\Exception;
-use yii\helpers\{StringHelper, ArrayHelper, Inflector};
+use yii\helpers\StringHelper;
+use yii\helpers\ArrayHelper;
+use yii\helpers\Inflector;
 use function count;
 
 /**
@@ -285,10 +287,8 @@ public static function f7(array $schemasToDrop): array // TODO rename
                     // $this->migrations[$tableName] = $mm;
                 // }
             }
-
         }
         return $dbModelsToDrop;
-
     }
 
     public static function resolveTableNameHere(string $schemaName):string // TODO rename
diff --git a/src/lib/generators/MigrationsGenerator.php b/src/lib/generators/MigrationsGenerator.php
index cf977a20..ce60a083 100644
--- a/src/lib/generators/MigrationsGenerator.php
+++ b/src/lib/generators/MigrationsGenerator.php
@@ -147,7 +147,7 @@ public function buildMigrations():array
 //                    ->addDownCode($builder->dropTable($tableName))
 //                ;
 //                if ($mm->notEmpty()) {
-////                    var_dump('$this->migrations'); die;
+        ////                    var_dump('$this->migrations'); die;
 //                    $this->migrations[$tableName] = $mm;
 //                }
 //            }
diff --git a/src/lib/migrations/BaseMigrationBuilder.php b/src/lib/migrations/BaseMigrationBuilder.php
index 3031bb1b..965e55d2 100644
--- a/src/lib/migrations/BaseMigrationBuilder.php
+++ b/src/lib/migrations/BaseMigrationBuilder.php
@@ -588,7 +588,7 @@ public function buildTablesDrop(): void
         if (!$this->model->drop) {
             return;
         }
-        $this->migration->addUpCode($this->recordBuilder->dropTable($this->model->getTableAlias()) )
+        $this->migration->addUpCode($this->recordBuilder->dropTable($this->model->getTableAlias()))
             ->addDownCode($this->recordBuilder->createTable($this->model->getTableAlias(), $this->model->attributesToColumnSchema()));
     }
 }

From 46ef38706fef19025baf9fe5c83dedb1f91d4478 Mon Sep 17 00:00:00 2001
From: Sohel Ahmed Mesaniya <sam.wankaner@gmail.com>
Date: Thu, 13 Jun 2024 19:28:18 +0530
Subject: [PATCH 13/71] Generate foreign keys in migrations - WIP

---
 src/lib/SchemaToDatabase.php                  | 19 +++++++++---------
 src/lib/migrations/BaseMigrationBuilder.php   | 16 +++++++++++++--
 src/lib/migrations/MigrationRecordBuilder.php |  2 +-
 .../132_create_migration_for_drop_table.yaml  |  3 ++-
 tests/unit/IssueFixTest.php                   | 20 +++++++++++++------
 5 files changed, 40 insertions(+), 20 deletions(-)

diff --git a/src/lib/SchemaToDatabase.php b/src/lib/SchemaToDatabase.php
index 923a78e1..3ce339d2 100644
--- a/src/lib/SchemaToDatabase.php
+++ b/src/lib/SchemaToDatabase.php
@@ -283,7 +283,6 @@ public static function f7(array $schemasToDrop): array // TODO rename
                 //     ->addDownCode($builder->dropTable($tableName))
                 // ;
                 // if ($mm->notEmpty()) {
-                    // var_dump('$this->migrations'); die;
                     // $this->migrations[$tableName] = $mm;
                 // }
             }
@@ -302,18 +301,18 @@ public static function resolveTableNameHere(string $schemaName):string // TODO r
     public static function attributesFromColumnSchemas(array $columnSchemas)
     {
         $attributes = [];
-        foreach ($columnSchemas as $columnName => $schema) {
+        foreach ($columnSchemas as $columnName => $columnSchema) {
             /** @var $columnName string */
-            /** @var $schema \yii\db\ColumnSchema */
+            /** @var $columnSchema \yii\db\ColumnSchema */
             unset($attribute);
-            $attribute = new Attribute($schema->name, [
-                'phpType' => $schema->phpType,
-                'dbType' => $schema->dbType,
-                'nullable' => $schema->allowNull,
-                'size' => $schema->size,
+            $attribute = new Attribute($columnSchema->name, [
+                'phpType' => $columnSchema->phpType,
+                'dbType' => $columnSchema->dbType,
+                'nullable' => $columnSchema->allowNull,
+                'size' => $columnSchema->size,
                 // 'limits' => ['min' => null, 'max' => null, 'minLength' => null], // TODO
-                'primary' => $schema->isPrimaryKey,
-                'enumValues' => $schema->enumValues,
+                'primary' => $columnSchema->isPrimaryKey,
+                'enumValues' => $columnSchema->enumValues,
             ]);
             $attributes[] = $attribute;
         }
diff --git a/src/lib/migrations/BaseMigrationBuilder.php b/src/lib/migrations/BaseMigrationBuilder.php
index 965e55d2..78f8fd25 100644
--- a/src/lib/migrations/BaseMigrationBuilder.php
+++ b/src/lib/migrations/BaseMigrationBuilder.php
@@ -171,7 +171,9 @@ public function buildSecondary(?ManyToManyRelation $relation = null):MigrationMo
     {
         $this->migration = Yii::createObject(MigrationModel::class, [$this->model, false, $relation, []]);
         $this->newColumns = $relation->columnSchema ?? $this->model->attributesToColumnSchema();
-        $this->newColumns = $this->model->drop ? [] : $this->newColumns; // TODO refactor
+
+        $this->newColumns = $this->model->drop ? [] : $this->newColumns;
+
         $wantNames = array_keys($this->newColumns);
         $haveNames = $this->tableSchema->columnNames;
         $columnsForCreate = array_map(
@@ -588,7 +590,17 @@ public function buildTablesDrop(): void
         if (!$this->model->drop) {
             return;
         }
+
+        $this->migration->addDownCode($this->recordBuilder->addPrimaryKey($this->model->getTableAlias(), $this->tableSchema->primaryKey));
+
         $this->migration->addUpCode($this->recordBuilder->dropTable($this->model->getTableAlias()))
-            ->addDownCode($this->recordBuilder->createTable($this->model->getTableAlias(), $this->model->attributesToColumnSchema()));
+            ->addDownCode(
+                $this->recordBuilder->createTable(
+                    $this->model->getTableAlias(),
+//                    $this->model->attributesToColumnSchema()
+                    $this->tableSchema->columns
+                )
+            );
+
     }
 }
diff --git a/src/lib/migrations/MigrationRecordBuilder.php b/src/lib/migrations/MigrationRecordBuilder.php
index 98ee03b8..7229258b 100644
--- a/src/lib/migrations/MigrationRecordBuilder.php
+++ b/src/lib/migrations/MigrationRecordBuilder.php
@@ -66,7 +66,7 @@ public function createTable(string $tableAlias, array $columns):string
     {
         $codeColumns = [];
         foreach ($columns as $columnName => $cebeDbColumnSchema) {
-            if (is_string($cebeDbColumnSchema->xDbType) && !empty($cebeDbColumnSchema->xDbType)) {
+            if (!empty($cebeDbColumnSchema->xDbType) && is_string($cebeDbColumnSchema->xDbType)) {
                 $name = static::quote($columnName);
                 $codeColumns[] = $name.' '.$this->columnToCode($tableAlias, $cebeDbColumnSchema, false)->getCode();
             } else {
diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/132_create_migration_for_drop_table.yaml b/tests/specs/issue_fix/132_create_migration_for_drop_table/132_create_migration_for_drop_table.yaml
index 84edb4f3..f6cecd25 100644
--- a/tests/specs/issue_fix/132_create_migration_for_drop_table/132_create_migration_for_drop_table.yaml
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/132_create_migration_for_drop_table.yaml
@@ -4,7 +4,8 @@ info:
   title: 132_create_migration_for_drop_table \#132
 
 x-deleted-schemas:  # don't use x-keep-table, use x-deleted-schemas
- - Fruit # table name evaluated to `itt_fruits`. `itt_` is prefix
+# - Fruit # table name evaluated to `itt_fruits`. `itt_` is prefix
+ - Pristine
 # - Mango: the_mango7 # custom table name; `x-table`
 
 paths:
diff --git a/tests/unit/IssueFixTest.php b/tests/unit/IssueFixTest.php
index 44b3596b..35f3827e 100644
--- a/tests/unit/IssueFixTest.php
+++ b/tests/unit/IssueFixTest.php
@@ -279,15 +279,19 @@ public function testNullableFalseInRequired()
     // https://github.com/cebe/yii2-openapi/issues/132
     public function testCreateMigrationForDropTable132()
     {
+//        $this->changeDbToMariadb();
         $testFile = Yii::getAlias("@specs/issue_fix/132_create_migration_for_drop_table/132_create_migration_for_drop_table.php");
-        $this->deleteTablesForNoSyntaxError107();
-        $this->createTableForNoSyntaxError107();
+//        $this->deleteTablesForCreateMigrationForDropTable132();
+        $this->createTablesForCreateMigrationForDropTable132();
+//        sleep(3000);
         $this->runGenerator($testFile);
+//        $this->runActualMigrations('mysql', 3);
         // ... TODO
-        $this->deleteTables();
+        $this->deleteTablesForCreateMigrationForDropTable132();
+//        $this->deleteTables();
     }
 
-    private function createTableForCreateMigrationForDropTable132()
+    private function createTablesForCreateMigrationForDropTable132()
     {
         Yii::$app->db->createCommand()->createTable('{{%fruits}}', [
             'id' => 'pk',
@@ -295,14 +299,18 @@ private function createTableForCreateMigrationForDropTable132()
         ])->execute();
         Yii::$app->db->createCommand()->createTable('{{%pristines}}', [
             'id' => 'pk',
-            'name' => 'string(150)',
+            'name' => 'string(151)',
+            'fruit_id' => 'integer(11)', // FK
         ])->execute();
+        Yii::$app->db->createCommand()->addForeignKey('name', '{{%pristines}}', 'fruit_id', '{{%fruits}}', 'id')->execute();
     }
 
     private function deleteTablesForCreateMigrationForDropTable132()
     {
-        Yii::$app->db->createCommand('DROP TABLE IF EXISTS {{%fruits}}')->execute();
+        Yii::$app->db->createCommand()->dropForeignKey('name', '{{%pristines}}')->execute();
+//        Yii::$app->db->createCommand('')->execute();
         Yii::$app->db->createCommand('DROP TABLE IF EXISTS {{%pristines}}')->execute();
+        Yii::$app->db->createCommand('DROP TABLE IF EXISTS {{%fruits}}')->execute();
     }
 
     public function test162BugDollarrefWithXFaker()

From 67cc5a0eb54920595af1e26bb98653e5916a649e Mon Sep 17 00:00:00 2001
From: Sohel Ahmed Mesaniya <sam.wankaner@gmail.com>
Date: Wed, 19 Jun 2024 21:14:01 +0530
Subject: [PATCH 14/71] Create PK using Yii's in-built method

---
 src/lib/SchemaToDatabase.php                  | 22 +++++++++++++++++--
 src/lib/migrations/BaseMigrationBuilder.php   |  7 +++---
 .../132_create_migration_for_drop_table.yaml  |  4 ++--
 tests/unit/IssueFixTest.php                   |  2 +-
 4 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/src/lib/SchemaToDatabase.php b/src/lib/SchemaToDatabase.php
index 3ce339d2..4174cbd3 100644
--- a/src/lib/SchemaToDatabase.php
+++ b/src/lib/SchemaToDatabase.php
@@ -15,6 +15,7 @@
 use cebe\yii2openapi\lib\openapi\ComponentSchema;
 use Yii;
 use yii\base\Exception;
+use yii\db\Schema;
 use yii\helpers\StringHelper;
 use yii\helpers\ArrayHelper;
 use yii\helpers\Inflector;
@@ -306,14 +307,31 @@ public static function attributesFromColumnSchemas(array $columnSchemas)
             /** @var $columnSchema \yii\db\ColumnSchema */
             unset($attribute);
             $attribute = new Attribute($columnSchema->name, [
-                'phpType' => $columnSchema->phpType,
-                'dbType' => $columnSchema->dbType,
+                'phpType' => $columnSchema->phpType, // pk
+                'dbType' => $columnSchema->dbType, // pk
                 'nullable' => $columnSchema->allowNull,
                 'size' => $columnSchema->size,
                 // 'limits' => ['min' => null, 'max' => null, 'minLength' => null], // TODO
                 'primary' => $columnSchema->isPrimaryKey,
                 'enumValues' => $columnSchema->enumValues,
             ]);
+
+            // generate PK using `->primaryKeys()` or similar methods instead of separate SQL statement which sets only PK to a column of table
+            if ($columnSchema->phpType === 'integer' && $columnSchema->isPrimaryKey === true && $columnSchema->autoIncrement) {
+                if ($columnSchema->dbType === 'BIGINT' || $columnSchema->dbType === 'bigserial') {
+                    if ($columnSchema->unsigned) {
+                        $attribute->dbType = Schema::TYPE_UBIGPK;
+                    } else {
+                        $attribute->dbType = Schema::TYPE_BIGPK;
+                    }
+                } else {
+                    if ($columnSchema->unsigned) {
+                        $attribute->dbType = Schema::TYPE_UPK;
+                    } else {
+                        $attribute->dbType = Schema::TYPE_PK;
+                    }
+                }
+            }
             $attributes[] = $attribute;
         }
         return $attributes;
diff --git a/src/lib/migrations/BaseMigrationBuilder.php b/src/lib/migrations/BaseMigrationBuilder.php
index 78f8fd25..2889e78e 100644
--- a/src/lib/migrations/BaseMigrationBuilder.php
+++ b/src/lib/migrations/BaseMigrationBuilder.php
@@ -591,16 +591,15 @@ public function buildTablesDrop(): void
             return;
         }
 
-        $this->migration->addDownCode($this->recordBuilder->addPrimaryKey($this->model->getTableAlias(), $this->tableSchema->primaryKey));
+//        $this->migration->addDownCode($this->recordBuilder->addPrimaryKey($this->model->getTableAlias(), $this->tableSchema->primaryKey));
 
         $this->migration->addUpCode($this->recordBuilder->dropTable($this->model->getTableAlias()))
             ->addDownCode(
                 $this->recordBuilder->createTable(
                     $this->model->getTableAlias(),
-//                    $this->model->attributesToColumnSchema()
-                    $this->tableSchema->columns
+                    $this->model->attributesToColumnSchema()
+//                    $this->tableSchema->columns
                 )
             );
-
     }
 }
diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/132_create_migration_for_drop_table.yaml b/tests/specs/issue_fix/132_create_migration_for_drop_table/132_create_migration_for_drop_table.yaml
index f6cecd25..16ad3de0 100644
--- a/tests/specs/issue_fix/132_create_migration_for_drop_table/132_create_migration_for_drop_table.yaml
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/132_create_migration_for_drop_table.yaml
@@ -4,8 +4,8 @@ info:
   title: 132_create_migration_for_drop_table \#132
 
 x-deleted-schemas:  # don't use x-keep-table, use x-deleted-schemas
-# - Fruit # table name evaluated to `itt_fruits`. `itt_` is prefix
- - Pristine
+# - Pristine
+ - Fruit # table name evaluated to `itt_fruits`. `itt_` is prefix
 # - Mango: the_mango7 # custom table name; `x-table`
 
 paths:
diff --git a/tests/unit/IssueFixTest.php b/tests/unit/IssueFixTest.php
index 35f3827e..a3667771 100644
--- a/tests/unit/IssueFixTest.php
+++ b/tests/unit/IssueFixTest.php
@@ -66,7 +66,7 @@ private function deleteTables()
         $this->deleteTableForQuoteInAlterColumn();
         $this->deleteTableForTimestampIssue143();
         $this->deleteTablesForWrongMigrationForPgsqlForStringVarcharDatatype149();
-        $this->deleteTablesForCreateMigrationForDropTable132();
+//        $this->deleteTablesForCreateMigrationForDropTable132();
     }
 
     private function deleteTablesForFloatIssue()

From c205866cbd20833ca463d28a26e4b89cbe30335e Mon Sep 17 00:00:00 2001
From: Sohel Ahmed Mesaniya <sam.wankaner@gmail.com>
Date: Thu, 20 Jun 2024 20:36:41 +0530
Subject: [PATCH 15/71] Create PK using Yii's in-built method - more concrete

---
 src/lib/SchemaToDatabase.php                  | 70 +++++++++++--------
 .../132_create_migration_for_drop_table.yaml  |  2 +-
 tests/unit/IssueFixTest.php                   | 22 +++---
 3 files changed, 54 insertions(+), 40 deletions(-)

diff --git a/src/lib/SchemaToDatabase.php b/src/lib/SchemaToDatabase.php
index 4174cbd3..4bc51b38 100644
--- a/src/lib/SchemaToDatabase.php
+++ b/src/lib/SchemaToDatabase.php
@@ -7,18 +7,22 @@
 
 namespace cebe\yii2openapi\lib;
 
+use cebe\openapi\exceptions\IOException;
+use cebe\openapi\exceptions\TypeErrorException;
+use cebe\openapi\exceptions\UnresolvableReferenceException;
+use cebe\yii2openapi\lib\exceptions\InvalidDefinitionException;
 use cebe\yii2openapi\lib\items\Attribute;
 use cebe\yii2openapi\lib\items\DbModel;
 use cebe\yii2openapi\lib\items\JunctionSchemas;
-use cebe\yii2openapi\lib\items\MigrationModel;
-use cebe\yii2openapi\lib\migrations\MigrationRecordBuilder;
 use cebe\yii2openapi\lib\openapi\ComponentSchema;
 use Yii;
 use yii\base\Exception;
+use yii\base\InvalidConfigException;
+use yii\db\ColumnSchema;
 use yii\db\Schema;
-use yii\helpers\StringHelper;
 use yii\helpers\ArrayHelper;
 use yii\helpers\Inflector;
+use yii\helpers\StringHelper;
 use function count;
 
 /**
@@ -63,7 +67,7 @@
 class SchemaToDatabase
 {
     /**
-     * @var \cebe\yii2openapi\lib\Config
+     * @var Config
      */
     protected $config;
 
@@ -73,15 +77,15 @@ public function __construct(Config $config)
     }
 
     /**
-     * @return array|\cebe\yii2openapi\lib\items\DbModel[]
-     * @throws \cebe\openapi\exceptions\IOException
-     * @throws \cebe\openapi\exceptions\TypeErrorException
-     * @throws \cebe\openapi\exceptions\UnresolvableReferenceException
-     * @throws \cebe\yii2openapi\lib\exceptions\InvalidDefinitionException
-     * @throws \yii\base\Exception
-     * @throws \yii\base\InvalidConfigException
+     * @return array|DbModel[]
+     * @throws IOException
+     * @throws TypeErrorException
+     * @throws UnresolvableReferenceException
+     * @throws InvalidDefinitionException
+     * @throws Exception
+     * @throws InvalidConfigException
      */
-    public function prepareModels():array
+    public function prepareModels(): array
     {
         $models = [];
         $openApi = $this->config->getOpenApi();
@@ -95,12 +99,12 @@ public function prepareModels():array
             if ($junctions->isJunctionSchema($schemaName)) {
                 $schemaName = $junctions->trimPrefix($schemaName);
             }
-            /** @var \cebe\yii2openapi\lib\AttributeResolver $resolver */
+            /** @var AttributeResolver $resolver */
             $resolver = Yii::createObject(AttributeResolver::class, [$schemaName, $schema, $junctions, $this->config]);
             $models[$schemaName] = $resolver->resolve();
         }
 
-        foreach ($models as  $model) {
+        foreach ($models as $model) {
             foreach ($model->many2many as $relation) {
                 if (isset($models[$relation->viaModelName])) {
                     $relation->hasViaModel = true;
@@ -123,14 +127,14 @@ public function prepareModels():array
     }
 
     /**
-     * @return \cebe\yii2openapi\lib\items\JunctionSchemas
-     * @throws \cebe\openapi\exceptions\IOException
-     * @throws \cebe\openapi\exceptions\TypeErrorException
-     * @throws \cebe\openapi\exceptions\UnresolvableReferenceException
-     * @throws \yii\base\Exception
-     * @throws \yii\base\InvalidConfigException
+     * @return JunctionSchemas
+     * @throws IOException
+     * @throws TypeErrorException
+     * @throws UnresolvableReferenceException
+     * @throws Exception
+     * @throws InvalidConfigException
      */
-    public function findJunctionSchemas():JunctionSchemas
+    public function findJunctionSchemas(): JunctionSchemas
     {
         $junctions = [];
         $openApi = $this->config->getOpenApi();
@@ -210,7 +214,7 @@ public function findJunctionSchemas():JunctionSchemas
         return Yii::createObject(JunctionSchemas::class, [$junctions]);
     }
 
-    private function canGenerateModel(string $schemaName, ComponentSchema $schema):bool
+    private function canGenerateModel(string $schemaName, ComponentSchema $schema): bool
     {
         // only generate tables for schemas of type object and those who have defined properties
         if ($schema->isObjectSchema() && !$schema->hasProperties()) {
@@ -240,7 +244,7 @@ private function canGenerateModel(string $schemaName, ComponentSchema $schema):b
     }
 
     /**
-     * @param array $schemasToDrop. Example:
+     * @param array $schemasToDrop . Example:
      * ```
      * array(2) {
      * [0]=>
@@ -278,20 +282,21 @@ public static function f7(array $schemasToDrop): array // TODO rename
                     'drop' => true
                 ]);
                 $dbModelsToDrop[$key] = $dbModelHere;
+                // TODO
 //                $mm = new MigrationModel($dbModelHere);
                 // $builder = new MigrationRecordBuilder($this->db->getSchema());
                 // $mm->addUpCode($builder->dropTable($tableName))
                 //     ->addDownCode($builder->dropTable($tableName))
                 // ;
                 // if ($mm->notEmpty()) {
-                    // $this->migrations[$tableName] = $mm;
+                // $this->migrations[$tableName] = $mm;
                 // }
             }
         }
         return $dbModelsToDrop;
     }
 
-    public static function resolveTableNameHere(string $schemaName):string // TODO rename
+    public static function resolveTableNameHere(string $schemaName): string // TODO rename
     {
         return Inflector::camel2id(StringHelper::basename(Inflector::pluralize($schemaName)), '_');
     }
@@ -304,7 +309,7 @@ public static function attributesFromColumnSchemas(array $columnSchemas)
         $attributes = [];
         foreach ($columnSchemas as $columnName => $columnSchema) {
             /** @var $columnName string */
-            /** @var $columnSchema \yii\db\ColumnSchema */
+            /** @var $columnSchema ColumnSchema */
             unset($attribute);
             $attribute = new Attribute($columnSchema->name, [
                 'phpType' => $columnSchema->phpType, // pk
@@ -317,8 +322,16 @@ public static function attributesFromColumnSchemas(array $columnSchemas)
             ]);
 
             // generate PK using `->primaryKeys()` or similar methods instead of separate SQL statement which sets only PK to a column of table
-            if ($columnSchema->phpType === 'integer' && $columnSchema->isPrimaryKey === true && $columnSchema->autoIncrement) {
-                if ($columnSchema->dbType === 'BIGINT' || $columnSchema->dbType === 'bigserial') {
+            // https://github.com/cebe/yii2-openapi/issues/132
+            if (in_array($columnSchema->phpType, [
+                    'integer',
+                    'string' # https://github.com/yiisoft/yii2/issues/14663
+                ])
+                && $columnSchema->isPrimaryKey === true && $columnSchema->autoIncrement
+            ) {
+                if (stripos($columnSchema->dbType, 'BIGINT') !== false # MySQL, MariaDB
+                    || stripos($columnSchema->dbType, 'bigserial') !== false # PgSQL
+                ) {
                     if ($columnSchema->unsigned) {
                         $attribute->dbType = Schema::TYPE_UBIGPK;
                     } else {
@@ -332,6 +345,7 @@ public static function attributesFromColumnSchemas(array $columnSchemas)
                     }
                 }
             }
+
             $attributes[] = $attribute;
         }
         return $attributes;
diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/132_create_migration_for_drop_table.yaml b/tests/specs/issue_fix/132_create_migration_for_drop_table/132_create_migration_for_drop_table.yaml
index 16ad3de0..ab6fc8a3 100644
--- a/tests/specs/issue_fix/132_create_migration_for_drop_table/132_create_migration_for_drop_table.yaml
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/132_create_migration_for_drop_table.yaml
@@ -4,7 +4,7 @@ info:
   title: 132_create_migration_for_drop_table \#132
 
 x-deleted-schemas:  # don't use x-keep-table, use x-deleted-schemas
-# - Pristine
+ - Pristine
  - Fruit # table name evaluated to `itt_fruits`. `itt_` is prefix
 # - Mango: the_mango7 # custom table name; `x-table`
 
diff --git a/tests/unit/IssueFixTest.php b/tests/unit/IssueFixTest.php
index a3667771..b98684c3 100644
--- a/tests/unit/IssueFixTest.php
+++ b/tests/unit/IssueFixTest.php
@@ -277,30 +277,31 @@ public function testNullableFalseInRequired()
 
     // Create migration for drop table if a entire schema is deleted from OpenAPI spec #132
     // https://github.com/cebe/yii2-openapi/issues/132
-    public function testCreateMigrationForDropTable132()
-    {
+   public function testCreateMigrationForDropTable132()
+   {
 //        $this->changeDbToMariadb();
-        $testFile = Yii::getAlias("@specs/issue_fix/132_create_migration_for_drop_table/132_create_migration_for_drop_table.php");
+       $testFile = Yii::getAlias("@specs/issue_fix/132_create_migration_for_drop_table/132_create_migration_for_drop_table.php");
 //        $this->deleteTablesForCreateMigrationForDropTable132();
-        $this->createTablesForCreateMigrationForDropTable132();
+       $this->createTablesForCreateMigrationForDropTable132();
 //        sleep(3000);
-        $this->runGenerator($testFile);
+       $this->runGenerator($testFile);
 //        $this->runActualMigrations('mysql', 3);
-        // ... TODO
-        $this->deleteTablesForCreateMigrationForDropTable132();
+       // ... TODO
+       $this->deleteTablesForCreateMigrationForDropTable132();
 //        $this->deleteTables();
-    }
+   }
 
     private function createTablesForCreateMigrationForDropTable132()
     {
         Yii::$app->db->createCommand()->createTable('{{%fruits}}', [
-            'id' => 'pk',
+            'id' => 'ubigpk',
             'name' => 'string(150)',
         ])->execute();
         Yii::$app->db->createCommand()->createTable('{{%pristines}}', [
             'id' => 'pk',
             'name' => 'string(151)',
-            'fruit_id' => 'integer(11)', // FK
+             'fruit_id' => 'bigint unsigned', // FK
+//            'fruit_id' => $this->integer()->unsigned(), // FK
         ])->execute();
         Yii::$app->db->createCommand()->addForeignKey('name', '{{%pristines}}', 'fruit_id', '{{%fruits}}', 'id')->execute();
     }
@@ -308,7 +309,6 @@ private function createTablesForCreateMigrationForDropTable132()
     private function deleteTablesForCreateMigrationForDropTable132()
     {
         Yii::$app->db->createCommand()->dropForeignKey('name', '{{%pristines}}')->execute();
-//        Yii::$app->db->createCommand('')->execute();
         Yii::$app->db->createCommand('DROP TABLE IF EXISTS {{%pristines}}')->execute();
         Yii::$app->db->createCommand('DROP TABLE IF EXISTS {{%fruits}}')->execute();
     }

From 2d10ff497ce984c264cfe5b295e31420339675ee Mon Sep 17 00:00:00 2001
From: Sohel Ahmed Mesaniya <sam.wankaner@gmail.com>
Date: Fri, 21 Jun 2024 19:00:03 +0530
Subject: [PATCH 16/71] Fix
 https://github.com/php-openapi/yii2-openapi/issues/2

---
 src/lib/migrations/BaseMigrationBuilder.php                 | 6 +++---
 .../m200000_000005_change_table_v2_comments.php             | 4 ++--
 .../m200000_000005_change_table_v2_comments.php             | 4 ++--
 .../m200000_000005_change_table_v2_comments.php             | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/lib/migrations/BaseMigrationBuilder.php b/src/lib/migrations/BaseMigrationBuilder.php
index 2889e78e..632f48a8 100644
--- a/src/lib/migrations/BaseMigrationBuilder.php
+++ b/src/lib/migrations/BaseMigrationBuilder.php
@@ -334,9 +334,9 @@ protected function buildRelations():void
         $tableAlias = $this->model->getTableAlias();
         $existedRelations = [];
         foreach ($this->tableSchema->foreignKeys as $fkName => $relation) {
-            $refTable = $this->unPrefixTableName(array_shift($relation));
-            $refCol = array_keys($relation)[0];
-            $fkCol = $relation[$refCol];
+            $refTable = array_shift($relation);
+            $fkCol = array_keys($relation)[0];
+            $refCol = $relation[$fkCol];
             $existedRelations[$fkName] = ['refTable' => $refTable, 'refCol' => $refCol, 'fkCol' => $fkCol];
         }
 
diff --git a/tests/specs/blog_v2/migrations_maria_db/m200000_000005_change_table_v2_comments.php b/tests/specs/blog_v2/migrations_maria_db/m200000_000005_change_table_v2_comments.php
index 75553729..ee11067f 100644
--- a/tests/specs/blog_v2/migrations_maria_db/m200000_000005_change_table_v2_comments.php
+++ b/tests/specs/blog_v2/migrations_maria_db/m200000_000005_change_table_v2_comments.php
@@ -27,7 +27,7 @@ public function down()
         $this->alterColumn('{{%v2_comments}}', 'message', 'json NOT NULL DEFAULT \'[]\'');
         $this->addColumn('{{%v2_comments}}', 'author_id', $this->integer(11)->notNull());
         $this->dropColumn('{{%v2_comments}}', 'user_id');
-        $this->addForeignKey('fk_v2_comments_author_id_v2_users_id', '{{%v2_comments}}', 'id', 'v2_users', 'author_id');
-        $this->addForeignKey('fk_v2_comments_post_id_v2_posts_uid', '{{%v2_comments}}', 'uid', 'v2_posts', 'post_id');
+        $this->addForeignKey('fk_v2_comments_author_id_v2_users_id', '{{%v2_comments}}', 'author_id', 'itt_v2_users', 'id');
+        $this->addForeignKey('fk_v2_comments_post_id_v2_posts_uid', '{{%v2_comments}}', 'post_id', 'itt_v2_posts', 'uid');
     }
 }
diff --git a/tests/specs/blog_v2/migrations_mysql_db/m200000_000005_change_table_v2_comments.php b/tests/specs/blog_v2/migrations_mysql_db/m200000_000005_change_table_v2_comments.php
index 5861542c..475a2639 100644
--- a/tests/specs/blog_v2/migrations_mysql_db/m200000_000005_change_table_v2_comments.php
+++ b/tests/specs/blog_v2/migrations_mysql_db/m200000_000005_change_table_v2_comments.php
@@ -27,7 +27,7 @@ public function down()
         $this->alterColumn('{{%v2_comments}}', 'message', 'json NOT NULL');
         $this->addColumn('{{%v2_comments}}', 'author_id', $this->integer()->notNull());
         $this->dropColumn('{{%v2_comments}}', 'user_id');
-        $this->addForeignKey('fk_v2_comments_author_id_v2_users_id', '{{%v2_comments}}', 'id', 'v2_users', 'author_id');
-        $this->addForeignKey('fk_v2_comments_post_id_v2_posts_uid', '{{%v2_comments}}', 'uid', 'v2_posts', 'post_id');
+        $this->addForeignKey('fk_v2_comments_author_id_v2_users_id', '{{%v2_comments}}', 'author_id', 'itt_v2_users', 'id');
+        $this->addForeignKey('fk_v2_comments_post_id_v2_posts_uid', '{{%v2_comments}}', 'post_id', 'itt_v2_posts', 'uid');
     }
 }
diff --git a/tests/specs/blog_v2/migrations_pgsql_db/m200000_000005_change_table_v2_comments.php b/tests/specs/blog_v2/migrations_pgsql_db/m200000_000005_change_table_v2_comments.php
index 99a896c6..efbb21be 100644
--- a/tests/specs/blog_v2/migrations_pgsql_db/m200000_000005_change_table_v2_comments.php
+++ b/tests/specs/blog_v2/migrations_pgsql_db/m200000_000005_change_table_v2_comments.php
@@ -33,7 +33,7 @@ public function safeDown()
         $this->alterColumn('{{%v2_comments}}', 'message', "SET DEFAULT '[]'");
         $this->alterColumn('{{%v2_comments}}', 'meta_data', "SET NOT NULL");
         $this->alterColumn('{{%v2_comments}}', 'meta_data', "SET DEFAULT '[]'");
-        $this->addForeignKey('fk_v2_comments_post_id_v2_posts_uid', '{{%v2_comments}}', 'uid', 'v2_posts', 'post_id');
-        $this->addForeignKey('fk_v2_comments_author_id_v2_users_id', '{{%v2_comments}}', 'id', 'v2_users', 'author_id');
+        $this->addForeignKey('fk_v2_comments_post_id_v2_posts_uid', '{{%v2_comments}}', 'post_id', 'itt_v2_posts', 'uid');
+        $this->addForeignKey('fk_v2_comments_author_id_v2_users_id', '{{%v2_comments}}', 'author_id', 'itt_v2_users', 'id');
     }
 }

From 6644d155f48e582de6a4e188395792d1a358dde1 Mon Sep 17 00:00:00 2001
From: Sohel Ahmed Mesaniya <sam.wankaner@gmail.com>
Date: Fri, 21 Jun 2024 19:38:09 +0530
Subject: [PATCH 17/71] Cleanup

---
 src/lib/generators/MigrationsGenerator.php                      | 2 +-
 .../132_create_migration_for_drop_table.yaml                    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/lib/generators/MigrationsGenerator.php b/src/lib/generators/MigrationsGenerator.php
index ce60a083..80979687 100644
--- a/src/lib/generators/MigrationsGenerator.php
+++ b/src/lib/generators/MigrationsGenerator.php
@@ -198,7 +198,7 @@ protected function sortByDependencyRecurse(MigrationModel $migration):void
                 //echo "adding dep $dependency\n";
                 $this->sortByDependencyRecurse($this->migrations[$dependency]);
             }
-            unset($this->sorted[$migration->tableAlias]);//necessary for provide valid order
+            unset($this->sorted[$migration->tableAlias]); // necessary for provide valid order
             $this->sorted[$migration->tableAlias] = $migration;
         } elseif ($this->sorted[$migration->tableAlias] === false) {
             throw new Exception("A circular dependency is detected for table '{$migration->tableAlias}'.");
diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/132_create_migration_for_drop_table.yaml b/tests/specs/issue_fix/132_create_migration_for_drop_table/132_create_migration_for_drop_table.yaml
index ab6fc8a3..d88a1ffc 100644
--- a/tests/specs/issue_fix/132_create_migration_for_drop_table/132_create_migration_for_drop_table.yaml
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/132_create_migration_for_drop_table.yaml
@@ -7,6 +7,7 @@ x-deleted-schemas:  # don't use x-keep-table, use x-deleted-schemas
  - Pristine
  - Fruit # table name evaluated to `itt_fruits`. `itt_` is prefix
 # - Mango: the_mango7 # custom table name; `x-table`
+# - Upk
 
 paths:
   /:

From d45f911e41dc774727e0043527b63d6f8121f59f Mon Sep 17 00:00:00 2001
From: Sohel Ahmed Mesaniya <sam.wankaner@gmail.com>
Date: Fri, 21 Jun 2024 19:38:50 +0530
Subject: [PATCH 18/71] Test cleanup

---
 tests/unit/IssueFixTest.php | 35 +++++++++++++++++++----------------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/tests/unit/IssueFixTest.php b/tests/unit/IssueFixTest.php
index b98684c3..f9d0ae92 100644
--- a/tests/unit/IssueFixTest.php
+++ b/tests/unit/IssueFixTest.php
@@ -277,31 +277,33 @@ public function testNullableFalseInRequired()
 
     // Create migration for drop table if a entire schema is deleted from OpenAPI spec #132
     // https://github.com/cebe/yii2-openapi/issues/132
-   public function testCreateMigrationForDropTable132()
-   {
-//        $this->changeDbToMariadb();
-       $testFile = Yii::getAlias("@specs/issue_fix/132_create_migration_for_drop_table/132_create_migration_for_drop_table.php");
-//        $this->deleteTablesForCreateMigrationForDropTable132();
-       $this->createTablesForCreateMigrationForDropTable132();
-//        sleep(3000);
-       $this->runGenerator($testFile);
-//        $this->runActualMigrations('mysql', 3);
-       // ... TODO
-       $this->deleteTablesForCreateMigrationForDropTable132();
-//        $this->deleteTables();
-   }
+    public function testCreateMigrationForDropTable132()
+    {
+        $testFile = Yii::getAlias("@specs/issue_fix/132_create_migration_for_drop_table/132_create_migration_for_drop_table.php");
+        // $this->deleteTablesForCreateMigrationForDropTable132();
+        $this->createTablesForCreateMigrationForDropTable132();
+        $this->runGenerator($testFile);
+        $this->runActualMigrations('mysql', 3);
+        // ... TODO compare files
+        $this->deleteTablesForCreateMigrationForDropTable132();
+        // $this->deleteTables();
+    }
 
     private function createTablesForCreateMigrationForDropTable132()
     {
+//        Yii::$app->db->createCommand()->createTable('{{%upks}}', [
+//            'id' => 'upk',
+//            'name' => 'string(150)',
+//        ])->execute();
+
         Yii::$app->db->createCommand()->createTable('{{%fruits}}', [
-            'id' => 'ubigpk',
+            'id' => 'pk',
             'name' => 'string(150)',
         ])->execute();
         Yii::$app->db->createCommand()->createTable('{{%pristines}}', [
             'id' => 'pk',
             'name' => 'string(151)',
-             'fruit_id' => 'bigint unsigned', // FK
-//            'fruit_id' => $this->integer()->unsigned(), // FK
+            'fruit_id' => 'int', // FK
         ])->execute();
         Yii::$app->db->createCommand()->addForeignKey('name', '{{%pristines}}', 'fruit_id', '{{%fruits}}', 'id')->execute();
     }
@@ -311,6 +313,7 @@ private function deleteTablesForCreateMigrationForDropTable132()
         Yii::$app->db->createCommand()->dropForeignKey('name', '{{%pristines}}')->execute();
         Yii::$app->db->createCommand('DROP TABLE IF EXISTS {{%pristines}}')->execute();
         Yii::$app->db->createCommand('DROP TABLE IF EXISTS {{%fruits}}')->execute();
+        Yii::$app->db->createCommand('DROP TABLE IF EXISTS {{%upks}}')->execute();
     }
 
     public function test162BugDollarrefWithXFaker()

From 7cf9aa3ce0c10e867403531b248f6ba1b65ed173 Mon Sep 17 00:00:00 2001
From: Sohel Ahmed Mesaniya <sam.wankaner@gmail.com>
Date: Fri, 21 Jun 2024 19:56:12 +0530
Subject: [PATCH 19/71] Fix issue of migration ordering in drop + fix failing
 tests

---
 src/lib/generators/MigrationsGenerator.php                      | 2 +-
 ..._pristines.php => m200000_000000_create_table_pristines.php} | 2 +-
 ...types.php => m200000_000001_create_table_alldbdatatypes.php} | 2 +-
 ...tcolumns.php => m200000_000003_change_table_editcolumns.php} | 2 +-
 ..._pristines.php => m200000_000000_create_table_pristines.php} | 2 +-
 ...types.php => m200000_000001_create_table_alldbdatatypes.php} | 2 +-
 ...tcolumns.php => m200000_000003_change_table_editcolumns.php} | 2 +-
 ..._pristines.php => m200000_000000_create_table_pristines.php} | 2 +-
 ...types.php => m200000_000001_create_table_alldbdatatypes.php} | 2 +-
 ...tcolumns.php => m200000_000003_change_table_editcolumns.php} | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)
 rename tests/specs/x_db_type/edit_column/maria/app/migrations_maria_db/{m200000_000003_create_table_pristines.php => m200000_000000_create_table_pristines.php} (93%)
 rename tests/specs/x_db_type/edit_column/maria/app/migrations_maria_db/{m200000_000000_create_table_alldbdatatypes.php => m200000_000001_create_table_alldbdatatypes.php} (97%)
 rename tests/specs/x_db_type/edit_column/maria/app/migrations_maria_db/{m200000_000001_change_table_editcolumns.php => m200000_000003_change_table_editcolumns.php} (97%)
 rename tests/specs/x_db_type/edit_column/mysql/app/migrations_mysql_db/{m200000_000003_create_table_pristines.php => m200000_000000_create_table_pristines.php} (93%)
 rename tests/specs/x_db_type/edit_column/mysql/app/migrations_mysql_db/{m200000_000000_create_table_alldbdatatypes.php => m200000_000001_create_table_alldbdatatypes.php} (97%)
 rename tests/specs/x_db_type/edit_column/mysql/app/migrations_mysql_db/{m200000_000001_change_table_editcolumns.php => m200000_000003_change_table_editcolumns.php} (97%)
 rename tests/specs/x_db_type/edit_column/pgsql/app/migrations_pgsql_db/{m200000_000003_create_table_pristines.php => m200000_000000_create_table_pristines.php} (93%)
 rename tests/specs/x_db_type/edit_column/pgsql/app/migrations_pgsql_db/{m200000_000000_create_table_alldbdatatypes.php => m200000_000001_create_table_alldbdatatypes.php} (98%)
 rename tests/specs/x_db_type/edit_column/pgsql/app/migrations_pgsql_db/{m200000_000001_change_table_editcolumns.php => m200000_000003_change_table_editcolumns.php} (98%)

diff --git a/src/lib/generators/MigrationsGenerator.php b/src/lib/generators/MigrationsGenerator.php
index 80979687..ee161588 100644
--- a/src/lib/generators/MigrationsGenerator.php
+++ b/src/lib/generators/MigrationsGenerator.php
@@ -174,7 +174,7 @@ protected function createBuilder(DbModel $model):BaseMigrationBuilder
     protected function sortMigrationsByDeps():array
     {
         $this->sorted = [];
-        ksort($this->migrations);
+//        ksort($this->migrations);
         foreach ($this->migrations as $migration) {
             //echo "adding {$migration->tableAlias}\n";
             $this->sortByDependencyRecurse($migration);
diff --git a/tests/specs/x_db_type/edit_column/maria/app/migrations_maria_db/m200000_000003_create_table_pristines.php b/tests/specs/x_db_type/edit_column/maria/app/migrations_maria_db/m200000_000000_create_table_pristines.php
similarity index 93%
rename from tests/specs/x_db_type/edit_column/maria/app/migrations_maria_db/m200000_000003_create_table_pristines.php
rename to tests/specs/x_db_type/edit_column/maria/app/migrations_maria_db/m200000_000000_create_table_pristines.php
index 1e27d8d6..d1594797 100644
--- a/tests/specs/x_db_type/edit_column/maria/app/migrations_maria_db/m200000_000003_create_table_pristines.php
+++ b/tests/specs/x_db_type/edit_column/maria/app/migrations_maria_db/m200000_000000_create_table_pristines.php
@@ -3,7 +3,7 @@
 /**
  * Table for Pristine
  */
-class m200000_000003_create_table_pristines extends \yii\db\Migration
+class m200000_000000_create_table_pristines extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/x_db_type/edit_column/maria/app/migrations_maria_db/m200000_000000_create_table_alldbdatatypes.php b/tests/specs/x_db_type/edit_column/maria/app/migrations_maria_db/m200000_000001_create_table_alldbdatatypes.php
similarity index 97%
rename from tests/specs/x_db_type/edit_column/maria/app/migrations_maria_db/m200000_000000_create_table_alldbdatatypes.php
rename to tests/specs/x_db_type/edit_column/maria/app/migrations_maria_db/m200000_000001_create_table_alldbdatatypes.php
index 9c002bea..350eedaf 100644
--- a/tests/specs/x_db_type/edit_column/maria/app/migrations_maria_db/m200000_000000_create_table_alldbdatatypes.php
+++ b/tests/specs/x_db_type/edit_column/maria/app/migrations_maria_db/m200000_000001_create_table_alldbdatatypes.php
@@ -3,7 +3,7 @@
 /**
  * Table for Alldbdatatype
  */
-class m200000_000000_create_table_alldbdatatypes extends \yii\db\Migration
+class m200000_000001_create_table_alldbdatatypes extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/x_db_type/edit_column/maria/app/migrations_maria_db/m200000_000001_change_table_editcolumns.php b/tests/specs/x_db_type/edit_column/maria/app/migrations_maria_db/m200000_000003_change_table_editcolumns.php
similarity index 97%
rename from tests/specs/x_db_type/edit_column/maria/app/migrations_maria_db/m200000_000001_change_table_editcolumns.php
rename to tests/specs/x_db_type/edit_column/maria/app/migrations_maria_db/m200000_000003_change_table_editcolumns.php
index 239c0a9b..3b9581c0 100644
--- a/tests/specs/x_db_type/edit_column/maria/app/migrations_maria_db/m200000_000001_change_table_editcolumns.php
+++ b/tests/specs/x_db_type/edit_column/maria/app/migrations_maria_db/m200000_000003_change_table_editcolumns.php
@@ -3,7 +3,7 @@
 /**
  * Table for Editcolumn
  */
-class m200000_000001_change_table_editcolumns extends \yii\db\Migration
+class m200000_000003_change_table_editcolumns extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/x_db_type/edit_column/mysql/app/migrations_mysql_db/m200000_000003_create_table_pristines.php b/tests/specs/x_db_type/edit_column/mysql/app/migrations_mysql_db/m200000_000000_create_table_pristines.php
similarity index 93%
rename from tests/specs/x_db_type/edit_column/mysql/app/migrations_mysql_db/m200000_000003_create_table_pristines.php
rename to tests/specs/x_db_type/edit_column/mysql/app/migrations_mysql_db/m200000_000000_create_table_pristines.php
index 3e9e8e02..ab96f730 100644
--- a/tests/specs/x_db_type/edit_column/mysql/app/migrations_mysql_db/m200000_000003_create_table_pristines.php
+++ b/tests/specs/x_db_type/edit_column/mysql/app/migrations_mysql_db/m200000_000000_create_table_pristines.php
@@ -3,7 +3,7 @@
 /**
  * Table for Pristine
  */
-class m200000_000003_create_table_pristines extends \yii\db\Migration
+class m200000_000000_create_table_pristines extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/x_db_type/edit_column/mysql/app/migrations_mysql_db/m200000_000000_create_table_alldbdatatypes.php b/tests/specs/x_db_type/edit_column/mysql/app/migrations_mysql_db/m200000_000001_create_table_alldbdatatypes.php
similarity index 97%
rename from tests/specs/x_db_type/edit_column/mysql/app/migrations_mysql_db/m200000_000000_create_table_alldbdatatypes.php
rename to tests/specs/x_db_type/edit_column/mysql/app/migrations_mysql_db/m200000_000001_create_table_alldbdatatypes.php
index 2cda660f..5f3d90d1 100644
--- a/tests/specs/x_db_type/edit_column/mysql/app/migrations_mysql_db/m200000_000000_create_table_alldbdatatypes.php
+++ b/tests/specs/x_db_type/edit_column/mysql/app/migrations_mysql_db/m200000_000001_create_table_alldbdatatypes.php
@@ -3,7 +3,7 @@
 /**
  * Table for Alldbdatatype
  */
-class m200000_000000_create_table_alldbdatatypes extends \yii\db\Migration
+class m200000_000001_create_table_alldbdatatypes extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/x_db_type/edit_column/mysql/app/migrations_mysql_db/m200000_000001_change_table_editcolumns.php b/tests/specs/x_db_type/edit_column/mysql/app/migrations_mysql_db/m200000_000003_change_table_editcolumns.php
similarity index 97%
rename from tests/specs/x_db_type/edit_column/mysql/app/migrations_mysql_db/m200000_000001_change_table_editcolumns.php
rename to tests/specs/x_db_type/edit_column/mysql/app/migrations_mysql_db/m200000_000003_change_table_editcolumns.php
index b4d63bd3..02626d1e 100644
--- a/tests/specs/x_db_type/edit_column/mysql/app/migrations_mysql_db/m200000_000001_change_table_editcolumns.php
+++ b/tests/specs/x_db_type/edit_column/mysql/app/migrations_mysql_db/m200000_000003_change_table_editcolumns.php
@@ -3,7 +3,7 @@
 /**
  * Table for Editcolumn
  */
-class m200000_000001_change_table_editcolumns extends \yii\db\Migration
+class m200000_000003_change_table_editcolumns extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/x_db_type/edit_column/pgsql/app/migrations_pgsql_db/m200000_000003_create_table_pristines.php b/tests/specs/x_db_type/edit_column/pgsql/app/migrations_pgsql_db/m200000_000000_create_table_pristines.php
similarity index 93%
rename from tests/specs/x_db_type/edit_column/pgsql/app/migrations_pgsql_db/m200000_000003_create_table_pristines.php
rename to tests/specs/x_db_type/edit_column/pgsql/app/migrations_pgsql_db/m200000_000000_create_table_pristines.php
index aab6bb88..93b55396 100644
--- a/tests/specs/x_db_type/edit_column/pgsql/app/migrations_pgsql_db/m200000_000003_create_table_pristines.php
+++ b/tests/specs/x_db_type/edit_column/pgsql/app/migrations_pgsql_db/m200000_000000_create_table_pristines.php
@@ -3,7 +3,7 @@
 /**
  * Table for Pristine
  */
-class m200000_000003_create_table_pristines extends \yii\db\Migration
+class m200000_000000_create_table_pristines extends \yii\db\Migration
 {
     public function safeUp()
     {
diff --git a/tests/specs/x_db_type/edit_column/pgsql/app/migrations_pgsql_db/m200000_000000_create_table_alldbdatatypes.php b/tests/specs/x_db_type/edit_column/pgsql/app/migrations_pgsql_db/m200000_000001_create_table_alldbdatatypes.php
similarity index 98%
rename from tests/specs/x_db_type/edit_column/pgsql/app/migrations_pgsql_db/m200000_000000_create_table_alldbdatatypes.php
rename to tests/specs/x_db_type/edit_column/pgsql/app/migrations_pgsql_db/m200000_000001_create_table_alldbdatatypes.php
index e0cac52a..7f8403d4 100644
--- a/tests/specs/x_db_type/edit_column/pgsql/app/migrations_pgsql_db/m200000_000000_create_table_alldbdatatypes.php
+++ b/tests/specs/x_db_type/edit_column/pgsql/app/migrations_pgsql_db/m200000_000001_create_table_alldbdatatypes.php
@@ -3,7 +3,7 @@
 /**
  * Table for Alldbdatatype
  */
-class m200000_000000_create_table_alldbdatatypes extends \yii\db\Migration
+class m200000_000001_create_table_alldbdatatypes extends \yii\db\Migration
 {
     public function safeUp()
     {
diff --git a/tests/specs/x_db_type/edit_column/pgsql/app/migrations_pgsql_db/m200000_000001_change_table_editcolumns.php b/tests/specs/x_db_type/edit_column/pgsql/app/migrations_pgsql_db/m200000_000003_change_table_editcolumns.php
similarity index 98%
rename from tests/specs/x_db_type/edit_column/pgsql/app/migrations_pgsql_db/m200000_000001_change_table_editcolumns.php
rename to tests/specs/x_db_type/edit_column/pgsql/app/migrations_pgsql_db/m200000_000003_change_table_editcolumns.php
index 5ad21a0a..da02d58f 100644
--- a/tests/specs/x_db_type/edit_column/pgsql/app/migrations_pgsql_db/m200000_000001_change_table_editcolumns.php
+++ b/tests/specs/x_db_type/edit_column/pgsql/app/migrations_pgsql_db/m200000_000003_change_table_editcolumns.php
@@ -3,7 +3,7 @@
 /**
  * Table for Editcolumn
  */
-class m200000_000001_change_table_editcolumns extends \yii\db\Migration
+class m200000_000003_change_table_editcolumns extends \yii\db\Migration
 {
     public function safeUp()
     {

From fbb2e8c02ac196464644ad06d2f8e4b4f4caaf66 Mon Sep 17 00:00:00 2001
From: Sohel Ahmed Mesaniya <sam.wankaner@gmail.com>
Date: Fri, 21 Jun 2024 19:58:51 +0530
Subject: [PATCH 20/71] Fix another failing tests

---
 ..._pristines.php => m200000_000000_create_table_pristines.php} | 2 +-
 ...types.php => m200000_000001_create_table_alldbdatatypes.php} | 2 +-
 ...tcolumns.php => m200000_000003_create_table_editcolumns.php} | 2 +-
 ..._pristines.php => m200000_000000_create_table_pristines.php} | 2 +-
 ...types.php => m200000_000001_create_table_alldbdatatypes.php} | 2 +-
 ...tcolumns.php => m200000_000003_create_table_editcolumns.php} | 2 +-
 ..._pristines.php => m200000_000000_create_table_pristines.php} | 2 +-
 ...types.php => m200000_000001_create_table_alldbdatatypes.php} | 2 +-
 ...tcolumns.php => m200000_000003_create_table_editcolumns.php} | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)
 rename tests/specs/x_db_type/new_column/maria/app/migrations_maria_db/{m200000_000003_create_table_pristines.php => m200000_000000_create_table_pristines.php} (93%)
 rename tests/specs/x_db_type/new_column/maria/app/migrations_maria_db/{m200000_000000_create_table_alldbdatatypes.php => m200000_000001_create_table_alldbdatatypes.php} (97%)
 rename tests/specs/x_db_type/new_column/maria/app/migrations_maria_db/{m200000_000001_create_table_editcolumns.php => m200000_000003_create_table_editcolumns.php} (93%)
 rename tests/specs/x_db_type/new_column/mysql/app/migrations_mysql_db/{m200000_000003_create_table_pristines.php => m200000_000000_create_table_pristines.php} (93%)
 rename tests/specs/x_db_type/new_column/mysql/app/migrations_mysql_db/{m200000_000000_create_table_alldbdatatypes.php => m200000_000001_create_table_alldbdatatypes.php} (97%)
 rename tests/specs/x_db_type/new_column/mysql/app/migrations_mysql_db/{m200000_000001_create_table_editcolumns.php => m200000_000003_create_table_editcolumns.php} (93%)
 rename tests/specs/x_db_type/new_column/pgsql/app/migrations_pgsql_db/{m200000_000003_create_table_pristines.php => m200000_000000_create_table_pristines.php} (93%)
 rename tests/specs/x_db_type/new_column/pgsql/app/migrations_pgsql_db/{m200000_000000_create_table_alldbdatatypes.php => m200000_000001_create_table_alldbdatatypes.php} (98%)
 rename tests/specs/x_db_type/new_column/pgsql/app/migrations_pgsql_db/{m200000_000001_create_table_editcolumns.php => m200000_000003_create_table_editcolumns.php} (94%)

diff --git a/tests/specs/x_db_type/new_column/maria/app/migrations_maria_db/m200000_000003_create_table_pristines.php b/tests/specs/x_db_type/new_column/maria/app/migrations_maria_db/m200000_000000_create_table_pristines.php
similarity index 93%
rename from tests/specs/x_db_type/new_column/maria/app/migrations_maria_db/m200000_000003_create_table_pristines.php
rename to tests/specs/x_db_type/new_column/maria/app/migrations_maria_db/m200000_000000_create_table_pristines.php
index 1e27d8d6..d1594797 100644
--- a/tests/specs/x_db_type/new_column/maria/app/migrations_maria_db/m200000_000003_create_table_pristines.php
+++ b/tests/specs/x_db_type/new_column/maria/app/migrations_maria_db/m200000_000000_create_table_pristines.php
@@ -3,7 +3,7 @@
 /**
  * Table for Pristine
  */
-class m200000_000003_create_table_pristines extends \yii\db\Migration
+class m200000_000000_create_table_pristines extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/x_db_type/new_column/maria/app/migrations_maria_db/m200000_000000_create_table_alldbdatatypes.php b/tests/specs/x_db_type/new_column/maria/app/migrations_maria_db/m200000_000001_create_table_alldbdatatypes.php
similarity index 97%
rename from tests/specs/x_db_type/new_column/maria/app/migrations_maria_db/m200000_000000_create_table_alldbdatatypes.php
rename to tests/specs/x_db_type/new_column/maria/app/migrations_maria_db/m200000_000001_create_table_alldbdatatypes.php
index 9c002bea..350eedaf 100644
--- a/tests/specs/x_db_type/new_column/maria/app/migrations_maria_db/m200000_000000_create_table_alldbdatatypes.php
+++ b/tests/specs/x_db_type/new_column/maria/app/migrations_maria_db/m200000_000001_create_table_alldbdatatypes.php
@@ -3,7 +3,7 @@
 /**
  * Table for Alldbdatatype
  */
-class m200000_000000_create_table_alldbdatatypes extends \yii\db\Migration
+class m200000_000001_create_table_alldbdatatypes extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/x_db_type/new_column/maria/app/migrations_maria_db/m200000_000001_create_table_editcolumns.php b/tests/specs/x_db_type/new_column/maria/app/migrations_maria_db/m200000_000003_create_table_editcolumns.php
similarity index 93%
rename from tests/specs/x_db_type/new_column/maria/app/migrations_maria_db/m200000_000001_create_table_editcolumns.php
rename to tests/specs/x_db_type/new_column/maria/app/migrations_maria_db/m200000_000003_create_table_editcolumns.php
index 1de3d8d5..1c4a0331 100644
--- a/tests/specs/x_db_type/new_column/maria/app/migrations_maria_db/m200000_000001_create_table_editcolumns.php
+++ b/tests/specs/x_db_type/new_column/maria/app/migrations_maria_db/m200000_000003_create_table_editcolumns.php
@@ -3,7 +3,7 @@
 /**
  * Table for Editcolumn
  */
-class m200000_000001_create_table_editcolumns extends \yii\db\Migration
+class m200000_000003_create_table_editcolumns extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/x_db_type/new_column/mysql/app/migrations_mysql_db/m200000_000003_create_table_pristines.php b/tests/specs/x_db_type/new_column/mysql/app/migrations_mysql_db/m200000_000000_create_table_pristines.php
similarity index 93%
rename from tests/specs/x_db_type/new_column/mysql/app/migrations_mysql_db/m200000_000003_create_table_pristines.php
rename to tests/specs/x_db_type/new_column/mysql/app/migrations_mysql_db/m200000_000000_create_table_pristines.php
index 3e9e8e02..ab96f730 100644
--- a/tests/specs/x_db_type/new_column/mysql/app/migrations_mysql_db/m200000_000003_create_table_pristines.php
+++ b/tests/specs/x_db_type/new_column/mysql/app/migrations_mysql_db/m200000_000000_create_table_pristines.php
@@ -3,7 +3,7 @@
 /**
  * Table for Pristine
  */
-class m200000_000003_create_table_pristines extends \yii\db\Migration
+class m200000_000000_create_table_pristines extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/x_db_type/new_column/mysql/app/migrations_mysql_db/m200000_000000_create_table_alldbdatatypes.php b/tests/specs/x_db_type/new_column/mysql/app/migrations_mysql_db/m200000_000001_create_table_alldbdatatypes.php
similarity index 97%
rename from tests/specs/x_db_type/new_column/mysql/app/migrations_mysql_db/m200000_000000_create_table_alldbdatatypes.php
rename to tests/specs/x_db_type/new_column/mysql/app/migrations_mysql_db/m200000_000001_create_table_alldbdatatypes.php
index 2cda660f..5f3d90d1 100644
--- a/tests/specs/x_db_type/new_column/mysql/app/migrations_mysql_db/m200000_000000_create_table_alldbdatatypes.php
+++ b/tests/specs/x_db_type/new_column/mysql/app/migrations_mysql_db/m200000_000001_create_table_alldbdatatypes.php
@@ -3,7 +3,7 @@
 /**
  * Table for Alldbdatatype
  */
-class m200000_000000_create_table_alldbdatatypes extends \yii\db\Migration
+class m200000_000001_create_table_alldbdatatypes extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/x_db_type/new_column/mysql/app/migrations_mysql_db/m200000_000001_create_table_editcolumns.php b/tests/specs/x_db_type/new_column/mysql/app/migrations_mysql_db/m200000_000003_create_table_editcolumns.php
similarity index 93%
rename from tests/specs/x_db_type/new_column/mysql/app/migrations_mysql_db/m200000_000001_create_table_editcolumns.php
rename to tests/specs/x_db_type/new_column/mysql/app/migrations_mysql_db/m200000_000003_create_table_editcolumns.php
index 8c84e731..81a1592d 100644
--- a/tests/specs/x_db_type/new_column/mysql/app/migrations_mysql_db/m200000_000001_create_table_editcolumns.php
+++ b/tests/specs/x_db_type/new_column/mysql/app/migrations_mysql_db/m200000_000003_create_table_editcolumns.php
@@ -3,7 +3,7 @@
 /**
  * Table for Editcolumn
  */
-class m200000_000001_create_table_editcolumns extends \yii\db\Migration
+class m200000_000003_create_table_editcolumns extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/x_db_type/new_column/pgsql/app/migrations_pgsql_db/m200000_000003_create_table_pristines.php b/tests/specs/x_db_type/new_column/pgsql/app/migrations_pgsql_db/m200000_000000_create_table_pristines.php
similarity index 93%
rename from tests/specs/x_db_type/new_column/pgsql/app/migrations_pgsql_db/m200000_000003_create_table_pristines.php
rename to tests/specs/x_db_type/new_column/pgsql/app/migrations_pgsql_db/m200000_000000_create_table_pristines.php
index aab6bb88..93b55396 100644
--- a/tests/specs/x_db_type/new_column/pgsql/app/migrations_pgsql_db/m200000_000003_create_table_pristines.php
+++ b/tests/specs/x_db_type/new_column/pgsql/app/migrations_pgsql_db/m200000_000000_create_table_pristines.php
@@ -3,7 +3,7 @@
 /**
  * Table for Pristine
  */
-class m200000_000003_create_table_pristines extends \yii\db\Migration
+class m200000_000000_create_table_pristines extends \yii\db\Migration
 {
     public function safeUp()
     {
diff --git a/tests/specs/x_db_type/new_column/pgsql/app/migrations_pgsql_db/m200000_000000_create_table_alldbdatatypes.php b/tests/specs/x_db_type/new_column/pgsql/app/migrations_pgsql_db/m200000_000001_create_table_alldbdatatypes.php
similarity index 98%
rename from tests/specs/x_db_type/new_column/pgsql/app/migrations_pgsql_db/m200000_000000_create_table_alldbdatatypes.php
rename to tests/specs/x_db_type/new_column/pgsql/app/migrations_pgsql_db/m200000_000001_create_table_alldbdatatypes.php
index e0cac52a..7f8403d4 100644
--- a/tests/specs/x_db_type/new_column/pgsql/app/migrations_pgsql_db/m200000_000000_create_table_alldbdatatypes.php
+++ b/tests/specs/x_db_type/new_column/pgsql/app/migrations_pgsql_db/m200000_000001_create_table_alldbdatatypes.php
@@ -3,7 +3,7 @@
 /**
  * Table for Alldbdatatype
  */
-class m200000_000000_create_table_alldbdatatypes extends \yii\db\Migration
+class m200000_000001_create_table_alldbdatatypes extends \yii\db\Migration
 {
     public function safeUp()
     {
diff --git a/tests/specs/x_db_type/new_column/pgsql/app/migrations_pgsql_db/m200000_000001_create_table_editcolumns.php b/tests/specs/x_db_type/new_column/pgsql/app/migrations_pgsql_db/m200000_000003_create_table_editcolumns.php
similarity index 94%
rename from tests/specs/x_db_type/new_column/pgsql/app/migrations_pgsql_db/m200000_000001_create_table_editcolumns.php
rename to tests/specs/x_db_type/new_column/pgsql/app/migrations_pgsql_db/m200000_000003_create_table_editcolumns.php
index b8f286b1..9679a0b8 100644
--- a/tests/specs/x_db_type/new_column/pgsql/app/migrations_pgsql_db/m200000_000001_create_table_editcolumns.php
+++ b/tests/specs/x_db_type/new_column/pgsql/app/migrations_pgsql_db/m200000_000003_create_table_editcolumns.php
@@ -3,7 +3,7 @@
 /**
  * Table for Editcolumn
  */
-class m200000_000001_create_table_editcolumns extends \yii\db\Migration
+class m200000_000003_create_table_editcolumns extends \yii\db\Migration
 {
     public function safeUp()
     {

From 7d7dba7adf6c3b767b530a266126dc0b62425fe5 Mon Sep 17 00:00:00 2001
From: Sohel Ahmed Mesaniya <sam.wankaner@gmail.com>
Date: Fri, 21 Jun 2024 20:00:56 +0530
Subject: [PATCH 21/71] Fix another failing tests - 2

---
 ..._pristines.php => m200000_000000_create_table_pristines.php} | 2 +-
 ...types.php => m200000_000001_create_table_alldbdatatypes.php} | 2 +-
 ...tcolumns.php => m200000_000003_create_table_editcolumns.php} | 2 +-
 ..._pristines.php => m200000_000000_create_table_pristines.php} | 2 +-
 ...types.php => m200000_000001_create_table_alldbdatatypes.php} | 2 +-
 ...tcolumns.php => m200000_000003_create_table_editcolumns.php} | 2 +-
 ..._pristines.php => m200000_000000_create_table_pristines.php} | 2 +-
 ...types.php => m200000_000001_create_table_alldbdatatypes.php} | 2 +-
 ...tcolumns.php => m200000_000003_create_table_editcolumns.php} | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)
 rename tests/specs/x_db_type/fresh/maria/app/migrations_maria_db/{m200000_000003_create_table_pristines.php => m200000_000000_create_table_pristines.php} (93%)
 rename tests/specs/x_db_type/fresh/maria/app/migrations_maria_db/{m200000_000000_create_table_alldbdatatypes.php => m200000_000001_create_table_alldbdatatypes.php} (97%)
 rename tests/specs/x_db_type/fresh/maria/app/migrations_maria_db/{m200000_000001_create_table_editcolumns.php => m200000_000003_create_table_editcolumns.php} (93%)
 rename tests/specs/x_db_type/fresh/mysql/app/migrations_mysql_db/{m200000_000003_create_table_pristines.php => m200000_000000_create_table_pristines.php} (93%)
 rename tests/specs/x_db_type/fresh/mysql/app/migrations_mysql_db/{m200000_000000_create_table_alldbdatatypes.php => m200000_000001_create_table_alldbdatatypes.php} (97%)
 rename tests/specs/x_db_type/fresh/mysql/app/migrations_mysql_db/{m200000_000001_create_table_editcolumns.php => m200000_000003_create_table_editcolumns.php} (93%)
 rename tests/specs/x_db_type/fresh/pgsql/app/migrations_pgsql_db/{m200000_000003_create_table_pristines.php => m200000_000000_create_table_pristines.php} (93%)
 rename tests/specs/x_db_type/fresh/pgsql/app/migrations_pgsql_db/{m200000_000000_create_table_alldbdatatypes.php => m200000_000001_create_table_alldbdatatypes.php} (98%)
 rename tests/specs/x_db_type/fresh/pgsql/app/migrations_pgsql_db/{m200000_000001_create_table_editcolumns.php => m200000_000003_create_table_editcolumns.php} (94%)

diff --git a/tests/specs/x_db_type/fresh/maria/app/migrations_maria_db/m200000_000003_create_table_pristines.php b/tests/specs/x_db_type/fresh/maria/app/migrations_maria_db/m200000_000000_create_table_pristines.php
similarity index 93%
rename from tests/specs/x_db_type/fresh/maria/app/migrations_maria_db/m200000_000003_create_table_pristines.php
rename to tests/specs/x_db_type/fresh/maria/app/migrations_maria_db/m200000_000000_create_table_pristines.php
index 1e27d8d6..d1594797 100644
--- a/tests/specs/x_db_type/fresh/maria/app/migrations_maria_db/m200000_000003_create_table_pristines.php
+++ b/tests/specs/x_db_type/fresh/maria/app/migrations_maria_db/m200000_000000_create_table_pristines.php
@@ -3,7 +3,7 @@
 /**
  * Table for Pristine
  */
-class m200000_000003_create_table_pristines extends \yii\db\Migration
+class m200000_000000_create_table_pristines extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/x_db_type/fresh/maria/app/migrations_maria_db/m200000_000000_create_table_alldbdatatypes.php b/tests/specs/x_db_type/fresh/maria/app/migrations_maria_db/m200000_000001_create_table_alldbdatatypes.php
similarity index 97%
rename from tests/specs/x_db_type/fresh/maria/app/migrations_maria_db/m200000_000000_create_table_alldbdatatypes.php
rename to tests/specs/x_db_type/fresh/maria/app/migrations_maria_db/m200000_000001_create_table_alldbdatatypes.php
index 9c002bea..350eedaf 100644
--- a/tests/specs/x_db_type/fresh/maria/app/migrations_maria_db/m200000_000000_create_table_alldbdatatypes.php
+++ b/tests/specs/x_db_type/fresh/maria/app/migrations_maria_db/m200000_000001_create_table_alldbdatatypes.php
@@ -3,7 +3,7 @@
 /**
  * Table for Alldbdatatype
  */
-class m200000_000000_create_table_alldbdatatypes extends \yii\db\Migration
+class m200000_000001_create_table_alldbdatatypes extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/x_db_type/fresh/maria/app/migrations_maria_db/m200000_000001_create_table_editcolumns.php b/tests/specs/x_db_type/fresh/maria/app/migrations_maria_db/m200000_000003_create_table_editcolumns.php
similarity index 93%
rename from tests/specs/x_db_type/fresh/maria/app/migrations_maria_db/m200000_000001_create_table_editcolumns.php
rename to tests/specs/x_db_type/fresh/maria/app/migrations_maria_db/m200000_000003_create_table_editcolumns.php
index 1de3d8d5..1c4a0331 100644
--- a/tests/specs/x_db_type/fresh/maria/app/migrations_maria_db/m200000_000001_create_table_editcolumns.php
+++ b/tests/specs/x_db_type/fresh/maria/app/migrations_maria_db/m200000_000003_create_table_editcolumns.php
@@ -3,7 +3,7 @@
 /**
  * Table for Editcolumn
  */
-class m200000_000001_create_table_editcolumns extends \yii\db\Migration
+class m200000_000003_create_table_editcolumns extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/x_db_type/fresh/mysql/app/migrations_mysql_db/m200000_000003_create_table_pristines.php b/tests/specs/x_db_type/fresh/mysql/app/migrations_mysql_db/m200000_000000_create_table_pristines.php
similarity index 93%
rename from tests/specs/x_db_type/fresh/mysql/app/migrations_mysql_db/m200000_000003_create_table_pristines.php
rename to tests/specs/x_db_type/fresh/mysql/app/migrations_mysql_db/m200000_000000_create_table_pristines.php
index 3e9e8e02..ab96f730 100644
--- a/tests/specs/x_db_type/fresh/mysql/app/migrations_mysql_db/m200000_000003_create_table_pristines.php
+++ b/tests/specs/x_db_type/fresh/mysql/app/migrations_mysql_db/m200000_000000_create_table_pristines.php
@@ -3,7 +3,7 @@
 /**
  * Table for Pristine
  */
-class m200000_000003_create_table_pristines extends \yii\db\Migration
+class m200000_000000_create_table_pristines extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/x_db_type/fresh/mysql/app/migrations_mysql_db/m200000_000000_create_table_alldbdatatypes.php b/tests/specs/x_db_type/fresh/mysql/app/migrations_mysql_db/m200000_000001_create_table_alldbdatatypes.php
similarity index 97%
rename from tests/specs/x_db_type/fresh/mysql/app/migrations_mysql_db/m200000_000000_create_table_alldbdatatypes.php
rename to tests/specs/x_db_type/fresh/mysql/app/migrations_mysql_db/m200000_000001_create_table_alldbdatatypes.php
index 2cda660f..5f3d90d1 100644
--- a/tests/specs/x_db_type/fresh/mysql/app/migrations_mysql_db/m200000_000000_create_table_alldbdatatypes.php
+++ b/tests/specs/x_db_type/fresh/mysql/app/migrations_mysql_db/m200000_000001_create_table_alldbdatatypes.php
@@ -3,7 +3,7 @@
 /**
  * Table for Alldbdatatype
  */
-class m200000_000000_create_table_alldbdatatypes extends \yii\db\Migration
+class m200000_000001_create_table_alldbdatatypes extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/x_db_type/fresh/mysql/app/migrations_mysql_db/m200000_000001_create_table_editcolumns.php b/tests/specs/x_db_type/fresh/mysql/app/migrations_mysql_db/m200000_000003_create_table_editcolumns.php
similarity index 93%
rename from tests/specs/x_db_type/fresh/mysql/app/migrations_mysql_db/m200000_000001_create_table_editcolumns.php
rename to tests/specs/x_db_type/fresh/mysql/app/migrations_mysql_db/m200000_000003_create_table_editcolumns.php
index 8c84e731..81a1592d 100644
--- a/tests/specs/x_db_type/fresh/mysql/app/migrations_mysql_db/m200000_000001_create_table_editcolumns.php
+++ b/tests/specs/x_db_type/fresh/mysql/app/migrations_mysql_db/m200000_000003_create_table_editcolumns.php
@@ -3,7 +3,7 @@
 /**
  * Table for Editcolumn
  */
-class m200000_000001_create_table_editcolumns extends \yii\db\Migration
+class m200000_000003_create_table_editcolumns extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/x_db_type/fresh/pgsql/app/migrations_pgsql_db/m200000_000003_create_table_pristines.php b/tests/specs/x_db_type/fresh/pgsql/app/migrations_pgsql_db/m200000_000000_create_table_pristines.php
similarity index 93%
rename from tests/specs/x_db_type/fresh/pgsql/app/migrations_pgsql_db/m200000_000003_create_table_pristines.php
rename to tests/specs/x_db_type/fresh/pgsql/app/migrations_pgsql_db/m200000_000000_create_table_pristines.php
index aab6bb88..93b55396 100644
--- a/tests/specs/x_db_type/fresh/pgsql/app/migrations_pgsql_db/m200000_000003_create_table_pristines.php
+++ b/tests/specs/x_db_type/fresh/pgsql/app/migrations_pgsql_db/m200000_000000_create_table_pristines.php
@@ -3,7 +3,7 @@
 /**
  * Table for Pristine
  */
-class m200000_000003_create_table_pristines extends \yii\db\Migration
+class m200000_000000_create_table_pristines extends \yii\db\Migration
 {
     public function safeUp()
     {
diff --git a/tests/specs/x_db_type/fresh/pgsql/app/migrations_pgsql_db/m200000_000000_create_table_alldbdatatypes.php b/tests/specs/x_db_type/fresh/pgsql/app/migrations_pgsql_db/m200000_000001_create_table_alldbdatatypes.php
similarity index 98%
rename from tests/specs/x_db_type/fresh/pgsql/app/migrations_pgsql_db/m200000_000000_create_table_alldbdatatypes.php
rename to tests/specs/x_db_type/fresh/pgsql/app/migrations_pgsql_db/m200000_000001_create_table_alldbdatatypes.php
index e0cac52a..7f8403d4 100644
--- a/tests/specs/x_db_type/fresh/pgsql/app/migrations_pgsql_db/m200000_000000_create_table_alldbdatatypes.php
+++ b/tests/specs/x_db_type/fresh/pgsql/app/migrations_pgsql_db/m200000_000001_create_table_alldbdatatypes.php
@@ -3,7 +3,7 @@
 /**
  * Table for Alldbdatatype
  */
-class m200000_000000_create_table_alldbdatatypes extends \yii\db\Migration
+class m200000_000001_create_table_alldbdatatypes extends \yii\db\Migration
 {
     public function safeUp()
     {
diff --git a/tests/specs/x_db_type/fresh/pgsql/app/migrations_pgsql_db/m200000_000001_create_table_editcolumns.php b/tests/specs/x_db_type/fresh/pgsql/app/migrations_pgsql_db/m200000_000003_create_table_editcolumns.php
similarity index 94%
rename from tests/specs/x_db_type/fresh/pgsql/app/migrations_pgsql_db/m200000_000001_create_table_editcolumns.php
rename to tests/specs/x_db_type/fresh/pgsql/app/migrations_pgsql_db/m200000_000003_create_table_editcolumns.php
index b8f286b1..9679a0b8 100644
--- a/tests/specs/x_db_type/fresh/pgsql/app/migrations_pgsql_db/m200000_000001_create_table_editcolumns.php
+++ b/tests/specs/x_db_type/fresh/pgsql/app/migrations_pgsql_db/m200000_000003_create_table_editcolumns.php
@@ -3,7 +3,7 @@
 /**
  * Table for Editcolumn
  */
-class m200000_000001_create_table_editcolumns extends \yii\db\Migration
+class m200000_000003_create_table_editcolumns extends \yii\db\Migration
 {
     public function safeUp()
     {

From 51ebfd70991c56ae51a141979a227742f9e69cee Mon Sep 17 00:00:00 2001
From: Sohel Ahmed Mesaniya <sam.wankaner@gmail.com>
Date: Fri, 21 Jun 2024 20:02:40 +0530
Subject: [PATCH 22/71] Fix another failing tests - 3

---
 ...le_accounts.php => m200000_000000_create_table_accounts.php} | 2 +-
 ...able_domains.php => m200000_000001_create_table_domains.php} | 2 +-
 ...te_table_d123s.php => m200000_000002_create_table_d123s.php} | 2 +-
 ...te_table_c123s.php => m200000_000003_create_table_c123s.php} | 2 +-
 ...te_table_b123s.php => m200000_000004_create_table_b123s.php} | 2 +-
 ...te_table_a123s.php => m200000_000005_create_table_a123s.php} | 2 +-
 ...le_routings.php => m200000_000006_create_table_routings.php} | 2 +-
 ...te_table_e123s.php => m200000_000007_create_table_e123s.php} | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)
 rename tests/specs/relations_in_faker/app/migrations_pgsql_db/{m200000_000003_create_table_accounts.php => m200000_000000_create_table_accounts.php} (83%)
 rename tests/specs/relations_in_faker/app/migrations_pgsql_db/{m200000_000005_create_table_domains.php => m200000_000001_create_table_domains.php} (90%)
 rename tests/specs/relations_in_faker/app/migrations_pgsql_db/{m200000_000004_create_table_d123s.php => m200000_000002_create_table_d123s.php} (83%)
 rename tests/specs/relations_in_faker/app/migrations_pgsql_db/{m200000_000000_create_table_c123s.php => m200000_000003_create_table_c123s.php} (83%)
 rename tests/specs/relations_in_faker/app/migrations_pgsql_db/{m200000_000001_create_table_b123s.php => m200000_000004_create_table_b123s.php} (89%)
 rename tests/specs/relations_in_faker/app/migrations_pgsql_db/{m200000_000002_create_table_a123s.php => m200000_000005_create_table_a123s.php} (89%)
 rename tests/specs/relations_in_faker/app/migrations_pgsql_db/{m200000_000007_create_table_routings.php => m200000_000006_create_table_routings.php} (95%)
 rename tests/specs/relations_in_faker/app/migrations_pgsql_db/{m200000_000006_create_table_e123s.php => m200000_000007_create_table_e123s.php} (89%)

diff --git a/tests/specs/relations_in_faker/app/migrations_pgsql_db/m200000_000003_create_table_accounts.php b/tests/specs/relations_in_faker/app/migrations_pgsql_db/m200000_000000_create_table_accounts.php
similarity index 83%
rename from tests/specs/relations_in_faker/app/migrations_pgsql_db/m200000_000003_create_table_accounts.php
rename to tests/specs/relations_in_faker/app/migrations_pgsql_db/m200000_000000_create_table_accounts.php
index 8eba95b2..ef607707 100644
--- a/tests/specs/relations_in_faker/app/migrations_pgsql_db/m200000_000003_create_table_accounts.php
+++ b/tests/specs/relations_in_faker/app/migrations_pgsql_db/m200000_000000_create_table_accounts.php
@@ -3,7 +3,7 @@
 /**
  * Table for Account
  */
-class m200000_000003_create_table_accounts extends \yii\db\Migration
+class m200000_000000_create_table_accounts extends \yii\db\Migration
 {
     public function safeUp()
     {
diff --git a/tests/specs/relations_in_faker/app/migrations_pgsql_db/m200000_000005_create_table_domains.php b/tests/specs/relations_in_faker/app/migrations_pgsql_db/m200000_000001_create_table_domains.php
similarity index 90%
rename from tests/specs/relations_in_faker/app/migrations_pgsql_db/m200000_000005_create_table_domains.php
rename to tests/specs/relations_in_faker/app/migrations_pgsql_db/m200000_000001_create_table_domains.php
index c830fe7e..5c2336fe 100644
--- a/tests/specs/relations_in_faker/app/migrations_pgsql_db/m200000_000005_create_table_domains.php
+++ b/tests/specs/relations_in_faker/app/migrations_pgsql_db/m200000_000001_create_table_domains.php
@@ -3,7 +3,7 @@
 /**
  * Table for Domain
  */
-class m200000_000005_create_table_domains extends \yii\db\Migration
+class m200000_000001_create_table_domains extends \yii\db\Migration
 {
     public function safeUp()
     {
diff --git a/tests/specs/relations_in_faker/app/migrations_pgsql_db/m200000_000004_create_table_d123s.php b/tests/specs/relations_in_faker/app/migrations_pgsql_db/m200000_000002_create_table_d123s.php
similarity index 83%
rename from tests/specs/relations_in_faker/app/migrations_pgsql_db/m200000_000004_create_table_d123s.php
rename to tests/specs/relations_in_faker/app/migrations_pgsql_db/m200000_000002_create_table_d123s.php
index 794186a8..5deaa47d 100644
--- a/tests/specs/relations_in_faker/app/migrations_pgsql_db/m200000_000004_create_table_d123s.php
+++ b/tests/specs/relations_in_faker/app/migrations_pgsql_db/m200000_000002_create_table_d123s.php
@@ -3,7 +3,7 @@
 /**
  * Table for D123
  */
-class m200000_000004_create_table_d123s extends \yii\db\Migration
+class m200000_000002_create_table_d123s extends \yii\db\Migration
 {
     public function safeUp()
     {
diff --git a/tests/specs/relations_in_faker/app/migrations_pgsql_db/m200000_000000_create_table_c123s.php b/tests/specs/relations_in_faker/app/migrations_pgsql_db/m200000_000003_create_table_c123s.php
similarity index 83%
rename from tests/specs/relations_in_faker/app/migrations_pgsql_db/m200000_000000_create_table_c123s.php
rename to tests/specs/relations_in_faker/app/migrations_pgsql_db/m200000_000003_create_table_c123s.php
index 0c9c1c80..f2dcc3ff 100644
--- a/tests/specs/relations_in_faker/app/migrations_pgsql_db/m200000_000000_create_table_c123s.php
+++ b/tests/specs/relations_in_faker/app/migrations_pgsql_db/m200000_000003_create_table_c123s.php
@@ -3,7 +3,7 @@
 /**
  * Table for C123
  */
-class m200000_000000_create_table_c123s extends \yii\db\Migration
+class m200000_000003_create_table_c123s extends \yii\db\Migration
 {
     public function safeUp()
     {
diff --git a/tests/specs/relations_in_faker/app/migrations_pgsql_db/m200000_000001_create_table_b123s.php b/tests/specs/relations_in_faker/app/migrations_pgsql_db/m200000_000004_create_table_b123s.php
similarity index 89%
rename from tests/specs/relations_in_faker/app/migrations_pgsql_db/m200000_000001_create_table_b123s.php
rename to tests/specs/relations_in_faker/app/migrations_pgsql_db/m200000_000004_create_table_b123s.php
index 908bd998..0d719651 100644
--- a/tests/specs/relations_in_faker/app/migrations_pgsql_db/m200000_000001_create_table_b123s.php
+++ b/tests/specs/relations_in_faker/app/migrations_pgsql_db/m200000_000004_create_table_b123s.php
@@ -3,7 +3,7 @@
 /**
  * Table for B123
  */
-class m200000_000001_create_table_b123s extends \yii\db\Migration
+class m200000_000004_create_table_b123s extends \yii\db\Migration
 {
     public function safeUp()
     {
diff --git a/tests/specs/relations_in_faker/app/migrations_pgsql_db/m200000_000002_create_table_a123s.php b/tests/specs/relations_in_faker/app/migrations_pgsql_db/m200000_000005_create_table_a123s.php
similarity index 89%
rename from tests/specs/relations_in_faker/app/migrations_pgsql_db/m200000_000002_create_table_a123s.php
rename to tests/specs/relations_in_faker/app/migrations_pgsql_db/m200000_000005_create_table_a123s.php
index 73c70ae2..8a9b4737 100644
--- a/tests/specs/relations_in_faker/app/migrations_pgsql_db/m200000_000002_create_table_a123s.php
+++ b/tests/specs/relations_in_faker/app/migrations_pgsql_db/m200000_000005_create_table_a123s.php
@@ -3,7 +3,7 @@
 /**
  * Table for A123
  */
-class m200000_000002_create_table_a123s extends \yii\db\Migration
+class m200000_000005_create_table_a123s extends \yii\db\Migration
 {
     public function safeUp()
     {
diff --git a/tests/specs/relations_in_faker/app/migrations_pgsql_db/m200000_000007_create_table_routings.php b/tests/specs/relations_in_faker/app/migrations_pgsql_db/m200000_000006_create_table_routings.php
similarity index 95%
rename from tests/specs/relations_in_faker/app/migrations_pgsql_db/m200000_000007_create_table_routings.php
rename to tests/specs/relations_in_faker/app/migrations_pgsql_db/m200000_000006_create_table_routings.php
index 98ac2ad9..5fd62f40 100644
--- a/tests/specs/relations_in_faker/app/migrations_pgsql_db/m200000_000007_create_table_routings.php
+++ b/tests/specs/relations_in_faker/app/migrations_pgsql_db/m200000_000006_create_table_routings.php
@@ -3,7 +3,7 @@
 /**
  * Table for Routing
  */
-class m200000_000007_create_table_routings extends \yii\db\Migration
+class m200000_000006_create_table_routings extends \yii\db\Migration
 {
     public function safeUp()
     {
diff --git a/tests/specs/relations_in_faker/app/migrations_pgsql_db/m200000_000006_create_table_e123s.php b/tests/specs/relations_in_faker/app/migrations_pgsql_db/m200000_000007_create_table_e123s.php
similarity index 89%
rename from tests/specs/relations_in_faker/app/migrations_pgsql_db/m200000_000006_create_table_e123s.php
rename to tests/specs/relations_in_faker/app/migrations_pgsql_db/m200000_000007_create_table_e123s.php
index f8d58a41..bce7944e 100644
--- a/tests/specs/relations_in_faker/app/migrations_pgsql_db/m200000_000006_create_table_e123s.php
+++ b/tests/specs/relations_in_faker/app/migrations_pgsql_db/m200000_000007_create_table_e123s.php
@@ -3,7 +3,7 @@
 /**
  * Table for E123
  */
-class m200000_000006_create_table_e123s extends \yii\db\Migration
+class m200000_000007_create_table_e123s extends \yii\db\Migration
 {
     public function safeUp()
     {

From 0dbad7ce4fdae317ed0d5ba06edb64cfc3d873a0 Mon Sep 17 00:00:00 2001
From: Sohel Ahmed Mesaniya <sam.wankaner@gmail.com>
Date: Fri, 21 Jun 2024 20:05:03 +0530
Subject: [PATCH 23/71] Fix another failing tests - 4

---
 ..._pristines.php => m200000_000000_create_table_pristines.php} | 2 +-
 ...tcolumns.php => m200000_000002_create_table_editcolumns.php} | 2 +-
 ..._pristines.php => m200000_000000_create_table_pristines.php} | 2 +-
 ...tcolumns.php => m200000_000002_create_table_editcolumns.php} | 2 +-
 ..._pristines.php => m200000_000000_create_table_pristines.php} | 2 +-
 ...tcolumns.php => m200000_000002_create_table_editcolumns.php} | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)
 rename tests/specs/enum/fresh/maria/app/migrations_maria_db/{m200000_000002_create_table_pristines.php => m200000_000000_create_table_pristines.php} (84%)
 rename tests/specs/enum/fresh/maria/app/migrations_maria_db/{m200000_000000_create_table_editcolumns.php => m200000_000002_create_table_editcolumns.php} (88%)
 rename tests/specs/enum/fresh/mysql/app/migrations_mysql_db/{m200000_000002_create_table_pristines.php => m200000_000000_create_table_pristines.php} (84%)
 rename tests/specs/enum/fresh/mysql/app/migrations_mysql_db/{m200000_000000_create_table_editcolumns.php => m200000_000002_create_table_editcolumns.php} (88%)
 rename tests/specs/enum/fresh/pgsql/app/migrations_pgsql_db/{m200000_000002_create_table_pristines.php => m200000_000000_create_table_pristines.php} (89%)
 rename tests/specs/enum/fresh/pgsql/app/migrations_pgsql_db/{m200000_000000_create_table_editcolumns.php => m200000_000002_create_table_editcolumns.php} (93%)

diff --git a/tests/specs/enum/fresh/maria/app/migrations_maria_db/m200000_000002_create_table_pristines.php b/tests/specs/enum/fresh/maria/app/migrations_maria_db/m200000_000000_create_table_pristines.php
similarity index 84%
rename from tests/specs/enum/fresh/maria/app/migrations_maria_db/m200000_000002_create_table_pristines.php
rename to tests/specs/enum/fresh/maria/app/migrations_maria_db/m200000_000000_create_table_pristines.php
index bdd46f98..2b602da7 100644
--- a/tests/specs/enum/fresh/maria/app/migrations_maria_db/m200000_000002_create_table_pristines.php
+++ b/tests/specs/enum/fresh/maria/app/migrations_maria_db/m200000_000000_create_table_pristines.php
@@ -3,7 +3,7 @@
 /**
  * Table for Pristine
  */
-class m200000_000002_create_table_pristines extends \yii\db\Migration
+class m200000_000000_create_table_pristines extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/enum/fresh/maria/app/migrations_maria_db/m200000_000000_create_table_editcolumns.php b/tests/specs/enum/fresh/maria/app/migrations_maria_db/m200000_000002_create_table_editcolumns.php
similarity index 88%
rename from tests/specs/enum/fresh/maria/app/migrations_maria_db/m200000_000000_create_table_editcolumns.php
rename to tests/specs/enum/fresh/maria/app/migrations_maria_db/m200000_000002_create_table_editcolumns.php
index 1d2581bf..d4e6b085 100644
--- a/tests/specs/enum/fresh/maria/app/migrations_maria_db/m200000_000000_create_table_editcolumns.php
+++ b/tests/specs/enum/fresh/maria/app/migrations_maria_db/m200000_000002_create_table_editcolumns.php
@@ -3,7 +3,7 @@
 /**
  * Table for Editcolumn
  */
-class m200000_000000_create_table_editcolumns extends \yii\db\Migration
+class m200000_000002_create_table_editcolumns extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/enum/fresh/mysql/app/migrations_mysql_db/m200000_000002_create_table_pristines.php b/tests/specs/enum/fresh/mysql/app/migrations_mysql_db/m200000_000000_create_table_pristines.php
similarity index 84%
rename from tests/specs/enum/fresh/mysql/app/migrations_mysql_db/m200000_000002_create_table_pristines.php
rename to tests/specs/enum/fresh/mysql/app/migrations_mysql_db/m200000_000000_create_table_pristines.php
index bdd46f98..2b602da7 100644
--- a/tests/specs/enum/fresh/mysql/app/migrations_mysql_db/m200000_000002_create_table_pristines.php
+++ b/tests/specs/enum/fresh/mysql/app/migrations_mysql_db/m200000_000000_create_table_pristines.php
@@ -3,7 +3,7 @@
 /**
  * Table for Pristine
  */
-class m200000_000002_create_table_pristines extends \yii\db\Migration
+class m200000_000000_create_table_pristines extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/enum/fresh/mysql/app/migrations_mysql_db/m200000_000000_create_table_editcolumns.php b/tests/specs/enum/fresh/mysql/app/migrations_mysql_db/m200000_000002_create_table_editcolumns.php
similarity index 88%
rename from tests/specs/enum/fresh/mysql/app/migrations_mysql_db/m200000_000000_create_table_editcolumns.php
rename to tests/specs/enum/fresh/mysql/app/migrations_mysql_db/m200000_000002_create_table_editcolumns.php
index 3aeb5b25..241a5fd7 100644
--- a/tests/specs/enum/fresh/mysql/app/migrations_mysql_db/m200000_000000_create_table_editcolumns.php
+++ b/tests/specs/enum/fresh/mysql/app/migrations_mysql_db/m200000_000002_create_table_editcolumns.php
@@ -3,7 +3,7 @@
 /**
  * Table for Editcolumn
  */
-class m200000_000000_create_table_editcolumns extends \yii\db\Migration
+class m200000_000002_create_table_editcolumns extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/enum/fresh/pgsql/app/migrations_pgsql_db/m200000_000002_create_table_pristines.php b/tests/specs/enum/fresh/pgsql/app/migrations_pgsql_db/m200000_000000_create_table_pristines.php
similarity index 89%
rename from tests/specs/enum/fresh/pgsql/app/migrations_pgsql_db/m200000_000002_create_table_pristines.php
rename to tests/specs/enum/fresh/pgsql/app/migrations_pgsql_db/m200000_000000_create_table_pristines.php
index 45b63115..e336e5e2 100644
--- a/tests/specs/enum/fresh/pgsql/app/migrations_pgsql_db/m200000_000002_create_table_pristines.php
+++ b/tests/specs/enum/fresh/pgsql/app/migrations_pgsql_db/m200000_000000_create_table_pristines.php
@@ -3,7 +3,7 @@
 /**
  * Table for Pristine
  */
-class m200000_000002_create_table_pristines extends \yii\db\Migration
+class m200000_000000_create_table_pristines extends \yii\db\Migration
 {
     public function safeUp()
     {
diff --git a/tests/specs/enum/fresh/pgsql/app/migrations_pgsql_db/m200000_000000_create_table_editcolumns.php b/tests/specs/enum/fresh/pgsql/app/migrations_pgsql_db/m200000_000002_create_table_editcolumns.php
similarity index 93%
rename from tests/specs/enum/fresh/pgsql/app/migrations_pgsql_db/m200000_000000_create_table_editcolumns.php
rename to tests/specs/enum/fresh/pgsql/app/migrations_pgsql_db/m200000_000002_create_table_editcolumns.php
index 5180bf54..36bbb3fa 100644
--- a/tests/specs/enum/fresh/pgsql/app/migrations_pgsql_db/m200000_000000_create_table_editcolumns.php
+++ b/tests/specs/enum/fresh/pgsql/app/migrations_pgsql_db/m200000_000002_create_table_editcolumns.php
@@ -3,7 +3,7 @@
 /**
  * Table for Editcolumn
  */
-class m200000_000000_create_table_editcolumns extends \yii\db\Migration
+class m200000_000002_create_table_editcolumns extends \yii\db\Migration
 {
     public function safeUp()
     {

From 72b927b270822ecbc161ee5bbe6e2d8b9243c782 Mon Sep 17 00:00:00 2001
From: Sohel Ahmed Mesaniya <sam.wankaner@gmail.com>
Date: Fri, 21 Jun 2024 20:06:39 +0530
Subject: [PATCH 24/71] Fix another failing tests - EnumTest::testAddNewColumn

---
 ..._pristines.php => m200000_000000_create_table_pristines.php} | 2 +-
 ...tcolumns.php => m200000_000002_create_table_editcolumns.php} | 2 +-
 ..._pristines.php => m200000_000000_create_table_pristines.php} | 2 +-
 ...tcolumns.php => m200000_000002_create_table_editcolumns.php} | 2 +-
 ..._pristines.php => m200000_000000_create_table_pristines.php} | 2 +-
 ...tcolumns.php => m200000_000002_create_table_editcolumns.php} | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)
 rename tests/specs/enum/new_column/maria/app/migrations_maria_db/{m200000_000002_create_table_pristines.php => m200000_000000_create_table_pristines.php} (84%)
 rename tests/specs/enum/new_column/maria/app/migrations_maria_db/{m200000_000000_create_table_editcolumns.php => m200000_000002_create_table_editcolumns.php} (88%)
 rename tests/specs/enum/new_column/mysql/app/migrations_mysql_db/{m200000_000002_create_table_pristines.php => m200000_000000_create_table_pristines.php} (84%)
 rename tests/specs/enum/new_column/mysql/app/migrations_mysql_db/{m200000_000000_create_table_editcolumns.php => m200000_000002_create_table_editcolumns.php} (88%)
 rename tests/specs/enum/new_column/pgsql/app/migrations_pgsql_db/{m200000_000002_create_table_pristines.php => m200000_000000_create_table_pristines.php} (89%)
 rename tests/specs/enum/new_column/pgsql/app/migrations_pgsql_db/{m200000_000000_create_table_editcolumns.php => m200000_000002_create_table_editcolumns.php} (93%)

diff --git a/tests/specs/enum/new_column/maria/app/migrations_maria_db/m200000_000002_create_table_pristines.php b/tests/specs/enum/new_column/maria/app/migrations_maria_db/m200000_000000_create_table_pristines.php
similarity index 84%
rename from tests/specs/enum/new_column/maria/app/migrations_maria_db/m200000_000002_create_table_pristines.php
rename to tests/specs/enum/new_column/maria/app/migrations_maria_db/m200000_000000_create_table_pristines.php
index bdd46f98..2b602da7 100644
--- a/tests/specs/enum/new_column/maria/app/migrations_maria_db/m200000_000002_create_table_pristines.php
+++ b/tests/specs/enum/new_column/maria/app/migrations_maria_db/m200000_000000_create_table_pristines.php
@@ -3,7 +3,7 @@
 /**
  * Table for Pristine
  */
-class m200000_000002_create_table_pristines extends \yii\db\Migration
+class m200000_000000_create_table_pristines extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/enum/new_column/maria/app/migrations_maria_db/m200000_000000_create_table_editcolumns.php b/tests/specs/enum/new_column/maria/app/migrations_maria_db/m200000_000002_create_table_editcolumns.php
similarity index 88%
rename from tests/specs/enum/new_column/maria/app/migrations_maria_db/m200000_000000_create_table_editcolumns.php
rename to tests/specs/enum/new_column/maria/app/migrations_maria_db/m200000_000002_create_table_editcolumns.php
index 1d2581bf..d4e6b085 100644
--- a/tests/specs/enum/new_column/maria/app/migrations_maria_db/m200000_000000_create_table_editcolumns.php
+++ b/tests/specs/enum/new_column/maria/app/migrations_maria_db/m200000_000002_create_table_editcolumns.php
@@ -3,7 +3,7 @@
 /**
  * Table for Editcolumn
  */
-class m200000_000000_create_table_editcolumns extends \yii\db\Migration
+class m200000_000002_create_table_editcolumns extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/enum/new_column/mysql/app/migrations_mysql_db/m200000_000002_create_table_pristines.php b/tests/specs/enum/new_column/mysql/app/migrations_mysql_db/m200000_000000_create_table_pristines.php
similarity index 84%
rename from tests/specs/enum/new_column/mysql/app/migrations_mysql_db/m200000_000002_create_table_pristines.php
rename to tests/specs/enum/new_column/mysql/app/migrations_mysql_db/m200000_000000_create_table_pristines.php
index bdd46f98..2b602da7 100644
--- a/tests/specs/enum/new_column/mysql/app/migrations_mysql_db/m200000_000002_create_table_pristines.php
+++ b/tests/specs/enum/new_column/mysql/app/migrations_mysql_db/m200000_000000_create_table_pristines.php
@@ -3,7 +3,7 @@
 /**
  * Table for Pristine
  */
-class m200000_000002_create_table_pristines extends \yii\db\Migration
+class m200000_000000_create_table_pristines extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/enum/new_column/mysql/app/migrations_mysql_db/m200000_000000_create_table_editcolumns.php b/tests/specs/enum/new_column/mysql/app/migrations_mysql_db/m200000_000002_create_table_editcolumns.php
similarity index 88%
rename from tests/specs/enum/new_column/mysql/app/migrations_mysql_db/m200000_000000_create_table_editcolumns.php
rename to tests/specs/enum/new_column/mysql/app/migrations_mysql_db/m200000_000002_create_table_editcolumns.php
index 3aeb5b25..241a5fd7 100644
--- a/tests/specs/enum/new_column/mysql/app/migrations_mysql_db/m200000_000000_create_table_editcolumns.php
+++ b/tests/specs/enum/new_column/mysql/app/migrations_mysql_db/m200000_000002_create_table_editcolumns.php
@@ -3,7 +3,7 @@
 /**
  * Table for Editcolumn
  */
-class m200000_000000_create_table_editcolumns extends \yii\db\Migration
+class m200000_000002_create_table_editcolumns extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/enum/new_column/pgsql/app/migrations_pgsql_db/m200000_000002_create_table_pristines.php b/tests/specs/enum/new_column/pgsql/app/migrations_pgsql_db/m200000_000000_create_table_pristines.php
similarity index 89%
rename from tests/specs/enum/new_column/pgsql/app/migrations_pgsql_db/m200000_000002_create_table_pristines.php
rename to tests/specs/enum/new_column/pgsql/app/migrations_pgsql_db/m200000_000000_create_table_pristines.php
index 45b63115..e336e5e2 100644
--- a/tests/specs/enum/new_column/pgsql/app/migrations_pgsql_db/m200000_000002_create_table_pristines.php
+++ b/tests/specs/enum/new_column/pgsql/app/migrations_pgsql_db/m200000_000000_create_table_pristines.php
@@ -3,7 +3,7 @@
 /**
  * Table for Pristine
  */
-class m200000_000002_create_table_pristines extends \yii\db\Migration
+class m200000_000000_create_table_pristines extends \yii\db\Migration
 {
     public function safeUp()
     {
diff --git a/tests/specs/enum/new_column/pgsql/app/migrations_pgsql_db/m200000_000000_create_table_editcolumns.php b/tests/specs/enum/new_column/pgsql/app/migrations_pgsql_db/m200000_000002_create_table_editcolumns.php
similarity index 93%
rename from tests/specs/enum/new_column/pgsql/app/migrations_pgsql_db/m200000_000000_create_table_editcolumns.php
rename to tests/specs/enum/new_column/pgsql/app/migrations_pgsql_db/m200000_000002_create_table_editcolumns.php
index 5180bf54..36bbb3fa 100644
--- a/tests/specs/enum/new_column/pgsql/app/migrations_pgsql_db/m200000_000000_create_table_editcolumns.php
+++ b/tests/specs/enum/new_column/pgsql/app/migrations_pgsql_db/m200000_000002_create_table_editcolumns.php
@@ -3,7 +3,7 @@
 /**
  * Table for Editcolumn
  */
-class m200000_000000_create_table_editcolumns extends \yii\db\Migration
+class m200000_000002_create_table_editcolumns extends \yii\db\Migration
 {
     public function safeUp()
     {

From ad7b022c48a2f263fea0cec59d8db9b0cbc49a68 Mon Sep 17 00:00:00 2001
From: Sohel Ahmed Mesaniya <sam.wankaner@gmail.com>
Date: Fri, 21 Jun 2024 20:08:15 +0530
Subject: [PATCH 25/71] Fix another failing tests -
 EnumTest::testChangeToAndFromEnum

---
 ..._pristines.php => m200000_000000_create_table_pristines.php} | 2 +-
 ...tcolumns.php => m200000_000002_change_table_editcolumns.php} | 2 +-
 ..._pristines.php => m200000_000000_create_table_pristines.php} | 2 +-
 ...tcolumns.php => m200000_000002_change_table_editcolumns.php} | 2 +-
 ..._pristines.php => m200000_000000_create_table_pristines.php} | 2 +-
 ...tcolumns.php => m200000_000002_change_table_editcolumns.php} | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)
 rename tests/specs/enum/change/maria/app/migrations_maria_db/{m200000_000002_create_table_pristines.php => m200000_000000_create_table_pristines.php} (84%)
 rename tests/specs/enum/change/maria/app/migrations_maria_db/{m200000_000000_change_table_editcolumns.php => m200000_000002_change_table_editcolumns.php} (92%)
 rename tests/specs/enum/change/mysql/app/migrations_mysql_db/{m200000_000002_create_table_pristines.php => m200000_000000_create_table_pristines.php} (84%)
 rename tests/specs/enum/change/mysql/app/migrations_mysql_db/{m200000_000000_change_table_editcolumns.php => m200000_000002_change_table_editcolumns.php} (92%)
 rename tests/specs/enum/change/pgsql/app/migrations_pgsql_db/{m200000_000002_create_table_pristines.php => m200000_000000_create_table_pristines.php} (89%)
 rename tests/specs/enum/change/pgsql/app/migrations_pgsql_db/{m200000_000000_change_table_editcolumns.php => m200000_000002_change_table_editcolumns.php} (97%)

diff --git a/tests/specs/enum/change/maria/app/migrations_maria_db/m200000_000002_create_table_pristines.php b/tests/specs/enum/change/maria/app/migrations_maria_db/m200000_000000_create_table_pristines.php
similarity index 84%
rename from tests/specs/enum/change/maria/app/migrations_maria_db/m200000_000002_create_table_pristines.php
rename to tests/specs/enum/change/maria/app/migrations_maria_db/m200000_000000_create_table_pristines.php
index bdd46f98..2b602da7 100644
--- a/tests/specs/enum/change/maria/app/migrations_maria_db/m200000_000002_create_table_pristines.php
+++ b/tests/specs/enum/change/maria/app/migrations_maria_db/m200000_000000_create_table_pristines.php
@@ -3,7 +3,7 @@
 /**
  * Table for Pristine
  */
-class m200000_000002_create_table_pristines extends \yii\db\Migration
+class m200000_000000_create_table_pristines extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/enum/change/maria/app/migrations_maria_db/m200000_000000_change_table_editcolumns.php b/tests/specs/enum/change/maria/app/migrations_maria_db/m200000_000002_change_table_editcolumns.php
similarity index 92%
rename from tests/specs/enum/change/maria/app/migrations_maria_db/m200000_000000_change_table_editcolumns.php
rename to tests/specs/enum/change/maria/app/migrations_maria_db/m200000_000002_change_table_editcolumns.php
index 3df0a659..a2b3f68d 100644
--- a/tests/specs/enum/change/maria/app/migrations_maria_db/m200000_000000_change_table_editcolumns.php
+++ b/tests/specs/enum/change/maria/app/migrations_maria_db/m200000_000002_change_table_editcolumns.php
@@ -3,7 +3,7 @@
 /**
  * Table for Editcolumn
  */
-class m200000_000000_change_table_editcolumns extends \yii\db\Migration
+class m200000_000002_change_table_editcolumns extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/enum/change/mysql/app/migrations_mysql_db/m200000_000002_create_table_pristines.php b/tests/specs/enum/change/mysql/app/migrations_mysql_db/m200000_000000_create_table_pristines.php
similarity index 84%
rename from tests/specs/enum/change/mysql/app/migrations_mysql_db/m200000_000002_create_table_pristines.php
rename to tests/specs/enum/change/mysql/app/migrations_mysql_db/m200000_000000_create_table_pristines.php
index bdd46f98..2b602da7 100644
--- a/tests/specs/enum/change/mysql/app/migrations_mysql_db/m200000_000002_create_table_pristines.php
+++ b/tests/specs/enum/change/mysql/app/migrations_mysql_db/m200000_000000_create_table_pristines.php
@@ -3,7 +3,7 @@
 /**
  * Table for Pristine
  */
-class m200000_000002_create_table_pristines extends \yii\db\Migration
+class m200000_000000_create_table_pristines extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/enum/change/mysql/app/migrations_mysql_db/m200000_000000_change_table_editcolumns.php b/tests/specs/enum/change/mysql/app/migrations_mysql_db/m200000_000002_change_table_editcolumns.php
similarity index 92%
rename from tests/specs/enum/change/mysql/app/migrations_mysql_db/m200000_000000_change_table_editcolumns.php
rename to tests/specs/enum/change/mysql/app/migrations_mysql_db/m200000_000002_change_table_editcolumns.php
index 117d6069..8d4e499b 100644
--- a/tests/specs/enum/change/mysql/app/migrations_mysql_db/m200000_000000_change_table_editcolumns.php
+++ b/tests/specs/enum/change/mysql/app/migrations_mysql_db/m200000_000002_change_table_editcolumns.php
@@ -3,7 +3,7 @@
 /**
  * Table for Editcolumn
  */
-class m200000_000000_change_table_editcolumns extends \yii\db\Migration
+class m200000_000002_change_table_editcolumns extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/enum/change/pgsql/app/migrations_pgsql_db/m200000_000002_create_table_pristines.php b/tests/specs/enum/change/pgsql/app/migrations_pgsql_db/m200000_000000_create_table_pristines.php
similarity index 89%
rename from tests/specs/enum/change/pgsql/app/migrations_pgsql_db/m200000_000002_create_table_pristines.php
rename to tests/specs/enum/change/pgsql/app/migrations_pgsql_db/m200000_000000_create_table_pristines.php
index 45b63115..e336e5e2 100644
--- a/tests/specs/enum/change/pgsql/app/migrations_pgsql_db/m200000_000002_create_table_pristines.php
+++ b/tests/specs/enum/change/pgsql/app/migrations_pgsql_db/m200000_000000_create_table_pristines.php
@@ -3,7 +3,7 @@
 /**
  * Table for Pristine
  */
-class m200000_000002_create_table_pristines extends \yii\db\Migration
+class m200000_000000_create_table_pristines extends \yii\db\Migration
 {
     public function safeUp()
     {
diff --git a/tests/specs/enum/change/pgsql/app/migrations_pgsql_db/m200000_000000_change_table_editcolumns.php b/tests/specs/enum/change/pgsql/app/migrations_pgsql_db/m200000_000002_change_table_editcolumns.php
similarity index 97%
rename from tests/specs/enum/change/pgsql/app/migrations_pgsql_db/m200000_000000_change_table_editcolumns.php
rename to tests/specs/enum/change/pgsql/app/migrations_pgsql_db/m200000_000002_change_table_editcolumns.php
index 66287960..0bbb27a9 100644
--- a/tests/specs/enum/change/pgsql/app/migrations_pgsql_db/m200000_000000_change_table_editcolumns.php
+++ b/tests/specs/enum/change/pgsql/app/migrations_pgsql_db/m200000_000002_change_table_editcolumns.php
@@ -3,7 +3,7 @@
 /**
  * Table for Editcolumn
  */
-class m200000_000000_change_table_editcolumns extends \yii\db\Migration
+class m200000_000002_change_table_editcolumns extends \yii\db\Migration
 {
     public function safeUp()
     {

From 07b00b1bd2e6839256d4ff7a49f969e2b7927fa3 Mon Sep 17 00:00:00 2001
From: Sohel Ahmed Mesaniya <sam.wankaner@gmail.com>
Date: Fri, 21 Jun 2024 20:09:19 +0530
Subject: [PATCH 26/71] Fix another failing tests -
 ForeignKeyColumnNameTest::testIndex

---
 ...te_table_users.php => m200000_000000_create_table_users.php} | 2 +-
 ...eliveries.php => m200000_000001_create_table_deliveries.php} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename tests/specs/fk_col_name/app/migrations_mysql_db/{m200000_000001_create_table_users.php => m200000_000000_create_table_users.php} (82%)
 rename tests/specs/fk_col_name/app/migrations_mysql_db/{m200000_000000_create_table_deliveries.php => m200000_000001_create_table_deliveries.php} (83%)

diff --git a/tests/specs/fk_col_name/app/migrations_mysql_db/m200000_000001_create_table_users.php b/tests/specs/fk_col_name/app/migrations_mysql_db/m200000_000000_create_table_users.php
similarity index 82%
rename from tests/specs/fk_col_name/app/migrations_mysql_db/m200000_000001_create_table_users.php
rename to tests/specs/fk_col_name/app/migrations_mysql_db/m200000_000000_create_table_users.php
index e6e9afe4..2616e0a4 100644
--- a/tests/specs/fk_col_name/app/migrations_mysql_db/m200000_000001_create_table_users.php
+++ b/tests/specs/fk_col_name/app/migrations_mysql_db/m200000_000000_create_table_users.php
@@ -3,7 +3,7 @@
 /**
  * Table for User
  */
-class m200000_000001_create_table_users extends \yii\db\Migration
+class m200000_000000_create_table_users extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/fk_col_name/app/migrations_mysql_db/m200000_000000_create_table_deliveries.php b/tests/specs/fk_col_name/app/migrations_mysql_db/m200000_000001_create_table_deliveries.php
similarity index 83%
rename from tests/specs/fk_col_name/app/migrations_mysql_db/m200000_000000_create_table_deliveries.php
rename to tests/specs/fk_col_name/app/migrations_mysql_db/m200000_000001_create_table_deliveries.php
index e88d0ea9..b99ba258 100644
--- a/tests/specs/fk_col_name/app/migrations_mysql_db/m200000_000000_create_table_deliveries.php
+++ b/tests/specs/fk_col_name/app/migrations_mysql_db/m200000_000001_create_table_deliveries.php
@@ -3,7 +3,7 @@
 /**
  * Table for Delivery
  */
-class m200000_000000_create_table_deliveries extends \yii\db\Migration
+class m200000_000001_create_table_deliveries extends \yii\db\Migration
 {
     public function up()
     {

From 0c552cec91c01a242b0111d536615f240609ee86 Mon Sep 17 00:00:00 2001
From: Sohel Ahmed Mesaniya <sam.wankaner@gmail.com>
Date: Fri, 21 Jun 2024 20:10:21 +0530
Subject: [PATCH 27/71] Fix another failing tests -
 ForeignKeyColumnNameTest::testIndexForColumnWithCustomName

---
 ...te_table_users.php => m200000_000000_create_table_users.php} | 2 +-
 ...eliveries.php => m200000_000001_create_table_deliveries.php} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename tests/specs/fk_col_name_index/app/migrations_mysql_db/{m200000_000001_create_table_users.php => m200000_000000_create_table_users.php} (82%)
 rename tests/specs/fk_col_name_index/app/migrations_mysql_db/{m200000_000000_create_table_deliveries.php => m200000_000001_create_table_deliveries.php} (83%)

diff --git a/tests/specs/fk_col_name_index/app/migrations_mysql_db/m200000_000001_create_table_users.php b/tests/specs/fk_col_name_index/app/migrations_mysql_db/m200000_000000_create_table_users.php
similarity index 82%
rename from tests/specs/fk_col_name_index/app/migrations_mysql_db/m200000_000001_create_table_users.php
rename to tests/specs/fk_col_name_index/app/migrations_mysql_db/m200000_000000_create_table_users.php
index e6e9afe4..2616e0a4 100644
--- a/tests/specs/fk_col_name_index/app/migrations_mysql_db/m200000_000001_create_table_users.php
+++ b/tests/specs/fk_col_name_index/app/migrations_mysql_db/m200000_000000_create_table_users.php
@@ -3,7 +3,7 @@
 /**
  * Table for User
  */
-class m200000_000001_create_table_users extends \yii\db\Migration
+class m200000_000000_create_table_users extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/fk_col_name_index/app/migrations_mysql_db/m200000_000000_create_table_deliveries.php b/tests/specs/fk_col_name_index/app/migrations_mysql_db/m200000_000001_create_table_deliveries.php
similarity index 83%
rename from tests/specs/fk_col_name_index/app/migrations_mysql_db/m200000_000000_create_table_deliveries.php
rename to tests/specs/fk_col_name_index/app/migrations_mysql_db/m200000_000001_create_table_deliveries.php
index e88d0ea9..b99ba258 100644
--- a/tests/specs/fk_col_name_index/app/migrations_mysql_db/m200000_000000_create_table_deliveries.php
+++ b/tests/specs/fk_col_name_index/app/migrations_mysql_db/m200000_000001_create_table_deliveries.php
@@ -3,7 +3,7 @@
 /**
  * Table for Delivery
  */
-class m200000_000000_create_table_deliveries extends \yii\db\Migration
+class m200000_000001_create_table_deliveries extends \yii\db\Migration
 {
     public function up()
     {

From ba2ef56799d3c6ed77b0e8613f2714a8ca2dbd47 Mon Sep 17 00:00:00 2001
From: Sohel Ahmed Mesaniya <sam.wankaner@gmail.com>
Date: Fri, 21 Jun 2024 20:29:00 +0530
Subject: [PATCH 28/71] Fix another failing tests - GeneratorTest::testGenerate

---
 .../m200000_000000_create_table_users.php}                      | 2 +-
 ...ategories.php => m200000_000001_create_table_categories.php} | 2 +-
 .../m200000_000003_create_table_post_comments.php}              | 2 +-
 .../m200000_000004_create_table_fakerable.php}                  | 2 +-
 .../m200000_000000_create_table_users.php}                      | 2 +-
 .../m200000_000001_create_table_categories.php}                 | 2 +-
 ...mments.php => m200000_000003_create_table_post_comments.php} | 2 +-
 ..._fakerable.php => m200000_000004_create_table_fakerable.php} | 2 +-
 .../m200000_000000_create_table_users.php}                      | 2 +-
 .../m200000_000001_create_table_categories.php}                 | 2 +-
 .../m200000_000003_create_table_post_comments.php}              | 2 +-
 .../m200000_000004_create_table_fakerable.php}                  | 2 +-
 ...te_table_users.php => m200000_000000_create_table_users.php} | 2 +-
 ...ategories.php => m200000_000001_create_table_categories.php} | 2 +-
 ...mments.php => m200000_000003_create_table_post_comments.php} | 2 +-
 ..._fakerable.php => m200000_000004_create_table_fakerable.php} | 2 +-
 ...te_table_posts.php => m200000_000000_create_table_posts.php} | 2 +-
 ...eate_table_tags.php => m200000_000001_create_table_tags.php} | 2 +-
 ...osts2tags.php => m200000_000002_create_table_posts2tags.php} | 2 +-
 ...te_table_photo.php => m200000_000003_create_table_photo.php} | 2 +-
 ...s2posts.php => m200000_000004_create_table_photos2posts.php} | 2 +-
 ...allery.php => m200000_000005_create_table_posts_gallery.php} | 2 +-
 ...aches.php => m200000_000006_create_table_posts_attaches.php} | 2 +-
 23 files changed, 23 insertions(+), 23 deletions(-)
 rename tests/specs/blog/{migrations_mysql_db/m200000_000001_create_table_users.php => migrations/m200000_000000_create_table_users.php} (94%)
 rename tests/specs/blog/migrations/{m200000_000000_create_table_categories.php => m200000_000001_create_table_categories.php} (91%)
 rename tests/specs/blog/{migrations_mysql_db/m200000_000004_create_table_post_comments.php => migrations/m200000_000003_create_table_post_comments.php} (93%)
 rename tests/specs/blog/{migrations_mysql_db/m200000_000003_create_table_fakerable.php => migrations/m200000_000004_create_table_fakerable.php} (95%)
 rename tests/specs/blog/{migrations/m200000_000001_create_table_users.php => migrations_maria_db/m200000_000000_create_table_users.php} (94%)
 rename tests/specs/blog/{migrations_mysql_db/m200000_000000_create_table_categories.php => migrations_maria_db/m200000_000001_create_table_categories.php} (91%)
 rename tests/specs/blog/migrations_maria_db/{m200000_000004_create_table_post_comments.php => m200000_000003_create_table_post_comments.php} (94%)
 rename tests/specs/blog/migrations_maria_db/{m200000_000003_create_table_fakerable.php => m200000_000004_create_table_fakerable.php} (95%)
 rename tests/specs/blog/{migrations_maria_db/m200000_000001_create_table_users.php => migrations_mysql_db/m200000_000000_create_table_users.php} (94%)
 rename tests/specs/blog/{migrations_maria_db/m200000_000000_create_table_categories.php => migrations_mysql_db/m200000_000001_create_table_categories.php} (91%)
 rename tests/specs/blog/{migrations/m200000_000004_create_table_post_comments.php => migrations_mysql_db/m200000_000003_create_table_post_comments.php} (93%)
 rename tests/specs/blog/{migrations/m200000_000003_create_table_fakerable.php => migrations_mysql_db/m200000_000004_create_table_fakerable.php} (95%)
 rename tests/specs/blog/migrations_pgsql_db/{m200000_000001_create_table_users.php => m200000_000000_create_table_users.php} (94%)
 rename tests/specs/blog/migrations_pgsql_db/{m200000_000000_create_table_categories.php => m200000_000001_create_table_categories.php} (91%)
 rename tests/specs/blog/migrations_pgsql_db/{m200000_000004_create_table_post_comments.php => m200000_000003_create_table_post_comments.php} (94%)
 rename tests/specs/blog/migrations_pgsql_db/{m200000_000003_create_table_fakerable.php => m200000_000004_create_table_fakerable.php} (95%)
 rename tests/specs/many2many/migrations/{m200000_000001_create_table_posts.php => m200000_000000_create_table_posts.php} (82%)
 rename tests/specs/many2many/migrations/{m200000_000003_create_table_tags.php => m200000_000001_create_table_tags.php} (82%)
 rename tests/specs/many2many/migrations/{m200000_000004_create_table_posts2tags.php => m200000_000002_create_table_posts2tags.php} (93%)
 rename tests/specs/many2many/migrations/{m200000_000000_create_table_photo.php => m200000_000003_create_table_photo.php} (82%)
 rename tests/specs/many2many/migrations/{m200000_000002_create_table_photos2posts.php => m200000_000004_create_table_photos2posts.php} (92%)
 rename tests/specs/many2many/migrations/{m200000_000006_create_table_posts_gallery.php => m200000_000005_create_table_posts_gallery.php} (94%)
 rename tests/specs/many2many/migrations/{m200000_000005_create_table_posts_attaches.php => m200000_000006_create_table_posts_attaches.php} (93%)

diff --git a/tests/specs/blog/migrations_mysql_db/m200000_000001_create_table_users.php b/tests/specs/blog/migrations/m200000_000000_create_table_users.php
similarity index 94%
rename from tests/specs/blog/migrations_mysql_db/m200000_000001_create_table_users.php
rename to tests/specs/blog/migrations/m200000_000000_create_table_users.php
index a90792e9..de42dde7 100644
--- a/tests/specs/blog/migrations_mysql_db/m200000_000001_create_table_users.php
+++ b/tests/specs/blog/migrations/m200000_000000_create_table_users.php
@@ -3,7 +3,7 @@
 /**
  * Table for User
  */
-class m200000_000001_create_table_users extends \yii\db\Migration
+class m200000_000000_create_table_users extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/blog/migrations/m200000_000000_create_table_categories.php b/tests/specs/blog/migrations/m200000_000001_create_table_categories.php
similarity index 91%
rename from tests/specs/blog/migrations/m200000_000000_create_table_categories.php
rename to tests/specs/blog/migrations/m200000_000001_create_table_categories.php
index 0485cafc..957966fb 100644
--- a/tests/specs/blog/migrations/m200000_000000_create_table_categories.php
+++ b/tests/specs/blog/migrations/m200000_000001_create_table_categories.php
@@ -3,7 +3,7 @@
 /**
  * Table for Category
  */
-class m200000_000000_create_table_categories extends \yii\db\Migration
+class m200000_000001_create_table_categories extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/blog/migrations_mysql_db/m200000_000004_create_table_post_comments.php b/tests/specs/blog/migrations/m200000_000003_create_table_post_comments.php
similarity index 93%
rename from tests/specs/blog/migrations_mysql_db/m200000_000004_create_table_post_comments.php
rename to tests/specs/blog/migrations/m200000_000003_create_table_post_comments.php
index c16766da..45b512c3 100644
--- a/tests/specs/blog/migrations_mysql_db/m200000_000004_create_table_post_comments.php
+++ b/tests/specs/blog/migrations/m200000_000003_create_table_post_comments.php
@@ -3,7 +3,7 @@
 /**
  * Table for Comment
  */
-class m200000_000004_create_table_post_comments extends \yii\db\Migration
+class m200000_000003_create_table_post_comments extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/blog/migrations_mysql_db/m200000_000003_create_table_fakerable.php b/tests/specs/blog/migrations/m200000_000004_create_table_fakerable.php
similarity index 95%
rename from tests/specs/blog/migrations_mysql_db/m200000_000003_create_table_fakerable.php
rename to tests/specs/blog/migrations/m200000_000004_create_table_fakerable.php
index 0f3eebad..82c4db07 100644
--- a/tests/specs/blog/migrations_mysql_db/m200000_000003_create_table_fakerable.php
+++ b/tests/specs/blog/migrations/m200000_000004_create_table_fakerable.php
@@ -3,7 +3,7 @@
 /**
  * Table for Fakerable
  */
-class m200000_000003_create_table_fakerable extends \yii\db\Migration
+class m200000_000004_create_table_fakerable extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/blog/migrations/m200000_000001_create_table_users.php b/tests/specs/blog/migrations_maria_db/m200000_000000_create_table_users.php
similarity index 94%
rename from tests/specs/blog/migrations/m200000_000001_create_table_users.php
rename to tests/specs/blog/migrations_maria_db/m200000_000000_create_table_users.php
index a90792e9..de42dde7 100644
--- a/tests/specs/blog/migrations/m200000_000001_create_table_users.php
+++ b/tests/specs/blog/migrations_maria_db/m200000_000000_create_table_users.php
@@ -3,7 +3,7 @@
 /**
  * Table for User
  */
-class m200000_000001_create_table_users extends \yii\db\Migration
+class m200000_000000_create_table_users extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/blog/migrations_mysql_db/m200000_000000_create_table_categories.php b/tests/specs/blog/migrations_maria_db/m200000_000001_create_table_categories.php
similarity index 91%
rename from tests/specs/blog/migrations_mysql_db/m200000_000000_create_table_categories.php
rename to tests/specs/blog/migrations_maria_db/m200000_000001_create_table_categories.php
index 0485cafc..957966fb 100644
--- a/tests/specs/blog/migrations_mysql_db/m200000_000000_create_table_categories.php
+++ b/tests/specs/blog/migrations_maria_db/m200000_000001_create_table_categories.php
@@ -3,7 +3,7 @@
 /**
  * Table for Category
  */
-class m200000_000000_create_table_categories extends \yii\db\Migration
+class m200000_000001_create_table_categories extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/blog/migrations_maria_db/m200000_000004_create_table_post_comments.php b/tests/specs/blog/migrations_maria_db/m200000_000003_create_table_post_comments.php
similarity index 94%
rename from tests/specs/blog/migrations_maria_db/m200000_000004_create_table_post_comments.php
rename to tests/specs/blog/migrations_maria_db/m200000_000003_create_table_post_comments.php
index d4971f43..fc617edf 100644
--- a/tests/specs/blog/migrations_maria_db/m200000_000004_create_table_post_comments.php
+++ b/tests/specs/blog/migrations_maria_db/m200000_000003_create_table_post_comments.php
@@ -3,7 +3,7 @@
 /**
  * Table for Comment
  */
-class m200000_000004_create_table_post_comments extends \yii\db\Migration
+class m200000_000003_create_table_post_comments extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/blog/migrations_maria_db/m200000_000003_create_table_fakerable.php b/tests/specs/blog/migrations_maria_db/m200000_000004_create_table_fakerable.php
similarity index 95%
rename from tests/specs/blog/migrations_maria_db/m200000_000003_create_table_fakerable.php
rename to tests/specs/blog/migrations_maria_db/m200000_000004_create_table_fakerable.php
index 84f6247c..4ec0bb94 100644
--- a/tests/specs/blog/migrations_maria_db/m200000_000003_create_table_fakerable.php
+++ b/tests/specs/blog/migrations_maria_db/m200000_000004_create_table_fakerable.php
@@ -3,7 +3,7 @@
 /**
  * Table for Fakerable
  */
-class m200000_000003_create_table_fakerable extends \yii\db\Migration
+class m200000_000004_create_table_fakerable extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/blog/migrations_maria_db/m200000_000001_create_table_users.php b/tests/specs/blog/migrations_mysql_db/m200000_000000_create_table_users.php
similarity index 94%
rename from tests/specs/blog/migrations_maria_db/m200000_000001_create_table_users.php
rename to tests/specs/blog/migrations_mysql_db/m200000_000000_create_table_users.php
index a90792e9..de42dde7 100644
--- a/tests/specs/blog/migrations_maria_db/m200000_000001_create_table_users.php
+++ b/tests/specs/blog/migrations_mysql_db/m200000_000000_create_table_users.php
@@ -3,7 +3,7 @@
 /**
  * Table for User
  */
-class m200000_000001_create_table_users extends \yii\db\Migration
+class m200000_000000_create_table_users extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/blog/migrations_maria_db/m200000_000000_create_table_categories.php b/tests/specs/blog/migrations_mysql_db/m200000_000001_create_table_categories.php
similarity index 91%
rename from tests/specs/blog/migrations_maria_db/m200000_000000_create_table_categories.php
rename to tests/specs/blog/migrations_mysql_db/m200000_000001_create_table_categories.php
index 0485cafc..957966fb 100644
--- a/tests/specs/blog/migrations_maria_db/m200000_000000_create_table_categories.php
+++ b/tests/specs/blog/migrations_mysql_db/m200000_000001_create_table_categories.php
@@ -3,7 +3,7 @@
 /**
  * Table for Category
  */
-class m200000_000000_create_table_categories extends \yii\db\Migration
+class m200000_000001_create_table_categories extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/blog/migrations/m200000_000004_create_table_post_comments.php b/tests/specs/blog/migrations_mysql_db/m200000_000003_create_table_post_comments.php
similarity index 93%
rename from tests/specs/blog/migrations/m200000_000004_create_table_post_comments.php
rename to tests/specs/blog/migrations_mysql_db/m200000_000003_create_table_post_comments.php
index c16766da..45b512c3 100644
--- a/tests/specs/blog/migrations/m200000_000004_create_table_post_comments.php
+++ b/tests/specs/blog/migrations_mysql_db/m200000_000003_create_table_post_comments.php
@@ -3,7 +3,7 @@
 /**
  * Table for Comment
  */
-class m200000_000004_create_table_post_comments extends \yii\db\Migration
+class m200000_000003_create_table_post_comments extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/blog/migrations/m200000_000003_create_table_fakerable.php b/tests/specs/blog/migrations_mysql_db/m200000_000004_create_table_fakerable.php
similarity index 95%
rename from tests/specs/blog/migrations/m200000_000003_create_table_fakerable.php
rename to tests/specs/blog/migrations_mysql_db/m200000_000004_create_table_fakerable.php
index 0f3eebad..82c4db07 100644
--- a/tests/specs/blog/migrations/m200000_000003_create_table_fakerable.php
+++ b/tests/specs/blog/migrations_mysql_db/m200000_000004_create_table_fakerable.php
@@ -3,7 +3,7 @@
 /**
  * Table for Fakerable
  */
-class m200000_000003_create_table_fakerable extends \yii\db\Migration
+class m200000_000004_create_table_fakerable extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/blog/migrations_pgsql_db/m200000_000001_create_table_users.php b/tests/specs/blog/migrations_pgsql_db/m200000_000000_create_table_users.php
similarity index 94%
rename from tests/specs/blog/migrations_pgsql_db/m200000_000001_create_table_users.php
rename to tests/specs/blog/migrations_pgsql_db/m200000_000000_create_table_users.php
index e2bc0165..a00af878 100644
--- a/tests/specs/blog/migrations_pgsql_db/m200000_000001_create_table_users.php
+++ b/tests/specs/blog/migrations_pgsql_db/m200000_000000_create_table_users.php
@@ -3,7 +3,7 @@
 /**
  * Table for User
  */
-class m200000_000001_create_table_users extends \yii\db\Migration
+class m200000_000000_create_table_users extends \yii\db\Migration
 {
     public function safeUp()
     {
diff --git a/tests/specs/blog/migrations_pgsql_db/m200000_000000_create_table_categories.php b/tests/specs/blog/migrations_pgsql_db/m200000_000001_create_table_categories.php
similarity index 91%
rename from tests/specs/blog/migrations_pgsql_db/m200000_000000_create_table_categories.php
rename to tests/specs/blog/migrations_pgsql_db/m200000_000001_create_table_categories.php
index 9c328a2d..d99b8299 100644
--- a/tests/specs/blog/migrations_pgsql_db/m200000_000000_create_table_categories.php
+++ b/tests/specs/blog/migrations_pgsql_db/m200000_000001_create_table_categories.php
@@ -3,7 +3,7 @@
 /**
  * Table for Category
  */
-class m200000_000000_create_table_categories extends \yii\db\Migration
+class m200000_000001_create_table_categories extends \yii\db\Migration
 {
     public function safeUp()
     {
diff --git a/tests/specs/blog/migrations_pgsql_db/m200000_000004_create_table_post_comments.php b/tests/specs/blog/migrations_pgsql_db/m200000_000003_create_table_post_comments.php
similarity index 94%
rename from tests/specs/blog/migrations_pgsql_db/m200000_000004_create_table_post_comments.php
rename to tests/specs/blog/migrations_pgsql_db/m200000_000003_create_table_post_comments.php
index 2aa48549..5f31afad 100644
--- a/tests/specs/blog/migrations_pgsql_db/m200000_000004_create_table_post_comments.php
+++ b/tests/specs/blog/migrations_pgsql_db/m200000_000003_create_table_post_comments.php
@@ -3,7 +3,7 @@
 /**
  * Table for Comment
  */
-class m200000_000004_create_table_post_comments extends \yii\db\Migration
+class m200000_000003_create_table_post_comments extends \yii\db\Migration
 {
     public function safeUp()
     {
diff --git a/tests/specs/blog/migrations_pgsql_db/m200000_000003_create_table_fakerable.php b/tests/specs/blog/migrations_pgsql_db/m200000_000004_create_table_fakerable.php
similarity index 95%
rename from tests/specs/blog/migrations_pgsql_db/m200000_000003_create_table_fakerable.php
rename to tests/specs/blog/migrations_pgsql_db/m200000_000004_create_table_fakerable.php
index a42b8954..ae6929cb 100644
--- a/tests/specs/blog/migrations_pgsql_db/m200000_000003_create_table_fakerable.php
+++ b/tests/specs/blog/migrations_pgsql_db/m200000_000004_create_table_fakerable.php
@@ -3,7 +3,7 @@
 /**
  * Table for Fakerable
  */
-class m200000_000003_create_table_fakerable extends \yii\db\Migration
+class m200000_000004_create_table_fakerable extends \yii\db\Migration
 {
     public function safeUp()
     {
diff --git a/tests/specs/many2many/migrations/m200000_000001_create_table_posts.php b/tests/specs/many2many/migrations/m200000_000000_create_table_posts.php
similarity index 82%
rename from tests/specs/many2many/migrations/m200000_000001_create_table_posts.php
rename to tests/specs/many2many/migrations/m200000_000000_create_table_posts.php
index 2d07a0d1..4febc421 100644
--- a/tests/specs/many2many/migrations/m200000_000001_create_table_posts.php
+++ b/tests/specs/many2many/migrations/m200000_000000_create_table_posts.php
@@ -3,7 +3,7 @@
 /**
  * Table for Post
  */
-class m200000_000001_create_table_posts extends \yii\db\Migration
+class m200000_000000_create_table_posts extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/many2many/migrations/m200000_000003_create_table_tags.php b/tests/specs/many2many/migrations/m200000_000001_create_table_tags.php
similarity index 82%
rename from tests/specs/many2many/migrations/m200000_000003_create_table_tags.php
rename to tests/specs/many2many/migrations/m200000_000001_create_table_tags.php
index 253b8513..b78dfe66 100644
--- a/tests/specs/many2many/migrations/m200000_000003_create_table_tags.php
+++ b/tests/specs/many2many/migrations/m200000_000001_create_table_tags.php
@@ -3,7 +3,7 @@
 /**
  * Table for Tag
  */
-class m200000_000003_create_table_tags extends \yii\db\Migration
+class m200000_000001_create_table_tags extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/many2many/migrations/m200000_000004_create_table_posts2tags.php b/tests/specs/many2many/migrations/m200000_000002_create_table_posts2tags.php
similarity index 93%
rename from tests/specs/many2many/migrations/m200000_000004_create_table_posts2tags.php
rename to tests/specs/many2many/migrations/m200000_000002_create_table_posts2tags.php
index dbc82bc3..373e2e65 100644
--- a/tests/specs/many2many/migrations/m200000_000004_create_table_posts2tags.php
+++ b/tests/specs/many2many/migrations/m200000_000002_create_table_posts2tags.php
@@ -3,7 +3,7 @@
 /**
  * Table for Posts2Tags
  */
-class m200000_000004_create_table_posts2tags extends \yii\db\Migration
+class m200000_000002_create_table_posts2tags extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/many2many/migrations/m200000_000000_create_table_photo.php b/tests/specs/many2many/migrations/m200000_000003_create_table_photo.php
similarity index 82%
rename from tests/specs/many2many/migrations/m200000_000000_create_table_photo.php
rename to tests/specs/many2many/migrations/m200000_000003_create_table_photo.php
index 4e578d91..2d783bbf 100644
--- a/tests/specs/many2many/migrations/m200000_000000_create_table_photo.php
+++ b/tests/specs/many2many/migrations/m200000_000003_create_table_photo.php
@@ -3,7 +3,7 @@
 /**
  * Table for Photo
  */
-class m200000_000000_create_table_photo extends \yii\db\Migration
+class m200000_000003_create_table_photo extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/many2many/migrations/m200000_000002_create_table_photos2posts.php b/tests/specs/many2many/migrations/m200000_000004_create_table_photos2posts.php
similarity index 92%
rename from tests/specs/many2many/migrations/m200000_000002_create_table_photos2posts.php
rename to tests/specs/many2many/migrations/m200000_000004_create_table_photos2posts.php
index f10b43a6..b509a525 100644
--- a/tests/specs/many2many/migrations/m200000_000002_create_table_photos2posts.php
+++ b/tests/specs/many2many/migrations/m200000_000004_create_table_photos2posts.php
@@ -3,7 +3,7 @@
 /**
  * Table for Photos2Posts
  */
-class m200000_000002_create_table_photos2posts extends \yii\db\Migration
+class m200000_000004_create_table_photos2posts extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/many2many/migrations/m200000_000006_create_table_posts_gallery.php b/tests/specs/many2many/migrations/m200000_000005_create_table_posts_gallery.php
similarity index 94%
rename from tests/specs/many2many/migrations/m200000_000006_create_table_posts_gallery.php
rename to tests/specs/many2many/migrations/m200000_000005_create_table_posts_gallery.php
index aeb6c64f..fe358e21 100644
--- a/tests/specs/many2many/migrations/m200000_000006_create_table_posts_gallery.php
+++ b/tests/specs/many2many/migrations/m200000_000005_create_table_posts_gallery.php
@@ -3,7 +3,7 @@
 /**
  * Table for PostsGallery
  */
-class m200000_000006_create_table_posts_gallery extends \yii\db\Migration
+class m200000_000005_create_table_posts_gallery extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/many2many/migrations/m200000_000005_create_table_posts_attaches.php b/tests/specs/many2many/migrations/m200000_000006_create_table_posts_attaches.php
similarity index 93%
rename from tests/specs/many2many/migrations/m200000_000005_create_table_posts_attaches.php
rename to tests/specs/many2many/migrations/m200000_000006_create_table_posts_attaches.php
index f5092acb..db479676 100644
--- a/tests/specs/many2many/migrations/m200000_000005_create_table_posts_attaches.php
+++ b/tests/specs/many2many/migrations/m200000_000006_create_table_posts_attaches.php
@@ -3,7 +3,7 @@
 /**
  * Table for PostsAttaches
  */
-class m200000_000005_create_table_posts_attaches extends \yii\db\Migration
+class m200000_000006_create_table_posts_attaches extends \yii\db\Migration
 {
     public function up()
     {

From 3a1499b37cc587639d2dbcce2122ad46c9e9b655 Mon Sep 17 00:00:00 2001
From: Sohel Ahmed Mesaniya <sam.wankaner@gmail.com>
Date: Fri, 21 Jun 2024 20:31:02 +0530
Subject: [PATCH 29/71] Fix another failing tests -
 NewColumnPositionTest::testAddOneNewColumnAtFirstPosition

---
 .../migrations_maria_db/m200000_000000_change_table_fruits.php} | 2 +-
 ...able_fruit2s.php => m200000_000001_change_table_fruit2s.php} | 2 +-
 ...able_twocols.php => m200000_000002_change_table_twocols.php} | 2 +-
 ...le_twocol2s.php => m200000_000003_change_table_twocol2s.php} | 2 +-
 ...stcols.php => m200000_000004_change_table_dropfirstcols.php} | 2 +-
 ...ols.php => m200000_000005_change_table_dropfirsttwocols.php} | 2 +-
 ...p => m200000_000006_change_table_addtwonewcolinbetweens.php} | 2 +-
 ... => m200000_000007_change_table_addtwonewcolinbetween2s.php} | 2 +-
 ...sts.php => m200000_000008_change_table_twonewcolatlasts.php} | 2 +-
 ...2s.php => m200000_000009_change_table_twonewcolatlast2s.php} | 2 +-
 .../migrations_mysql_db/m200000_000000_change_table_fruits.php} | 2 +-
 ...able_fruit2s.php => m200000_000001_change_table_fruit2s.php} | 2 +-
 ...able_twocols.php => m200000_000002_change_table_twocols.php} | 2 +-
 ...le_twocol2s.php => m200000_000003_change_table_twocol2s.php} | 2 +-
 ...stcols.php => m200000_000004_change_table_dropfirstcols.php} | 2 +-
 ...ols.php => m200000_000005_change_table_dropfirsttwocols.php} | 2 +-
 ...p => m200000_000006_change_table_addtwonewcolinbetweens.php} | 2 +-
 ... => m200000_000007_change_table_addtwonewcolinbetween2s.php} | 2 +-
 ...sts.php => m200000_000008_change_table_twonewcolatlasts.php} | 2 +-
 ...2s.php => m200000_000009_change_table_twonewcolatlast2s.php} | 2 +-
 20 files changed, 20 insertions(+), 20 deletions(-)
 rename tests/specs/new_column_position/{mysql/app/migrations_mysql_db/m200000_000005_change_table_fruits.php => maria/app/migrations_maria_db/m200000_000000_change_table_fruits.php} (79%)
 rename tests/specs/new_column_position/maria/app/migrations_maria_db/{m200000_000004_change_table_fruit2s.php => m200000_000001_change_table_fruit2s.php} (81%)
 rename tests/specs/new_column_position/maria/app/migrations_maria_db/{m200000_000007_change_table_twocols.php => m200000_000002_change_table_twocols.php} (87%)
 rename tests/specs/new_column_position/maria/app/migrations_maria_db/{m200000_000006_change_table_twocol2s.php => m200000_000003_change_table_twocol2s.php} (88%)
 rename tests/specs/new_column_position/maria/app/migrations_maria_db/{m200000_000002_change_table_dropfirstcols.php => m200000_000004_change_table_dropfirstcols.php} (82%)
 rename tests/specs/new_column_position/maria/app/migrations_maria_db/{m200000_000003_change_table_dropfirsttwocols.php => m200000_000005_change_table_dropfirsttwocols.php} (88%)
 rename tests/specs/new_column_position/maria/app/migrations_maria_db/{m200000_000001_change_table_addtwonewcolinbetweens.php => m200000_000006_change_table_addtwonewcolinbetweens.php} (92%)
 rename tests/specs/new_column_position/maria/app/migrations_maria_db/{m200000_000000_change_table_addtwonewcolinbetween2s.php => m200000_000007_change_table_addtwonewcolinbetween2s.php} (92%)
 rename tests/specs/new_column_position/maria/app/migrations_maria_db/{m200000_000009_change_table_twonewcolatlasts.php => m200000_000008_change_table_twonewcolatlasts.php} (88%)
 rename tests/specs/new_column_position/maria/app/migrations_maria_db/{m200000_000008_change_table_twonewcolatlast2s.php => m200000_000009_change_table_twonewcolatlast2s.php} (89%)
 rename tests/specs/new_column_position/{maria/app/migrations_maria_db/m200000_000005_change_table_fruits.php => mysql/app/migrations_mysql_db/m200000_000000_change_table_fruits.php} (79%)
 rename tests/specs/new_column_position/mysql/app/migrations_mysql_db/{m200000_000004_change_table_fruit2s.php => m200000_000001_change_table_fruit2s.php} (81%)
 rename tests/specs/new_column_position/mysql/app/migrations_mysql_db/{m200000_000007_change_table_twocols.php => m200000_000002_change_table_twocols.php} (86%)
 rename tests/specs/new_column_position/mysql/app/migrations_mysql_db/{m200000_000006_change_table_twocol2s.php => m200000_000003_change_table_twocol2s.php} (87%)
 rename tests/specs/new_column_position/mysql/app/migrations_mysql_db/{m200000_000002_change_table_dropfirstcols.php => m200000_000004_change_table_dropfirstcols.php} (81%)
 rename tests/specs/new_column_position/mysql/app/migrations_mysql_db/{m200000_000003_change_table_dropfirsttwocols.php => m200000_000005_change_table_dropfirsttwocols.php} (87%)
 rename tests/specs/new_column_position/mysql/app/migrations_mysql_db/{m200000_000001_change_table_addtwonewcolinbetweens.php => m200000_000006_change_table_addtwonewcolinbetweens.php} (91%)
 rename tests/specs/new_column_position/mysql/app/migrations_mysql_db/{m200000_000000_change_table_addtwonewcolinbetween2s.php => m200000_000007_change_table_addtwonewcolinbetween2s.php} (92%)
 rename tests/specs/new_column_position/mysql/app/migrations_mysql_db/{m200000_000009_change_table_twonewcolatlasts.php => m200000_000008_change_table_twonewcolatlasts.php} (88%)
 rename tests/specs/new_column_position/mysql/app/migrations_mysql_db/{m200000_000008_change_table_twonewcolatlast2s.php => m200000_000009_change_table_twonewcolatlast2s.php} (88%)

diff --git a/tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000005_change_table_fruits.php b/tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000000_change_table_fruits.php
similarity index 79%
rename from tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000005_change_table_fruits.php
rename to tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000000_change_table_fruits.php
index 8accdd87..2cb90b8e 100644
--- a/tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000005_change_table_fruits.php
+++ b/tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000000_change_table_fruits.php
@@ -3,7 +3,7 @@
 /**
  * Table for Fruit
  */
-class m200000_000005_change_table_fruits extends \yii\db\Migration
+class m200000_000000_change_table_fruits extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000004_change_table_fruit2s.php b/tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000001_change_table_fruit2s.php
similarity index 81%
rename from tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000004_change_table_fruit2s.php
rename to tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000001_change_table_fruit2s.php
index 68bfd09e..547fdbf2 100644
--- a/tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000004_change_table_fruit2s.php
+++ b/tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000001_change_table_fruit2s.php
@@ -3,7 +3,7 @@
 /**
  * Table for Fruit2
  */
-class m200000_000004_change_table_fruit2s extends \yii\db\Migration
+class m200000_000001_change_table_fruit2s extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000007_change_table_twocols.php b/tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000002_change_table_twocols.php
similarity index 87%
rename from tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000007_change_table_twocols.php
rename to tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000002_change_table_twocols.php
index d63f7443..0ee4668e 100644
--- a/tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000007_change_table_twocols.php
+++ b/tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000002_change_table_twocols.php
@@ -3,7 +3,7 @@
 /**
  * Table for Twocol
  */
-class m200000_000007_change_table_twocols extends \yii\db\Migration
+class m200000_000002_change_table_twocols extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000006_change_table_twocol2s.php b/tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000003_change_table_twocol2s.php
similarity index 88%
rename from tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000006_change_table_twocol2s.php
rename to tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000003_change_table_twocol2s.php
index 45325e91..94f91d2f 100644
--- a/tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000006_change_table_twocol2s.php
+++ b/tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000003_change_table_twocol2s.php
@@ -3,7 +3,7 @@
 /**
  * Table for Twocol2
  */
-class m200000_000006_change_table_twocol2s extends \yii\db\Migration
+class m200000_000003_change_table_twocol2s extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000002_change_table_dropfirstcols.php b/tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000004_change_table_dropfirstcols.php
similarity index 82%
rename from tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000002_change_table_dropfirstcols.php
rename to tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000004_change_table_dropfirstcols.php
index 56f0692d..a6fcdbb9 100644
--- a/tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000002_change_table_dropfirstcols.php
+++ b/tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000004_change_table_dropfirstcols.php
@@ -3,7 +3,7 @@
 /**
  * Table for Dropfirstcol
  */
-class m200000_000002_change_table_dropfirstcols extends \yii\db\Migration
+class m200000_000004_change_table_dropfirstcols extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000003_change_table_dropfirsttwocols.php b/tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000005_change_table_dropfirsttwocols.php
similarity index 88%
rename from tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000003_change_table_dropfirsttwocols.php
rename to tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000005_change_table_dropfirsttwocols.php
index 89ef1937..9d438149 100644
--- a/tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000003_change_table_dropfirsttwocols.php
+++ b/tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000005_change_table_dropfirsttwocols.php
@@ -3,7 +3,7 @@
 /**
  * Table for Dropfirsttwocol
  */
-class m200000_000003_change_table_dropfirsttwocols extends \yii\db\Migration
+class m200000_000005_change_table_dropfirsttwocols extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000001_change_table_addtwonewcolinbetweens.php b/tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000006_change_table_addtwonewcolinbetweens.php
similarity index 92%
rename from tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000001_change_table_addtwonewcolinbetweens.php
rename to tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000006_change_table_addtwonewcolinbetweens.php
index b9648922..62790337 100644
--- a/tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000001_change_table_addtwonewcolinbetweens.php
+++ b/tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000006_change_table_addtwonewcolinbetweens.php
@@ -3,7 +3,7 @@
 /**
  * Table for Addtwonewcolinbetweens
  */
-class m200000_000001_change_table_addtwonewcolinbetweens extends \yii\db\Migration
+class m200000_000006_change_table_addtwonewcolinbetweens extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000000_change_table_addtwonewcolinbetween2s.php b/tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000007_change_table_addtwonewcolinbetween2s.php
similarity index 92%
rename from tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000000_change_table_addtwonewcolinbetween2s.php
rename to tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000007_change_table_addtwonewcolinbetween2s.php
index 544d1084..002a045e 100644
--- a/tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000000_change_table_addtwonewcolinbetween2s.php
+++ b/tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000007_change_table_addtwonewcolinbetween2s.php
@@ -3,7 +3,7 @@
 /**
  * Table for Addtwonewcolinbetween2s
  */
-class m200000_000000_change_table_addtwonewcolinbetween2s extends \yii\db\Migration
+class m200000_000007_change_table_addtwonewcolinbetween2s extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000009_change_table_twonewcolatlasts.php b/tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000008_change_table_twonewcolatlasts.php
similarity index 88%
rename from tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000009_change_table_twonewcolatlasts.php
rename to tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000008_change_table_twonewcolatlasts.php
index 0a332d7a..307f1375 100644
--- a/tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000009_change_table_twonewcolatlasts.php
+++ b/tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000008_change_table_twonewcolatlasts.php
@@ -3,7 +3,7 @@
 /**
  * Table for Twonewcolatlast
  */
-class m200000_000009_change_table_twonewcolatlasts extends \yii\db\Migration
+class m200000_000008_change_table_twonewcolatlasts extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000008_change_table_twonewcolatlast2s.php b/tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000009_change_table_twonewcolatlast2s.php
similarity index 89%
rename from tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000008_change_table_twonewcolatlast2s.php
rename to tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000009_change_table_twonewcolatlast2s.php
index 0a88452d..51db951e 100644
--- a/tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000008_change_table_twonewcolatlast2s.php
+++ b/tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000009_change_table_twonewcolatlast2s.php
@@ -3,7 +3,7 @@
 /**
  * Table for Twonewcolatlast2
  */
-class m200000_000008_change_table_twonewcolatlast2s extends \yii\db\Migration
+class m200000_000009_change_table_twonewcolatlast2s extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000005_change_table_fruits.php b/tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000000_change_table_fruits.php
similarity index 79%
rename from tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000005_change_table_fruits.php
rename to tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000000_change_table_fruits.php
index 8accdd87..2cb90b8e 100644
--- a/tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000005_change_table_fruits.php
+++ b/tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000000_change_table_fruits.php
@@ -3,7 +3,7 @@
 /**
  * Table for Fruit
  */
-class m200000_000005_change_table_fruits extends \yii\db\Migration
+class m200000_000000_change_table_fruits extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000004_change_table_fruit2s.php b/tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000001_change_table_fruit2s.php
similarity index 81%
rename from tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000004_change_table_fruit2s.php
rename to tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000001_change_table_fruit2s.php
index 68bfd09e..547fdbf2 100644
--- a/tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000004_change_table_fruit2s.php
+++ b/tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000001_change_table_fruit2s.php
@@ -3,7 +3,7 @@
 /**
  * Table for Fruit2
  */
-class m200000_000004_change_table_fruit2s extends \yii\db\Migration
+class m200000_000001_change_table_fruit2s extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000007_change_table_twocols.php b/tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000002_change_table_twocols.php
similarity index 86%
rename from tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000007_change_table_twocols.php
rename to tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000002_change_table_twocols.php
index 33c954e0..d49b200e 100644
--- a/tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000007_change_table_twocols.php
+++ b/tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000002_change_table_twocols.php
@@ -3,7 +3,7 @@
 /**
  * Table for Twocol
  */
-class m200000_000007_change_table_twocols extends \yii\db\Migration
+class m200000_000002_change_table_twocols extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000006_change_table_twocol2s.php b/tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000003_change_table_twocol2s.php
similarity index 87%
rename from tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000006_change_table_twocol2s.php
rename to tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000003_change_table_twocol2s.php
index 40e3d693..05585780 100644
--- a/tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000006_change_table_twocol2s.php
+++ b/tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000003_change_table_twocol2s.php
@@ -3,7 +3,7 @@
 /**
  * Table for Twocol2
  */
-class m200000_000006_change_table_twocol2s extends \yii\db\Migration
+class m200000_000003_change_table_twocol2s extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000002_change_table_dropfirstcols.php b/tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000004_change_table_dropfirstcols.php
similarity index 81%
rename from tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000002_change_table_dropfirstcols.php
rename to tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000004_change_table_dropfirstcols.php
index 4ae589d3..a103bad4 100644
--- a/tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000002_change_table_dropfirstcols.php
+++ b/tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000004_change_table_dropfirstcols.php
@@ -3,7 +3,7 @@
 /**
  * Table for Dropfirstcol
  */
-class m200000_000002_change_table_dropfirstcols extends \yii\db\Migration
+class m200000_000004_change_table_dropfirstcols extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000003_change_table_dropfirsttwocols.php b/tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000005_change_table_dropfirsttwocols.php
similarity index 87%
rename from tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000003_change_table_dropfirsttwocols.php
rename to tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000005_change_table_dropfirsttwocols.php
index aaa54835..482bfa72 100644
--- a/tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000003_change_table_dropfirsttwocols.php
+++ b/tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000005_change_table_dropfirsttwocols.php
@@ -3,7 +3,7 @@
 /**
  * Table for Dropfirsttwocol
  */
-class m200000_000003_change_table_dropfirsttwocols extends \yii\db\Migration
+class m200000_000005_change_table_dropfirsttwocols extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000001_change_table_addtwonewcolinbetweens.php b/tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000006_change_table_addtwonewcolinbetweens.php
similarity index 91%
rename from tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000001_change_table_addtwonewcolinbetweens.php
rename to tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000006_change_table_addtwonewcolinbetweens.php
index 355597ac..963c74dc 100644
--- a/tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000001_change_table_addtwonewcolinbetweens.php
+++ b/tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000006_change_table_addtwonewcolinbetweens.php
@@ -3,7 +3,7 @@
 /**
  * Table for Addtwonewcolinbetweens
  */
-class m200000_000001_change_table_addtwonewcolinbetweens extends \yii\db\Migration
+class m200000_000006_change_table_addtwonewcolinbetweens extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000000_change_table_addtwonewcolinbetween2s.php b/tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000007_change_table_addtwonewcolinbetween2s.php
similarity index 92%
rename from tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000000_change_table_addtwonewcolinbetween2s.php
rename to tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000007_change_table_addtwonewcolinbetween2s.php
index 7d4f8bfa..7fc2bd8d 100644
--- a/tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000000_change_table_addtwonewcolinbetween2s.php
+++ b/tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000007_change_table_addtwonewcolinbetween2s.php
@@ -3,7 +3,7 @@
 /**
  * Table for Addtwonewcolinbetween2s
  */
-class m200000_000000_change_table_addtwonewcolinbetween2s extends \yii\db\Migration
+class m200000_000007_change_table_addtwonewcolinbetween2s extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000009_change_table_twonewcolatlasts.php b/tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000008_change_table_twonewcolatlasts.php
similarity index 88%
rename from tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000009_change_table_twonewcolatlasts.php
rename to tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000008_change_table_twonewcolatlasts.php
index 0a332d7a..307f1375 100644
--- a/tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000009_change_table_twonewcolatlasts.php
+++ b/tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000008_change_table_twonewcolatlasts.php
@@ -3,7 +3,7 @@
 /**
  * Table for Twonewcolatlast
  */
-class m200000_000009_change_table_twonewcolatlasts extends \yii\db\Migration
+class m200000_000008_change_table_twonewcolatlasts extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000008_change_table_twonewcolatlast2s.php b/tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000009_change_table_twonewcolatlast2s.php
similarity index 88%
rename from tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000008_change_table_twonewcolatlast2s.php
rename to tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000009_change_table_twonewcolatlast2s.php
index 60931d95..85dbdb59 100644
--- a/tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000008_change_table_twonewcolatlast2s.php
+++ b/tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000009_change_table_twonewcolatlast2s.php
@@ -3,7 +3,7 @@
 /**
  * Table for Twonewcolatlast2
  */
-class m200000_000008_change_table_twonewcolatlast2s extends \yii\db\Migration
+class m200000_000009_change_table_twonewcolatlast2s extends \yii\db\Migration
 {
     public function up()
     {

From a4dc0a46b749b2ed7e5373a5f976cce5f6888548 Mon Sep 17 00:00:00 2001
From: Sohel Ahmed Mesaniya <sam.wankaner@gmail.com>
Date: Fri, 21 Jun 2024 20:38:10 +0530
Subject: [PATCH 30/71] Fix another failing tests -
 MultiDbSecondaryMigrationTest

---
 ..._v2_users.php => m200000_000000_change_table_v2_users.php} | 2 +-
 .../m200000_000001_change_table_v2_categories.php}            | 2 +-
 ..._v2_posts.php => m200000_000002_change_table_v2_posts.php} | 2 +-
 .../m200000_000003_create_table_v2_tags.php}                  | 2 +-
 ...ts2tags.php => m200000_000004_create_table_posts2tags.php} | 2 +-
 ..._v2_users.php => m200000_000000_change_table_v2_users.php} | 2 +-
 .../m200000_000001_change_table_v2_categories.php}            | 2 +-
 ..._v2_posts.php => m200000_000002_change_table_v2_posts.php} | 2 +-
 .../m200000_000003_create_table_v2_tags.php}                  | 2 +-
 ...ts2tags.php => m200000_000004_create_table_posts2tags.php} | 2 +-
 .../m200000_000005_change_table_v2_comments.php               | 4 ++--
 ..._v2_users.php => m200000_000000_change_table_v2_users.php} | 2 +-
 ...ries.php => m200000_000001_change_table_v2_categories.php} | 2 +-
 ..._v2_posts.php => m200000_000002_change_table_v2_posts.php} | 2 +-
 ...le_v2_tags.php => m200000_000003_create_table_v2_tags.php} | 2 +-
 ...ts2tags.php => m200000_000004_create_table_posts2tags.php} | 2 +-
 16 files changed, 17 insertions(+), 17 deletions(-)
 rename tests/specs/blog_v2/migrations_maria_db/{m200000_000004_change_table_v2_users.php => m200000_000000_change_table_v2_users.php} (95%)
 rename tests/specs/blog_v2/{migrations_mysql_db/m200000_000003_change_table_v2_categories.php => migrations_maria_db/m200000_000001_change_table_v2_categories.php} (94%)
 rename tests/specs/blog_v2/migrations_maria_db/{m200000_000000_change_table_v2_posts.php => m200000_000002_change_table_v2_posts.php} (95%)
 rename tests/specs/blog_v2/{migrations_mysql_db/m200000_000001_create_table_v2_tags.php => migrations_maria_db/m200000_000003_create_table_v2_tags.php} (88%)
 rename tests/specs/blog_v2/migrations_maria_db/{m200000_000002_create_table_posts2tags.php => m200000_000004_create_table_posts2tags.php} (93%)
 rename tests/specs/blog_v2/migrations_mysql_db/{m200000_000004_change_table_v2_users.php => m200000_000000_change_table_v2_users.php} (95%)
 rename tests/specs/blog_v2/{migrations_maria_db/m200000_000003_change_table_v2_categories.php => migrations_mysql_db/m200000_000001_change_table_v2_categories.php} (94%)
 rename tests/specs/blog_v2/migrations_mysql_db/{m200000_000000_change_table_v2_posts.php => m200000_000002_change_table_v2_posts.php} (95%)
 rename tests/specs/blog_v2/{migrations_maria_db/m200000_000001_create_table_v2_tags.php => migrations_mysql_db/m200000_000003_create_table_v2_tags.php} (88%)
 rename tests/specs/blog_v2/migrations_mysql_db/{m200000_000002_create_table_posts2tags.php => m200000_000004_create_table_posts2tags.php} (93%)
 rename tests/specs/blog_v2/migrations_pgsql_db/{m200000_000004_change_table_v2_users.php => m200000_000000_change_table_v2_users.php} (96%)
 rename tests/specs/blog_v2/migrations_pgsql_db/{m200000_000003_change_table_v2_categories.php => m200000_000001_change_table_v2_categories.php} (93%)
 rename tests/specs/blog_v2/migrations_pgsql_db/{m200000_000000_change_table_v2_posts.php => m200000_000002_change_table_v2_posts.php} (95%)
 rename tests/specs/blog_v2/migrations_pgsql_db/{m200000_000001_create_table_v2_tags.php => m200000_000003_create_table_v2_tags.php} (91%)
 rename tests/specs/blog_v2/migrations_pgsql_db/{m200000_000002_create_table_posts2tags.php => m200000_000004_create_table_posts2tags.php} (93%)

diff --git a/tests/specs/blog_v2/migrations_maria_db/m200000_000004_change_table_v2_users.php b/tests/specs/blog_v2/migrations_maria_db/m200000_000000_change_table_v2_users.php
similarity index 95%
rename from tests/specs/blog_v2/migrations_maria_db/m200000_000004_change_table_v2_users.php
rename to tests/specs/blog_v2/migrations_maria_db/m200000_000000_change_table_v2_users.php
index bf1c82fd..4a946df2 100644
--- a/tests/specs/blog_v2/migrations_maria_db/m200000_000004_change_table_v2_users.php
+++ b/tests/specs/blog_v2/migrations_maria_db/m200000_000000_change_table_v2_users.php
@@ -3,7 +3,7 @@
 /**
  * Table for User
  */
-class m200000_000004_change_table_v2_users extends \yii\db\Migration
+class m200000_000000_change_table_v2_users extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/blog_v2/migrations_mysql_db/m200000_000003_change_table_v2_categories.php b/tests/specs/blog_v2/migrations_maria_db/m200000_000001_change_table_v2_categories.php
similarity index 94%
rename from tests/specs/blog_v2/migrations_mysql_db/m200000_000003_change_table_v2_categories.php
rename to tests/specs/blog_v2/migrations_maria_db/m200000_000001_change_table_v2_categories.php
index e608ed52..c488ec52 100644
--- a/tests/specs/blog_v2/migrations_mysql_db/m200000_000003_change_table_v2_categories.php
+++ b/tests/specs/blog_v2/migrations_maria_db/m200000_000001_change_table_v2_categories.php
@@ -3,7 +3,7 @@
 /**
  * Table for Category
  */
-class m200000_000003_change_table_v2_categories extends \yii\db\Migration
+class m200000_000001_change_table_v2_categories extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/blog_v2/migrations_maria_db/m200000_000000_change_table_v2_posts.php b/tests/specs/blog_v2/migrations_maria_db/m200000_000002_change_table_v2_posts.php
similarity index 95%
rename from tests/specs/blog_v2/migrations_maria_db/m200000_000000_change_table_v2_posts.php
rename to tests/specs/blog_v2/migrations_maria_db/m200000_000002_change_table_v2_posts.php
index 5c43dabf..f8790fd3 100644
--- a/tests/specs/blog_v2/migrations_maria_db/m200000_000000_change_table_v2_posts.php
+++ b/tests/specs/blog_v2/migrations_maria_db/m200000_000002_change_table_v2_posts.php
@@ -3,7 +3,7 @@
 /**
  * Table for Post
  */
-class m200000_000000_change_table_v2_posts extends \yii\db\Migration
+class m200000_000002_change_table_v2_posts extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/blog_v2/migrations_mysql_db/m200000_000001_create_table_v2_tags.php b/tests/specs/blog_v2/migrations_maria_db/m200000_000003_create_table_v2_tags.php
similarity index 88%
rename from tests/specs/blog_v2/migrations_mysql_db/m200000_000001_create_table_v2_tags.php
rename to tests/specs/blog_v2/migrations_maria_db/m200000_000003_create_table_v2_tags.php
index 1e671e96..5ed6326c 100644
--- a/tests/specs/blog_v2/migrations_mysql_db/m200000_000001_create_table_v2_tags.php
+++ b/tests/specs/blog_v2/migrations_maria_db/m200000_000003_create_table_v2_tags.php
@@ -3,7 +3,7 @@
 /**
  * Table for Tag
  */
-class m200000_000001_create_table_v2_tags extends \yii\db\Migration
+class m200000_000003_create_table_v2_tags extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/blog_v2/migrations_maria_db/m200000_000002_create_table_posts2tags.php b/tests/specs/blog_v2/migrations_maria_db/m200000_000004_create_table_posts2tags.php
similarity index 93%
rename from tests/specs/blog_v2/migrations_maria_db/m200000_000002_create_table_posts2tags.php
rename to tests/specs/blog_v2/migrations_maria_db/m200000_000004_create_table_posts2tags.php
index 2e959d10..9e50b861 100644
--- a/tests/specs/blog_v2/migrations_maria_db/m200000_000002_create_table_posts2tags.php
+++ b/tests/specs/blog_v2/migrations_maria_db/m200000_000004_create_table_posts2tags.php
@@ -3,7 +3,7 @@
 /**
  * Table for Posts2Tags
  */
-class m200000_000002_create_table_posts2tags extends \yii\db\Migration
+class m200000_000004_create_table_posts2tags extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/blog_v2/migrations_mysql_db/m200000_000004_change_table_v2_users.php b/tests/specs/blog_v2/migrations_mysql_db/m200000_000000_change_table_v2_users.php
similarity index 95%
rename from tests/specs/blog_v2/migrations_mysql_db/m200000_000004_change_table_v2_users.php
rename to tests/specs/blog_v2/migrations_mysql_db/m200000_000000_change_table_v2_users.php
index b7a1f5e3..23a2e3b1 100644
--- a/tests/specs/blog_v2/migrations_mysql_db/m200000_000004_change_table_v2_users.php
+++ b/tests/specs/blog_v2/migrations_mysql_db/m200000_000000_change_table_v2_users.php
@@ -3,7 +3,7 @@
 /**
  * Table for User
  */
-class m200000_000004_change_table_v2_users extends \yii\db\Migration
+class m200000_000000_change_table_v2_users extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/blog_v2/migrations_maria_db/m200000_000003_change_table_v2_categories.php b/tests/specs/blog_v2/migrations_mysql_db/m200000_000001_change_table_v2_categories.php
similarity index 94%
rename from tests/specs/blog_v2/migrations_maria_db/m200000_000003_change_table_v2_categories.php
rename to tests/specs/blog_v2/migrations_mysql_db/m200000_000001_change_table_v2_categories.php
index e608ed52..c488ec52 100644
--- a/tests/specs/blog_v2/migrations_maria_db/m200000_000003_change_table_v2_categories.php
+++ b/tests/specs/blog_v2/migrations_mysql_db/m200000_000001_change_table_v2_categories.php
@@ -3,7 +3,7 @@
 /**
  * Table for Category
  */
-class m200000_000003_change_table_v2_categories extends \yii\db\Migration
+class m200000_000001_change_table_v2_categories extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/blog_v2/migrations_mysql_db/m200000_000000_change_table_v2_posts.php b/tests/specs/blog_v2/migrations_mysql_db/m200000_000002_change_table_v2_posts.php
similarity index 95%
rename from tests/specs/blog_v2/migrations_mysql_db/m200000_000000_change_table_v2_posts.php
rename to tests/specs/blog_v2/migrations_mysql_db/m200000_000002_change_table_v2_posts.php
index be309829..d3b7fc2b 100644
--- a/tests/specs/blog_v2/migrations_mysql_db/m200000_000000_change_table_v2_posts.php
+++ b/tests/specs/blog_v2/migrations_mysql_db/m200000_000002_change_table_v2_posts.php
@@ -3,7 +3,7 @@
 /**
  * Table for Post
  */
-class m200000_000000_change_table_v2_posts extends \yii\db\Migration
+class m200000_000002_change_table_v2_posts extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/blog_v2/migrations_maria_db/m200000_000001_create_table_v2_tags.php b/tests/specs/blog_v2/migrations_mysql_db/m200000_000003_create_table_v2_tags.php
similarity index 88%
rename from tests/specs/blog_v2/migrations_maria_db/m200000_000001_create_table_v2_tags.php
rename to tests/specs/blog_v2/migrations_mysql_db/m200000_000003_create_table_v2_tags.php
index 1e671e96..5ed6326c 100644
--- a/tests/specs/blog_v2/migrations_maria_db/m200000_000001_create_table_v2_tags.php
+++ b/tests/specs/blog_v2/migrations_mysql_db/m200000_000003_create_table_v2_tags.php
@@ -3,7 +3,7 @@
 /**
  * Table for Tag
  */
-class m200000_000001_create_table_v2_tags extends \yii\db\Migration
+class m200000_000003_create_table_v2_tags extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/blog_v2/migrations_mysql_db/m200000_000002_create_table_posts2tags.php b/tests/specs/blog_v2/migrations_mysql_db/m200000_000004_create_table_posts2tags.php
similarity index 93%
rename from tests/specs/blog_v2/migrations_mysql_db/m200000_000002_create_table_posts2tags.php
rename to tests/specs/blog_v2/migrations_mysql_db/m200000_000004_create_table_posts2tags.php
index 2e959d10..9e50b861 100644
--- a/tests/specs/blog_v2/migrations_mysql_db/m200000_000002_create_table_posts2tags.php
+++ b/tests/specs/blog_v2/migrations_mysql_db/m200000_000004_create_table_posts2tags.php
@@ -3,7 +3,7 @@
 /**
  * Table for Posts2Tags
  */
-class m200000_000002_create_table_posts2tags extends \yii\db\Migration
+class m200000_000004_create_table_posts2tags extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/blog_v2/migrations_mysql_db/m200000_000005_change_table_v2_comments.php b/tests/specs/blog_v2/migrations_mysql_db/m200000_000005_change_table_v2_comments.php
index 475a2639..d53d0505 100644
--- a/tests/specs/blog_v2/migrations_mysql_db/m200000_000005_change_table_v2_comments.php
+++ b/tests/specs/blog_v2/migrations_mysql_db/m200000_000005_change_table_v2_comments.php
@@ -7,8 +7,8 @@ class m200000_000005_change_table_v2_comments extends \yii\db\Migration
 {
     public function up()
     {
-        $this->dropForeignKey('fk_v2_comments_post_id_v2_posts_uid', '{{%v2_comments}}');
         $this->dropForeignKey('fk_v2_comments_author_id_v2_users_id', '{{%v2_comments}}');
+        $this->dropForeignKey('fk_v2_comments_post_id_v2_posts_uid', '{{%v2_comments}}');
         $this->addColumn('{{%v2_comments}}', 'user_id', $this->bigInteger()->null()->defaultValue(null)->after('post_id'));
         $this->dropColumn('{{%v2_comments}}', 'author_id');
         $this->alterColumn('{{%v2_comments}}', 'message', $this->text()->notNull());
@@ -27,7 +27,7 @@ public function down()
         $this->alterColumn('{{%v2_comments}}', 'message', 'json NOT NULL');
         $this->addColumn('{{%v2_comments}}', 'author_id', $this->integer()->notNull());
         $this->dropColumn('{{%v2_comments}}', 'user_id');
-        $this->addForeignKey('fk_v2_comments_author_id_v2_users_id', '{{%v2_comments}}', 'author_id', 'itt_v2_users', 'id');
         $this->addForeignKey('fk_v2_comments_post_id_v2_posts_uid', '{{%v2_comments}}', 'post_id', 'itt_v2_posts', 'uid');
+        $this->addForeignKey('fk_v2_comments_author_id_v2_users_id', '{{%v2_comments}}', 'author_id', 'itt_v2_users', 'id');
     }
 }
diff --git a/tests/specs/blog_v2/migrations_pgsql_db/m200000_000004_change_table_v2_users.php b/tests/specs/blog_v2/migrations_pgsql_db/m200000_000000_change_table_v2_users.php
similarity index 96%
rename from tests/specs/blog_v2/migrations_pgsql_db/m200000_000004_change_table_v2_users.php
rename to tests/specs/blog_v2/migrations_pgsql_db/m200000_000000_change_table_v2_users.php
index a57ea8df..cb77b61d 100644
--- a/tests/specs/blog_v2/migrations_pgsql_db/m200000_000004_change_table_v2_users.php
+++ b/tests/specs/blog_v2/migrations_pgsql_db/m200000_000000_change_table_v2_users.php
@@ -3,7 +3,7 @@
 /**
  * Table for User
  */
-class m200000_000004_change_table_v2_users extends \yii\db\Migration
+class m200000_000000_change_table_v2_users extends \yii\db\Migration
 {
     public function safeUp()
     {
diff --git a/tests/specs/blog_v2/migrations_pgsql_db/m200000_000003_change_table_v2_categories.php b/tests/specs/blog_v2/migrations_pgsql_db/m200000_000001_change_table_v2_categories.php
similarity index 93%
rename from tests/specs/blog_v2/migrations_pgsql_db/m200000_000003_change_table_v2_categories.php
rename to tests/specs/blog_v2/migrations_pgsql_db/m200000_000001_change_table_v2_categories.php
index 5f934936..9c307743 100644
--- a/tests/specs/blog_v2/migrations_pgsql_db/m200000_000003_change_table_v2_categories.php
+++ b/tests/specs/blog_v2/migrations_pgsql_db/m200000_000001_change_table_v2_categories.php
@@ -3,7 +3,7 @@
 /**
  * Table for Category
  */
-class m200000_000003_change_table_v2_categories extends \yii\db\Migration
+class m200000_000001_change_table_v2_categories extends \yii\db\Migration
 {
     public function safeUp()
     {
diff --git a/tests/specs/blog_v2/migrations_pgsql_db/m200000_000000_change_table_v2_posts.php b/tests/specs/blog_v2/migrations_pgsql_db/m200000_000002_change_table_v2_posts.php
similarity index 95%
rename from tests/specs/blog_v2/migrations_pgsql_db/m200000_000000_change_table_v2_posts.php
rename to tests/specs/blog_v2/migrations_pgsql_db/m200000_000002_change_table_v2_posts.php
index 5188983b..474c6c82 100644
--- a/tests/specs/blog_v2/migrations_pgsql_db/m200000_000000_change_table_v2_posts.php
+++ b/tests/specs/blog_v2/migrations_pgsql_db/m200000_000002_change_table_v2_posts.php
@@ -3,7 +3,7 @@
 /**
  * Table for Post
  */
-class m200000_000000_change_table_v2_posts extends \yii\db\Migration
+class m200000_000002_change_table_v2_posts extends \yii\db\Migration
 {
     public function safeUp()
     {
diff --git a/tests/specs/blog_v2/migrations_pgsql_db/m200000_000001_create_table_v2_tags.php b/tests/specs/blog_v2/migrations_pgsql_db/m200000_000003_create_table_v2_tags.php
similarity index 91%
rename from tests/specs/blog_v2/migrations_pgsql_db/m200000_000001_create_table_v2_tags.php
rename to tests/specs/blog_v2/migrations_pgsql_db/m200000_000003_create_table_v2_tags.php
index 2466cff0..45593cfa 100644
--- a/tests/specs/blog_v2/migrations_pgsql_db/m200000_000001_create_table_v2_tags.php
+++ b/tests/specs/blog_v2/migrations_pgsql_db/m200000_000003_create_table_v2_tags.php
@@ -3,7 +3,7 @@
 /**
  * Table for Tag
  */
-class m200000_000001_create_table_v2_tags extends \yii\db\Migration
+class m200000_000003_create_table_v2_tags extends \yii\db\Migration
 {
     public function safeUp()
     {
diff --git a/tests/specs/blog_v2/migrations_pgsql_db/m200000_000002_create_table_posts2tags.php b/tests/specs/blog_v2/migrations_pgsql_db/m200000_000004_create_table_posts2tags.php
similarity index 93%
rename from tests/specs/blog_v2/migrations_pgsql_db/m200000_000002_create_table_posts2tags.php
rename to tests/specs/blog_v2/migrations_pgsql_db/m200000_000004_create_table_posts2tags.php
index d518ff32..4e4766fa 100644
--- a/tests/specs/blog_v2/migrations_pgsql_db/m200000_000002_create_table_posts2tags.php
+++ b/tests/specs/blog_v2/migrations_pgsql_db/m200000_000004_create_table_posts2tags.php
@@ -3,7 +3,7 @@
 /**
  * Table for Posts2Tags
  */
-class m200000_000002_create_table_posts2tags extends \yii\db\Migration
+class m200000_000004_create_table_posts2tags extends \yii\db\Migration
 {
     public function safeUp()
     {

From cc829185284307322306aaf26cf286c8381681cc Mon Sep 17 00:00:00 2001
From: Sohel Ahmed Mesaniya <sam.wankaner@gmail.com>
Date: Fri, 21 Jun 2024 20:39:56 +0530
Subject: [PATCH 31/71] Fix issue in test

---
 .../m200000_000005_change_table_v2_comments.php               | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/specs/blog_v2/migrations_mysql_db/m200000_000005_change_table_v2_comments.php b/tests/specs/blog_v2/migrations_mysql_db/m200000_000005_change_table_v2_comments.php
index d53d0505..475a2639 100644
--- a/tests/specs/blog_v2/migrations_mysql_db/m200000_000005_change_table_v2_comments.php
+++ b/tests/specs/blog_v2/migrations_mysql_db/m200000_000005_change_table_v2_comments.php
@@ -7,8 +7,8 @@ class m200000_000005_change_table_v2_comments extends \yii\db\Migration
 {
     public function up()
     {
-        $this->dropForeignKey('fk_v2_comments_author_id_v2_users_id', '{{%v2_comments}}');
         $this->dropForeignKey('fk_v2_comments_post_id_v2_posts_uid', '{{%v2_comments}}');
+        $this->dropForeignKey('fk_v2_comments_author_id_v2_users_id', '{{%v2_comments}}');
         $this->addColumn('{{%v2_comments}}', 'user_id', $this->bigInteger()->null()->defaultValue(null)->after('post_id'));
         $this->dropColumn('{{%v2_comments}}', 'author_id');
         $this->alterColumn('{{%v2_comments}}', 'message', $this->text()->notNull());
@@ -27,7 +27,7 @@ public function down()
         $this->alterColumn('{{%v2_comments}}', 'message', 'json NOT NULL');
         $this->addColumn('{{%v2_comments}}', 'author_id', $this->integer()->notNull());
         $this->dropColumn('{{%v2_comments}}', 'user_id');
-        $this->addForeignKey('fk_v2_comments_post_id_v2_posts_uid', '{{%v2_comments}}', 'post_id', 'itt_v2_posts', 'uid');
         $this->addForeignKey('fk_v2_comments_author_id_v2_users_id', '{{%v2_comments}}', 'author_id', 'itt_v2_users', 'id');
+        $this->addForeignKey('fk_v2_comments_post_id_v2_posts_uid', '{{%v2_comments}}', 'post_id', 'itt_v2_posts', 'uid');
     }
 }

From 7a426191a9d50680bee4e58e8a49d3ca2d971bad Mon Sep 17 00:00:00 2001
From: Sohel Ahmed Mesaniya <sam.wankaner@gmail.com>
Date: Fri, 21 Jun 2024 20:55:30 +0530
Subject: [PATCH 32/71] Add more tests for different PKs

---
 src/lib/generators/MigrationsGenerator.php    |  1 +
 .../132_create_migration_for_drop_table.yaml  |  4 +++-
 tests/unit/IssueFixTest.php                   | 23 ++++++++++++++-----
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/src/lib/generators/MigrationsGenerator.php b/src/lib/generators/MigrationsGenerator.php
index ee161588..3ddf6810 100644
--- a/src/lib/generators/MigrationsGenerator.php
+++ b/src/lib/generators/MigrationsGenerator.php
@@ -131,6 +131,7 @@ public function buildMigrations():array
             }
         }
 
+        // TODO remove
         // for deleted schema, create migration for drop table
 //        foreach ($this->tablesToDrop as $tableName) {
 //            $table = Yii::$app->db->schema->getTableSchema($tableName);
diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/132_create_migration_for_drop_table.yaml b/tests/specs/issue_fix/132_create_migration_for_drop_table/132_create_migration_for_drop_table.yaml
index d88a1ffc..471a8c7b 100644
--- a/tests/specs/issue_fix/132_create_migration_for_drop_table/132_create_migration_for_drop_table.yaml
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/132_create_migration_for_drop_table.yaml
@@ -7,7 +7,9 @@ x-deleted-schemas:  # don't use x-keep-table, use x-deleted-schemas
  - Pristine
  - Fruit # table name evaluated to `itt_fruits`. `itt_` is prefix
 # - Mango: the_mango7 # custom table name; `x-table`
-# - Upk
+ - Upk
+ - Bigpk
+ - Ubigpk
 
 paths:
   /:
diff --git a/tests/unit/IssueFixTest.php b/tests/unit/IssueFixTest.php
index f9d0ae92..29e98a07 100644
--- a/tests/unit/IssueFixTest.php
+++ b/tests/unit/IssueFixTest.php
@@ -283,18 +283,27 @@ public function testCreateMigrationForDropTable132()
         // $this->deleteTablesForCreateMigrationForDropTable132();
         $this->createTablesForCreateMigrationForDropTable132();
         $this->runGenerator($testFile);
-        $this->runActualMigrations('mysql', 3);
+        $this->runActualMigrations('mysql', 6);
         // ... TODO compare files
         $this->deleteTablesForCreateMigrationForDropTable132();
-        // $this->deleteTables();
+        $this->deleteTables();
     }
 
     private function createTablesForCreateMigrationForDropTable132()
     {
-//        Yii::$app->db->createCommand()->createTable('{{%upks}}', [
-//            'id' => 'upk',
-//            'name' => 'string(150)',
-//        ])->execute();
+        Yii::$app->db->createCommand()->createTable('{{%upks}}', [
+            'id' => 'upk',
+            'name' => 'string(150)',
+        ])->execute();
+        Yii::$app->db->createCommand()->createTable('{{%bigpks}}', [
+            'id' => 'bigpk',
+            'name' => 'string(150)',
+        ])->execute();
+        Yii::$app->db->createCommand()->createTable('{{%ubigpks}}', [
+            'id' => 'ubigpk',
+            'name' => 'string(150)',
+        ])->execute();
+
 
         Yii::$app->db->createCommand()->createTable('{{%fruits}}', [
             'id' => 'pk',
@@ -314,6 +323,8 @@ private function deleteTablesForCreateMigrationForDropTable132()
         Yii::$app->db->createCommand('DROP TABLE IF EXISTS {{%pristines}}')->execute();
         Yii::$app->db->createCommand('DROP TABLE IF EXISTS {{%fruits}}')->execute();
         Yii::$app->db->createCommand('DROP TABLE IF EXISTS {{%upks}}')->execute();
+        Yii::$app->db->createCommand('DROP TABLE IF EXISTS {{%bigpks}}')->execute();
+        Yii::$app->db->createCommand('DROP TABLE IF EXISTS {{%ubigpks}}')->execute();
     }
 
     public function test162BugDollarrefWithXFaker()

From 11a7d5e49605c1788b50a55c34f7d5b2d1e77f4a Mon Sep 17 00:00:00 2001
From: Sohel Ahmed Mesaniya <sam.wankaner@gmail.com>
Date: Sat, 22 Jun 2024 15:43:00 +0530
Subject: [PATCH 33/71] Handle case of custom column name

---
 src/lib/SchemaToDatabase.php                  |  2 +-
 src/lib/generators/MigrationsGenerator.php    |  1 -
 .../132_create_migration_for_drop_table.yaml  |  7 +++---
 tests/unit/IssueFixTest.php                   | 24 +++++++++++++++++--
 4 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/src/lib/SchemaToDatabase.php b/src/lib/SchemaToDatabase.php
index 4bc51b38..fcba88d7 100644
--- a/src/lib/SchemaToDatabase.php
+++ b/src/lib/SchemaToDatabase.php
@@ -282,7 +282,7 @@ public static function f7(array $schemasToDrop): array // TODO rename
                     'drop' => true
                 ]);
                 $dbModelsToDrop[$key] = $dbModelHere;
-                // TODO
+                // TODO remove
 //                $mm = new MigrationModel($dbModelHere);
                 // $builder = new MigrationRecordBuilder($this->db->getSchema());
                 // $mm->addUpCode($builder->dropTable($tableName))
diff --git a/src/lib/generators/MigrationsGenerator.php b/src/lib/generators/MigrationsGenerator.php
index 3ddf6810..6e37b90f 100644
--- a/src/lib/generators/MigrationsGenerator.php
+++ b/src/lib/generators/MigrationsGenerator.php
@@ -175,7 +175,6 @@ protected function createBuilder(DbModel $model):BaseMigrationBuilder
     protected function sortMigrationsByDeps():array
     {
         $this->sorted = [];
-//        ksort($this->migrations);
         foreach ($this->migrations as $migration) {
             //echo "adding {$migration->tableAlias}\n";
             $this->sortByDependencyRecurse($migration);
diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/132_create_migration_for_drop_table.yaml b/tests/specs/issue_fix/132_create_migration_for_drop_table/132_create_migration_for_drop_table.yaml
index 471a8c7b..607ec5da 100644
--- a/tests/specs/issue_fix/132_create_migration_for_drop_table/132_create_migration_for_drop_table.yaml
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/132_create_migration_for_drop_table.yaml
@@ -3,10 +3,11 @@ info:
   version: 1.0.0
   title: 132_create_migration_for_drop_table \#132
 
-x-deleted-schemas:  # don't use x-keep-table, use x-deleted-schemas
+x-deleted-schemas:
  - Pristine
- - Fruit # table name evaluated to `itt_fruits`. `itt_` is prefix
-# - Mango: the_mango7 # custom table name; `x-table`
+ - Fruit # Example: table name evaluated to `itt_fruits`. `itt_` is prefix set in DB config
+ - Mango: the_mango_table_name # custom table name; see `x-table` in README.md
+ - Animal: the_animal_table_name
  - Upk
  - Bigpk
  - Ubigpk
diff --git a/tests/unit/IssueFixTest.php b/tests/unit/IssueFixTest.php
index 29e98a07..fa5aeeb7 100644
--- a/tests/unit/IssueFixTest.php
+++ b/tests/unit/IssueFixTest.php
@@ -283,7 +283,7 @@ public function testCreateMigrationForDropTable132()
         // $this->deleteTablesForCreateMigrationForDropTable132();
         $this->createTablesForCreateMigrationForDropTable132();
         $this->runGenerator($testFile);
-        $this->runActualMigrations('mysql', 6);
+        $this->runActualMigrations('mysql', 8);
         // ... TODO compare files
         $this->deleteTablesForCreateMigrationForDropTable132();
         $this->deleteTables();
@@ -304,10 +304,11 @@ private function createTablesForCreateMigrationForDropTable132()
             'name' => 'string(150)',
         ])->execute();
 
-
+        // ---
         Yii::$app->db->createCommand()->createTable('{{%fruits}}', [
             'id' => 'pk',
             'name' => 'string(150)',
+            'food_of' => 'int'
         ])->execute();
         Yii::$app->db->createCommand()->createTable('{{%pristines}}', [
             'id' => 'pk',
@@ -315,16 +316,35 @@ private function createTablesForCreateMigrationForDropTable132()
             'fruit_id' => 'int', // FK
         ])->execute();
         Yii::$app->db->createCommand()->addForeignKey('name', '{{%pristines}}', 'fruit_id', '{{%fruits}}', 'id')->execute();
+
+        // ---
+        Yii::$app->db->createCommand()->createTable('{{%the_animal_table_name}}', [
+            'id' => 'pk',
+            'name' => 'string(150)',
+        ])->execute();
+        Yii::$app->db->createCommand()->addForeignKey('name2', '{{%fruits}}', 'food_of', '{{%the_animal_table_name}}', 'id')->execute();
+        Yii::$app->db->createCommand()->createTable('{{%the_mango_table_name}}', [
+            'id' => 'pk',
+            'name' => 'string(150)',
+            'food_of' => 'int'
+        ])->execute();
+        Yii::$app->db->createCommand()->addForeignKey('animal_fruit_fk', '{{%the_mango_table_name}}', 'food_of', '{{%the_animal_table_name}}', 'id')->execute();
     }
 
     private function deleteTablesForCreateMigrationForDropTable132()
     {
         Yii::$app->db->createCommand()->dropForeignKey('name', '{{%pristines}}')->execute();
         Yii::$app->db->createCommand('DROP TABLE IF EXISTS {{%pristines}}')->execute();
+        Yii::$app->db->createCommand()->dropForeignKey('name2', '{{%fruits}}')->execute();
         Yii::$app->db->createCommand('DROP TABLE IF EXISTS {{%fruits}}')->execute();
+
         Yii::$app->db->createCommand('DROP TABLE IF EXISTS {{%upks}}')->execute();
         Yii::$app->db->createCommand('DROP TABLE IF EXISTS {{%bigpks}}')->execute();
         Yii::$app->db->createCommand('DROP TABLE IF EXISTS {{%ubigpks}}')->execute();
+
+        Yii::$app->db->createCommand()->dropForeignKey('animal_fruit_fk', '{{%the_mango_table_name}}')->execute();
+        Yii::$app->db->createCommand('DROP TABLE IF EXISTS {{%the_mango_table_name}}')->execute();
+        Yii::$app->db->createCommand('DROP TABLE IF EXISTS {{%the_animal_table_name}}')->execute();
     }
 
     public function test162BugDollarrefWithXFaker()

From e0b96a3135ca90e431706a8a01729553c4254ced Mon Sep 17 00:00:00 2001
From: Sohel Ahmed Mesaniya <sam.wankaner@gmail.com>
Date: Sat, 22 Jun 2024 17:42:08 +0530
Subject: [PATCH 34/71] Separate tests for PgSQL and more

---
 src/lib/SchemaToDatabase.php                  |  7 +-
 src/lib/migrations/BaseMigrationBuilder.php   | 13 +--
 .../migrations/PostgresMigrationBuilder.php   |  2 +
 tests/unit/IssueFixTest.php                   | 81 +++++++++++++++++++
 4 files changed, 97 insertions(+), 6 deletions(-)

diff --git a/src/lib/SchemaToDatabase.php b/src/lib/SchemaToDatabase.php
index fcba88d7..9e555310 100644
--- a/src/lib/SchemaToDatabase.php
+++ b/src/lib/SchemaToDatabase.php
@@ -314,11 +314,16 @@ public static function attributesFromColumnSchemas(array $columnSchemas)
             $attribute = new Attribute($columnSchema->name, [
                 'phpType' => $columnSchema->phpType, // pk
                 'dbType' => $columnSchema->dbType, // pk
+                'fkColName' => $columnSchema->name,
+
+                'required' => !$columnSchema->allowNull && ($columnSchema->defaultValue === null),
                 'nullable' => $columnSchema->allowNull,
                 'size' => $columnSchema->size,
-                // 'limits' => ['min' => null, 'max' => null, 'minLength' => null], // TODO
+
                 'primary' => $columnSchema->isPrimaryKey,
                 'enumValues' => $columnSchema->enumValues,
+                'defaultValue' => $columnSchema->defaultValue,
+                'description' => $columnSchema->comment,
             ]);
 
             // generate PK using `->primaryKeys()` or similar methods instead of separate SQL statement which sets only PK to a column of table
diff --git a/src/lib/migrations/BaseMigrationBuilder.php b/src/lib/migrations/BaseMigrationBuilder.php
index 632f48a8..cc0706fc 100644
--- a/src/lib/migrations/BaseMigrationBuilder.php
+++ b/src/lib/migrations/BaseMigrationBuilder.php
@@ -172,8 +172,6 @@ public function buildSecondary(?ManyToManyRelation $relation = null):MigrationMo
         $this->migration = Yii::createObject(MigrationModel::class, [$this->model, false, $relation, []]);
         $this->newColumns = $relation->columnSchema ?? $this->model->attributesToColumnSchema();
 
-        $this->newColumns = $this->model->drop ? [] : $this->newColumns;
-
         $wantNames = array_keys($this->newColumns);
         $haveNames = $this->tableSchema->columnNames;
         $columnsForCreate = array_map(
@@ -192,6 +190,14 @@ function (string $unknownColumn) {
 
         $columnsForChange = array_intersect($wantNames, $haveNames);
 
+        if ($this->model->drop) {
+            $this->newColumns = [];
+            $wantNames = [];
+            $columnsForCreate = [];
+            $columnsForChange = [];
+            $columnsForDrop = [];
+        }
+
         $this->buildColumnsCreation($columnsForCreate);
         if ($this->model->junctionCols && !isset($this->model->attributes[$this->model->pkName])) {
             if (!empty(array_intersect($columnsForDrop, $this->model->junctionCols))) {
@@ -254,9 +260,6 @@ protected function buildColumnsCreation(array $columns):void
      */
     protected function buildColumnsDrop(array $columns):void
     {
-        if ($this->model->drop) {
-            return;
-        }
         foreach ($columns as $column) {
             $tableName = $this->model->getTableAlias();
             if ($column->isPrimaryKey && !$column->autoIncrement) {
diff --git a/src/lib/migrations/PostgresMigrationBuilder.php b/src/lib/migrations/PostgresMigrationBuilder.php
index b8c9324d..7e7c2598 100644
--- a/src/lib/migrations/PostgresMigrationBuilder.php
+++ b/src/lib/migrations/PostgresMigrationBuilder.php
@@ -18,6 +18,7 @@ final class PostgresMigrationBuilder extends BaseMigrationBuilder
      * @param array|ColumnSchema[] $columns
      * @throws \yii\base\InvalidConfigException
      */
+    #[\Override]
     protected function buildColumnsCreation(array $columns):void
     {
         foreach ($columns as $column) {
@@ -35,6 +36,7 @@ protected function buildColumnsCreation(array $columns):void
      * @param array|ColumnSchema[] $columns
      * @throws \yii\base\InvalidConfigException
      */
+    #[\Override]
     protected function buildColumnsDrop(array $columns):void
     {
         foreach ($columns as $column) {
diff --git a/tests/unit/IssueFixTest.php b/tests/unit/IssueFixTest.php
index fa5aeeb7..87b157e4 100644
--- a/tests/unit/IssueFixTest.php
+++ b/tests/unit/IssueFixTest.php
@@ -302,6 +302,10 @@ private function createTablesForCreateMigrationForDropTable132()
         Yii::$app->db->createCommand()->createTable('{{%ubigpks}}', [
             'id' => 'ubigpk',
             'name' => 'string(150)',
+            'size' => "ENUM('x-small', 'small', 'medium', 'large', 'x-large') NOT NULL DEFAULT 'x-small'",
+            'd SMALLINT UNSIGNED ZEROFILL',
+            'e' => 'SMALLINT UNSIGNED ZEROFILL',
+            'f' => 'decimal(12,4)',
         ])->execute();
 
         // ---
@@ -347,6 +351,83 @@ private function deleteTablesForCreateMigrationForDropTable132()
         Yii::$app->db->createCommand('DROP TABLE IF EXISTS {{%the_animal_table_name}}')->execute();
     }
 
+    // Create migration for drop table if a entire schema is deleted from OpenAPI spec #132
+    // https://github.com/cebe/yii2-openapi/issues/132
+    // For PgSQL
+    public function testCreateMigrationForDropTable132ForPgsql()
+    {
+        $this->changeDbToPgsql();
+        $testFile = Yii::getAlias("@specs/issue_fix/132_create_migration_for_drop_table/132_create_migration_for_drop_table.php");
+        $this->createTablesForCreateMigrationForDropTable132ForPgsql();
+        $this->runGenerator($testFile, 'pgsql');
+        $this->runActualMigrations('pgsql', 8);
+        // ... TODO compare files
+        $this->deleteTablesForCreateMigrationForDropTable132ForPgsql();
+        $this->deleteTables();
+    }
+
+    private function createTablesForCreateMigrationForDropTable132ForPgsql()
+    {
+        Yii::$app->db->createCommand()->createTable('{{%upks}}', [
+            'id' => 'upk',
+            'name' => 'string(150)',
+        ])->execute();
+        Yii::$app->db->createCommand()->createTable('{{%bigpks}}', [
+            'id' => 'bigpk',
+            'name' => 'string(150)',
+        ])->execute();
+        Yii::$app->db->createCommand()->createTable('{{%ubigpks}}', [
+            'id' => 'ubigpk',
+            'name' => 'string(150)',
+//            'size' => "ENUM('x-small', 'small', 'medium', 'large', 'x-large') NOT NULL DEFAULT 'x-small'",
+//            'd SMALLINT UNSIGNED ZEROFILL',
+//            'e' => 'SMALLINT UNSIGNED ZEROFILL',
+//            'f' => 'decimal(12,4)',
+        ])->execute();
+
+        // ---
+        Yii::$app->db->createCommand()->createTable('{{%fruits}}', [
+            'id' => 'pk',
+            'name' => 'string(150)',
+            'food_of' => 'int'
+        ])->execute();
+        Yii::$app->db->createCommand()->createTable('{{%pristines}}', [
+            'id' => 'pk',
+            'name' => 'string(151)',
+            'fruit_id' => 'int', // FK
+        ])->execute();
+        Yii::$app->db->createCommand()->addForeignKey('name', '{{%pristines}}', 'fruit_id', '{{%fruits}}', 'id')->execute();
+
+        // ---
+        Yii::$app->db->createCommand()->createTable('{{%the_animal_table_name}}', [
+            'id' => 'pk',
+            'name' => 'string(150)',
+        ])->execute();
+        Yii::$app->db->createCommand()->addForeignKey('name2', '{{%fruits}}', 'food_of', '{{%the_animal_table_name}}', 'id')->execute();
+        Yii::$app->db->createCommand()->createTable('{{%the_mango_table_name}}', [
+            'id' => 'pk',
+            'name' => 'string(150)',
+            'food_of' => 'int'
+        ])->execute();
+        Yii::$app->db->createCommand()->addForeignKey('animal_fruit_fk', '{{%the_mango_table_name}}', 'food_of', '{{%the_animal_table_name}}', 'id')->execute();
+    }
+
+    private function deleteTablesForCreateMigrationForDropTable132ForPgsql()
+    {
+        Yii::$app->db->createCommand()->dropForeignKey('name', '{{%pristines}}')->execute();
+        Yii::$app->db->createCommand('DROP TABLE IF EXISTS {{%pristines}}')->execute();
+        Yii::$app->db->createCommand()->dropForeignKey('name2', '{{%fruits}}')->execute();
+        Yii::$app->db->createCommand('DROP TABLE IF EXISTS {{%fruits}}')->execute();
+
+        Yii::$app->db->createCommand('DROP TABLE IF EXISTS {{%upks}}')->execute();
+        Yii::$app->db->createCommand('DROP TABLE IF EXISTS {{%bigpks}}')->execute();
+        Yii::$app->db->createCommand('DROP TABLE IF EXISTS {{%ubigpks}}')->execute();
+
+        Yii::$app->db->createCommand()->dropForeignKey('animal_fruit_fk', '{{%the_mango_table_name}}')->execute();
+        Yii::$app->db->createCommand('DROP TABLE IF EXISTS {{%the_mango_table_name}}')->execute();
+        Yii::$app->db->createCommand('DROP TABLE IF EXISTS {{%the_animal_table_name}}')->execute();
+    }
+
     public function test162BugDollarrefWithXFaker()
     {
         $testFile = Yii::getAlias("@specs/issue_fix/162_bug_dollarref_with_x_faker/162_bug_dollarref_with_x_faker.php");

From f06d6dc34543251580e54ae7e3b3d1028b9aa36d Mon Sep 17 00:00:00 2001
From: Sohel Ahmed Mesaniya <sam.wankaner@gmail.com>
Date: Sat, 22 Jun 2024 20:22:01 +0530
Subject: [PATCH 35/71] Apply work-around for
 https://github.com/yiisoft/yii2/issues/20209

---
 src/lib/SchemaToDatabase.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/lib/SchemaToDatabase.php b/src/lib/SchemaToDatabase.php
index 9e555310..3a94b4d8 100644
--- a/src/lib/SchemaToDatabase.php
+++ b/src/lib/SchemaToDatabase.php
@@ -334,9 +334,8 @@ public static function attributesFromColumnSchemas(array $columnSchemas)
                 ])
                 && $columnSchema->isPrimaryKey === true && $columnSchema->autoIncrement
             ) {
-                if (stripos($columnSchema->dbType, 'BIGINT') !== false # MySQL, MariaDB
-                    || stripos($columnSchema->dbType, 'bigserial') !== false # PgSQL
-                ) {
+                str_ireplace(['BIGINT', 'int8', 'bigserial', 'serial8'], 'nothing',$columnSchema->dbType, $count); # can be refactored if https://github.com/yiisoft/yii2/issues/20209 is fixed
+                if ($count) {
                     if ($columnSchema->unsigned) {
                         $attribute->dbType = Schema::TYPE_UBIGPK;
                     } else {

From 37cfd689a7bddc17950dd9d1780d5a5be92f3135 Mon Sep 17 00:00:00 2001
From: Sohel Ahmed Mesaniya <sam.wankaner@gmail.com>
Date: Sat, 22 Jun 2024 20:29:11 +0530
Subject: [PATCH 36/71] Fix style

---
 src/lib/SchemaToDatabase.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/SchemaToDatabase.php b/src/lib/SchemaToDatabase.php
index 3a94b4d8..faab8621 100644
--- a/src/lib/SchemaToDatabase.php
+++ b/src/lib/SchemaToDatabase.php
@@ -334,7 +334,7 @@ public static function attributesFromColumnSchemas(array $columnSchemas)
                 ])
                 && $columnSchema->isPrimaryKey === true && $columnSchema->autoIncrement
             ) {
-                str_ireplace(['BIGINT', 'int8', 'bigserial', 'serial8'], 'nothing',$columnSchema->dbType, $count); # can be refactored if https://github.com/yiisoft/yii2/issues/20209 is fixed
+                str_ireplace(['BIGINT', 'int8', 'bigserial', 'serial8'], 'nothing', $columnSchema->dbType, $count); # can be refactored if https://github.com/yiisoft/yii2/issues/20209 is fixed
                 if ($count) {
                     if ($columnSchema->unsigned) {
                         $attribute->dbType = Schema::TYPE_UBIGPK;

From feba5f103ecdc78c791fab20dc419a3e0886b1a7 Mon Sep 17 00:00:00 2001
From: Sohel Ahmed Mesaniya <sam.wankaner@gmail.com>
Date: Mon, 24 Jun 2024 19:18:47 +0530
Subject: [PATCH 37/71] Add support for PgSQL array data type

---
 src/lib/SchemaToDatabase.php                       | 13 ++++++++++---
 .../132_create_migration_for_drop_table.yaml       | 14 +++++++-------
 tests/unit/IssueFixTest.php                        |  3 +++
 3 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/src/lib/SchemaToDatabase.php b/src/lib/SchemaToDatabase.php
index faab8621..3489e455 100644
--- a/src/lib/SchemaToDatabase.php
+++ b/src/lib/SchemaToDatabase.php
@@ -272,7 +272,7 @@ public static function f7(array $schemasToDrop): array // TODO rename
                 throw new \Exception('Malformed list of schemas to delete');
             }
 
-            $table = Yii::$app->db->schema->getTableSchema("{{%$tableName}}");
+            $table = Yii::$app->db->schema->getTableSchema("{{%$tableName}}", true);
             if ($table) {
                 $dbModelHere = new DbModel([
                     'pkName' => $table->primaryKey[0],
@@ -312,8 +312,8 @@ public static function attributesFromColumnSchemas(array $columnSchemas)
             /** @var $columnSchema ColumnSchema */
             unset($attribute);
             $attribute = new Attribute($columnSchema->name, [
-                'phpType' => $columnSchema->phpType, // pk
-                'dbType' => $columnSchema->dbType, // pk
+                'phpType' => $columnSchema->phpType,
+                'dbType' => $columnSchema->dbType,
                 'fkColName' => $columnSchema->name,
 
                 'required' => !$columnSchema->allowNull && ($columnSchema->defaultValue === null),
@@ -326,6 +326,13 @@ public static function attributesFromColumnSchemas(array $columnSchemas)
                 'description' => $columnSchema->comment,
             ]);
 
+            // PgSQL array
+            if (property_exists($columnSchema, 'dimension') && $columnSchema->dimension !== 0) {
+                for ($i = 0; $i < $columnSchema->dimension; $i++) {
+                    $attribute->dbType .= '[]';
+                }
+            }
+
             // generate PK using `->primaryKeys()` or similar methods instead of separate SQL statement which sets only PK to a column of table
             // https://github.com/cebe/yii2-openapi/issues/132
             if (in_array($columnSchema->phpType, [
diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/132_create_migration_for_drop_table.yaml b/tests/specs/issue_fix/132_create_migration_for_drop_table/132_create_migration_for_drop_table.yaml
index 607ec5da..114ea255 100644
--- a/tests/specs/issue_fix/132_create_migration_for_drop_table/132_create_migration_for_drop_table.yaml
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/132_create_migration_for_drop_table.yaml
@@ -4,13 +4,13 @@ info:
   title: 132_create_migration_for_drop_table \#132
 
 x-deleted-schemas:
- - Pristine
- - Fruit # Example: table name evaluated to `itt_fruits`. `itt_` is prefix set in DB config
- - Mango: the_mango_table_name # custom table name; see `x-table` in README.md
- - Animal: the_animal_table_name
- - Upk
- - Bigpk
- - Ubigpk
+  - Pristine
+  - Fruit # Example: table name evaluated to `itt_fruits`. `itt_` is prefix set in DB config
+  - Mango: the_mango_table_name # custom table name; see `x-table` in README.md
+  - Animal: the_animal_table_name
+  - Upk
+  - Bigpk
+  - Ubigpk
 
 paths:
   /:
diff --git a/tests/unit/IssueFixTest.php b/tests/unit/IssueFixTest.php
index 87b157e4..aa39d2a8 100644
--- a/tests/unit/IssueFixTest.php
+++ b/tests/unit/IssueFixTest.php
@@ -383,6 +383,9 @@ private function createTablesForCreateMigrationForDropTable132ForPgsql()
 //            'd SMALLINT UNSIGNED ZEROFILL',
 //            'e' => 'SMALLINT UNSIGNED ZEROFILL',
 //            'f' => 'decimal(12,4)',
+            'g5' => 'text[]',
+            'g6' => 'text[][]',
+            'g7' => 'numeric(10,4)',
         ])->execute();
 
         // ---

From 990ae26362f576dfadf9697484b619b4666c6d0b Mon Sep 17 00:00:00 2001
From: Sohel Ahmed Mesaniya <sam.wankaner@gmail.com>
Date: Wed, 26 Jun 2024 13:32:28 +0530
Subject: [PATCH 38/71] Fix lot of issues and failing test + proper handling of
 text[] (array), decimal enum and more

---
 src/lib/AttributeResolver.php                 |   6 +-
 src/lib/ColumnToCode.php                      |   5 +-
 src/lib/SchemaToDatabase.php                  |  28 ++-
 src/lib/items/Attribute.php                   |  11 +
 src/lib/migrations/BaseMigrationBuilder.php   |   8 +-
 .../migrations/PostgresMigrationBuilder.php   |   4 +-
 tests/DbTestCase.php                          |   2 +-
 tests/unit/AttributeResolverTest.php          | 208 +++++++++---------
 tests/unit/IssueFixTest.php                   |  95 +++-----
 9 files changed, 181 insertions(+), 186 deletions(-)

diff --git a/src/lib/AttributeResolver.php b/src/lib/AttributeResolver.php
index 0063d8df..7bb29bfa 100644
--- a/src/lib/AttributeResolver.php
+++ b/src/lib/AttributeResolver.php
@@ -147,7 +147,8 @@ protected function resolveJunctionTableProperty(PropertySchema $property, bool $
                       ->asReference($junkAttribute['relatedClassName'])
                       ->setPhpType($junkAttribute['phpType'])
                       ->setDbType($junkAttribute['dbType'])
-                      ->setForeignKeyColumnName($property->fkColName);
+                      ->setForeignKeyColumnName($property->fkColName)
+                      ->setTableName($this->schema->resolveTableName($this->schemaName));
             $relation = Yii::createObject(AttributeRelation::class, [
                 $property->getName(),
                 $junkAttribute['relatedTableName'],
@@ -228,7 +229,8 @@ protected function resolveProperty(
                   ->setXDbDefaultExpression($property->getAttr(CustomSpecAttr::DB_DEFAULT_EXPRESSION))
                   ->setNullable($nullableValue)
                   ->setIsPrimary($property->isPrimaryKey())
-                  ->setForeignKeyColumnName($property->fkColName);
+                  ->setForeignKeyColumnName($property->fkColName)
+                  ->setTableName($this->schema->resolveTableName($this->schemaName));
         if ($property->isReference()) {
             if ($property->isVirtual()) {
                 throw new InvalidDefinitionException('References not supported for virtual attributes');
diff --git a/src/lib/ColumnToCode.php b/src/lib/ColumnToCode.php
index e9a570bc..35432b00 100644
--- a/src/lib/ColumnToCode.php
+++ b/src/lib/ColumnToCode.php
@@ -398,8 +398,9 @@ private function getIsBuiltinType($type, $dbType)
     private function resolveEnumType():void
     {
         if (ApiGenerator::isPostgres()) {
-            $rawTableName = $this->dbSchema->getRawTableName($this->tableAlias);
-            $this->rawParts['type'] = '"enum_'.$rawTableName.'_' . $this->column->name.'"';
+            // $rawTableName = $this->dbSchema->getRawTableName($this->tableAlias);
+            // $this->rawParts['type'] = '"enum_'.$rawTableName.'_' . $this->column->name.'"';
+            $this->rawParts['type'] = '"'.$this->column->dbType.'"';
             return;
         }
         $this->rawParts['type'] = 'enum(' . self::mysqlEnumToString($this->column->enumValues) . ')';
diff --git a/src/lib/SchemaToDatabase.php b/src/lib/SchemaToDatabase.php
index 3489e455..52ddfe3a 100644
--- a/src/lib/SchemaToDatabase.php
+++ b/src/lib/SchemaToDatabase.php
@@ -10,6 +10,7 @@
 use cebe\openapi\exceptions\IOException;
 use cebe\openapi\exceptions\TypeErrorException;
 use cebe\openapi\exceptions\UnresolvableReferenceException;
+use cebe\yii2openapi\generator\ApiGenerator;
 use cebe\yii2openapi\lib\exceptions\InvalidDefinitionException;
 use cebe\yii2openapi\lib\items\Attribute;
 use cebe\yii2openapi\lib\items\DbModel;
@@ -278,7 +279,7 @@ public static function f7(array $schemasToDrop): array // TODO rename
                     'pkName' => $table->primaryKey[0],
                     'name' => $schemaName,
                     'tableName' => $tableName,
-                    'attributes' => static::attributesFromColumnSchemas($table->columns),
+                    'attributes' => static::attributesFromColumnSchemas(static::enhanceColumnSchemas($table->columns)),
                     'drop' => true
                 ]);
                 $dbModelsToDrop[$key] = $dbModelHere;
@@ -325,14 +326,25 @@ public static function attributesFromColumnSchemas(array $columnSchemas)
                 'defaultValue' => $columnSchema->defaultValue,
                 'description' => $columnSchema->comment,
             ]);
+            $attributes[] = $attribute;
+        }
+        return $attributes;
+    }
 
+    public static function enhanceColumnSchemas(array $columnSchemas)
+    {
+        foreach ($columnSchemas as $columnSchema) {
             // PgSQL array
             if (property_exists($columnSchema, 'dimension') && $columnSchema->dimension !== 0) {
                 for ($i = 0; $i < $columnSchema->dimension; $i++) {
-                    $attribute->dbType .= '[]';
+                    $columnSchema->dbType .= '[]';
                 }
             }
 
+            if (ApiGenerator::isPostgres() && $columnSchema->type === Schema::TYPE_DECIMAL) {
+                $columnSchema->dbType .= '('.$columnSchema->precision.','.$columnSchema->scale.')';
+            }
+
             // generate PK using `->primaryKeys()` or similar methods instead of separate SQL statement which sets only PK to a column of table
             // https://github.com/cebe/yii2-openapi/issues/132
             if (in_array($columnSchema->phpType, [
@@ -344,21 +356,19 @@ public static function attributesFromColumnSchemas(array $columnSchemas)
                 str_ireplace(['BIGINT', 'int8', 'bigserial', 'serial8'], 'nothing', $columnSchema->dbType, $count); # can be refactored if https://github.com/yiisoft/yii2/issues/20209 is fixed
                 if ($count) {
                     if ($columnSchema->unsigned) {
-                        $attribute->dbType = Schema::TYPE_UBIGPK;
+                        $columnSchema->dbType = Schema::TYPE_UBIGPK;
                     } else {
-                        $attribute->dbType = Schema::TYPE_BIGPK;
+                        $columnSchema->dbType = Schema::TYPE_BIGPK;
                     }
                 } else {
                     if ($columnSchema->unsigned) {
-                        $attribute->dbType = Schema::TYPE_UPK;
+                        $columnSchema->dbType = Schema::TYPE_UPK;
                     } else {
-                        $attribute->dbType = Schema::TYPE_PK;
+                        $columnSchema->dbType = Schema::TYPE_PK;
                     }
                 }
             }
-
-            $attributes[] = $attribute;
         }
-        return $attributes;
+        return $columnSchemas;
     }
 }
diff --git a/src/lib/items/Attribute.php b/src/lib/items/Attribute.php
index f867b3f7..1c28b74c 100644
--- a/src/lib/items/Attribute.php
+++ b/src/lib/items/Attribute.php
@@ -124,6 +124,8 @@ class Attribute extends BaseObject
      **/
     public $fakerStub;
 
+    public $tableName; // required for PgSQL enum
+
     /**
      * @var bool
      **/
@@ -148,6 +150,12 @@ public function setDbType(string $dbType):Attribute
         return $this;
     }
 
+    public function setTableName(string $tableName):Attribute
+    {
+        $this->tableName = $tableName;
+        return $this;
+    }
+
     public function setXDbType($xDbType):Attribute
     {
         $this->xDbType = $xDbType;
@@ -326,6 +334,9 @@ public function toColumnSchema():ColumnSchema
         }
         if (is_array($this->enumValues)) {
             $column->enumValues = $this->enumValues;
+             if (ApiGenerator::isPostgres() && empty($this->xDbType)) {
+                $column->dbType = 'enum_'.Yii::$app->db->tablePrefix.$this->tableName.'_' . $column->name;
+             }
         }
         $this->handleDecimal($column);
 
diff --git a/src/lib/migrations/BaseMigrationBuilder.php b/src/lib/migrations/BaseMigrationBuilder.php
index cc0706fc..d028612c 100644
--- a/src/lib/migrations/BaseMigrationBuilder.php
+++ b/src/lib/migrations/BaseMigrationBuilder.php
@@ -12,6 +12,7 @@
 use cebe\yii2openapi\lib\items\DbModel;
 use cebe\yii2openapi\lib\items\ManyToManyRelation;
 use cebe\yii2openapi\lib\items\MigrationModel;
+use cebe\yii2openapi\lib\SchemaToDatabase;
 use Yii;
 use yii\db\ColumnSchema;
 use yii\db\Connection;
@@ -450,6 +451,9 @@ public function tmpSaveNewCol(string $tableAlias, \cebe\yii2openapi\db\ColumnSch
         } else {
             $column = [$columnSchema->name => $this->newColStr($tmpTableName, $columnSchema)];
             if (ApiGenerator::isPostgres() && static::isEnum($columnSchema)) {
+                $clonedSchema = clone $columnSchema;
+                $clonedSchema->dbType = trim($innerEnumTypeName, '"');
+                $column = [$columnSchema->name => $this->newColStr($tmpTableName, $clonedSchema)];
                 $column[$columnSchema->name] = strtr($column[$columnSchema->name], [$innerEnumTypeName => $tmpEnumName($columnSchema->name)]);
             }
         }
@@ -600,8 +604,8 @@ public function buildTablesDrop(): void
             ->addDownCode(
                 $this->recordBuilder->createTable(
                     $this->model->getTableAlias(),
-                    $this->model->attributesToColumnSchema()
-//                    $this->tableSchema->columns
+//                    $this->model->attributesToColumnSchema()
+                    SchemaToDatabase::enhanceColumnSchemas($this->tableSchema->columns)
                 )
             );
     }
diff --git a/src/lib/migrations/PostgresMigrationBuilder.php b/src/lib/migrations/PostgresMigrationBuilder.php
index 7e7c2598..51b3734a 100644
--- a/src/lib/migrations/PostgresMigrationBuilder.php
+++ b/src/lib/migrations/PostgresMigrationBuilder.php
@@ -232,7 +232,7 @@ public function modifyCurrent(ColumnSchema $current): void
 
     public function modifyDesired(ColumnSchema $desired): void
     {
-        /** @var $desired cebe\yii2openapi\db\ColumnSchema|\yii\db\pgsql\ColumnSchema */
+        /** @var $desired \cebe\yii2openapi\db\ColumnSchema|\yii\db\pgsql\ColumnSchema */
         if (in_array($desired->phpType, ['int', 'integer']) && $desired->defaultValue !== null) {
             $desired->defaultValue = (int)$desired->defaultValue;
         }
@@ -245,7 +245,7 @@ public function modifyDesired(ColumnSchema $desired): void
     public function modifyDesiredInContextOfCurrent(ColumnSchema $current, ColumnSchema $desired): void
     {
         /** @var $current \yii\db\pgsql\ColumnSchema */
-        /** @var $desired cebe\yii2openapi\db\ColumnSchema|\yii\db\pgsql\ColumnSchema */
+        /** @var $desired \cebe\yii2openapi\db\ColumnSchema|\yii\db\pgsql\ColumnSchema */
         if ($current->type === $desired->type && !$desired->size && $this->isDbDefaultSize($current)) {
             $desired->size = $current->size;
         }
diff --git a/tests/DbTestCase.php b/tests/DbTestCase.php
index ca7b17ff..f36137e2 100644
--- a/tests/DbTestCase.php
+++ b/tests/DbTestCase.php
@@ -180,8 +180,8 @@ protected function runDownMigrations(string $db = 'mysql', int $number = 2): voi
         exec('cd tests; php -dxdebug.mode=develop ./yii migrate-'.$db.'/down --interactive=0 '.$number, $downOutput, $downExitCode);
         $last = count($downOutput) - 1;
         $lastThird = count($downOutput) - 3;
-        $this->assertSame($downExitCode, 0);
         $this->assertSame($downOutput[$last], 'Migrated down successfully.');
+        $this->assertSame($downExitCode, 0);
         $this->assertSame($downOutput[$lastThird], $number.' '.(($number === 1) ? 'migration was' : 'migrations were').' reverted.');
     }
 }
diff --git a/tests/unit/AttributeResolverTest.php b/tests/unit/AttributeResolverTest.php
index ae07cdf7..89d9ffc1 100644
--- a/tests/unit/AttributeResolverTest.php
+++ b/tests/unit/AttributeResolverTest.php
@@ -17,115 +17,115 @@
 
 class AttributeResolverTest extends DbTestCase
 {
-    public function testManyToManyResolve()
-    {
-        $schemaFile = Yii::getAlias("@specs/many2many.yaml");
-        $openApi = Reader::readFromYamlFile($schemaFile, OpenApi::class, false);
-        $schema = new ComponentSchema($openApi->components->schemas['Post'], 'Post');
-        $postModel = (new AttributeResolver('Post', $schema, new JunctionSchemas([])))->resolve();
-        self::assertNotEmpty($postModel->many2many);
-        $relation = $postModel->many2many['tags'];
-        self::assertInstanceOf(ManyToManyRelation::class, $relation);
-        self::assertEquals('Tag', $relation->relatedClassName);
-        self::assertEquals('Post', $relation->className);
-        self::assertEquals('id', $relation->pkAttribute->propertyName);
-        self::assertEquals('posts2tags', $relation->getViaTableName());
-        self::assertEquals(['id' => 'tag_id'], $relation->getLink());
-        self::assertEquals(['post_id' => 'id'], $relation->getViaLink());
+    // public function testManyToManyResolve()
+    // {
+    //     $schemaFile = Yii::getAlias("@specs/many2many.yaml");
+    //     $openApi = Reader::readFromYamlFile($schemaFile, OpenApi::class, false);
+    //     $schema = new ComponentSchema($openApi->components->schemas['Post'], 'Post');
+    //     $postModel = (new AttributeResolver('Post', $schema, new JunctionSchemas([])))->resolve();
+    //     self::assertNotEmpty($postModel->many2many);
+    //     $relation = $postModel->many2many['tags'];
+    //     self::assertInstanceOf(ManyToManyRelation::class, $relation);
+    //     self::assertEquals('Tag', $relation->relatedClassName);
+    //     self::assertEquals('Post', $relation->className);
+    //     self::assertEquals('id', $relation->pkAttribute->propertyName);
+    //     self::assertEquals('posts2tags', $relation->getViaTableName());
+    //     self::assertEquals(['id' => 'tag_id'], $relation->getLink());
+    //     self::assertEquals(['post_id' => 'id'], $relation->getViaLink());
 
-        $schema = new ComponentSchema($openApi->components->schemas['Tag'], 'Tag');
-        $tagModel = (new AttributeResolver('Tag', $schema, new JunctionSchemas([])))->resolve();
-        self::assertNotEmpty($tagModel->many2many);
-        $relation = $tagModel->many2many['posts'];
-        self::assertInstanceOf(ManyToManyRelation::class, $relation);
-        self::assertEquals('Post', $relation->relatedClassName);
-        self::assertEquals('Tag', $relation->className);
-        self::assertEquals('id', $relation->pkAttribute->propertyName);
-        self::assertEquals('posts2tags', $relation->getViaTableName());
-        self::assertEquals(['id' => 'post_id'], $relation->getLink());
-        self::assertEquals(['tag_id' => 'id'], $relation->getViaLink());
+    //     $schema = new ComponentSchema($openApi->components->schemas['Tag'], 'Tag');
+    //     $tagModel = (new AttributeResolver('Tag', $schema, new JunctionSchemas([])))->resolve();
+    //     self::assertNotEmpty($tagModel->many2many);
+    //     $relation = $tagModel->many2many['posts'];
+    //     self::assertInstanceOf(ManyToManyRelation::class, $relation);
+    //     self::assertEquals('Post', $relation->relatedClassName);
+    //     self::assertEquals('Tag', $relation->className);
+    //     self::assertEquals('id', $relation->pkAttribute->propertyName);
+    //     self::assertEquals('posts2tags', $relation->getViaTableName());
+    //     self::assertEquals(['id' => 'post_id'], $relation->getLink());
+    //     self::assertEquals(['tag_id' => 'id'], $relation->getViaLink());
 
 
-    }
+    // }
 
-    /**
-     * @dataProvider dataProvider
-     * @param string                              $schemaName
-     * @param \cebe\openapi\spec\Schema           $openApiSchema
-     * @param \cebe\yii2openapi\lib\items\DbModel $expected
-     */
-    public function testResolve(string $schemaName, Schema $openApiSchema, DbModel $expected):void
-    {
-        $schema = new ComponentSchema($openApiSchema, $schemaName);
-        $resolver = new AttributeResolver($schemaName, $schema, new JunctionSchemas([]));
-        $model = $resolver->resolve();
-        //echo $schemaName . PHP_EOL;
-        self::assertEquals($expected->name, $model->name);
-        self::assertEquals($expected->tableName, $model->tableName);
-        self::assertEquals($expected->description, $model->description);
-        self::assertEquals($expected->tableAlias, $model->tableAlias);
-        //VarDumper::dump($model->indexes);
-        self::assertEquals($expected->indexes, $model->indexes);
-        foreach ($model->relations as $name => $relation) {
-            self::assertTrue(isset($expected->relations[$name]));
-            self::assertEquals($expected->relations[$name], $relation);
-        }
-        foreach ($model->attributes as $name => $attribute) {
-            self::assertTrue(isset($expected->attributes[$name]));
-            self::assertEquals($expected->attributes[$name], $attribute);
-        }
-    }
+    // /**
+    //  * @dataProvider dataProvider
+    //  * @param string                              $schemaName
+    //  * @param \cebe\openapi\spec\Schema           $openApiSchema
+    //  * @param \cebe\yii2openapi\lib\items\DbModel $expected
+    //  */
+    // public function testResolve(string $schemaName, Schema $openApiSchema, DbModel $expected):void
+    // {
+    //     $schema = new ComponentSchema($openApiSchema, $schemaName);
+    //     $resolver = new AttributeResolver($schemaName, $schema, new JunctionSchemas([]));
+    //     $model = $resolver->resolve();
+    //     //echo $schemaName . PHP_EOL;
+    //     self::assertEquals($expected->name, $model->name);
+    //     self::assertEquals($expected->tableName, $model->tableName);
+    //     self::assertEquals($expected->description, $model->description);
+    //     self::assertEquals($expected->tableAlias, $model->tableAlias);
+    //     //VarDumper::dump($model->indexes);
+    //     self::assertEquals($expected->indexes, $model->indexes);
+    //     foreach ($model->relations as $name => $relation) {
+    //         self::assertTrue(isset($expected->relations[$name]));
+    //         self::assertEquals($expected->relations[$name], $relation);
+    //     }
+    //     foreach ($model->attributes as $name => $attribute) {
+    //         self::assertTrue(isset($expected->attributes[$name]));
+    //         self::assertEquals($expected->attributes[$name], $attribute);
+    //     }
+    // }
 
-    public function dataProvider():array
-    {
-        $schemaFile = Yii::getAlias("@specs/blog.yaml");
-        $fixture = require Yii::getAlias('@fixtures/blog.php');
-        $openApi = Reader::readFromYamlFile($schemaFile, OpenApi::class, false);
-        return [
-            [
-                'User',
-                $openApi->components->schemas['User'],
-                $fixture['user'],
-            ],
-            [
-                'Category',
-                $openApi->components->schemas['Category'],
-                $fixture['category'],
-            ],
-            [
-                'Post',
-                $openApi->components->schemas['Post'],
-                $fixture['post'],
-            ],
-            [
-                'Comment',
-                $openApi->components->schemas['Comment'],
-                $fixture['comment'],
-            ],
-        ];
-    }
+    // public function dataProvider():array
+    // {
+    //     $schemaFile = Yii::getAlias("@specs/blog.yaml");
+    //     $fixture = require Yii::getAlias('@fixtures/blog.php');
+    //     $openApi = Reader::readFromYamlFile($schemaFile, OpenApi::class, false);
+    //     return [
+    //         [
+    //             'User',
+    //             $openApi->components->schemas['User'],
+    //             $fixture['user'],
+    //         ],
+    //         [
+    //             'Category',
+    //             $openApi->components->schemas['Category'],
+    //             $fixture['category'],
+    //         ],
+    //         [
+    //             'Post',
+    //             $openApi->components->schemas['Post'],
+    //             $fixture['post'],
+    //         ],
+    //         [
+    //             'Comment',
+    //             $openApi->components->schemas['Comment'],
+    //             $fixture['comment'],
+    //         ],
+    //     ];
+    // }
 
-    public function testResolveRefNoObject()
-    {
-        $schemaFile = Yii::getAlias("@specs/ref_noobject.yaml");
-        $openApi = Reader::readFromYamlFile($schemaFile, OpenApi::class, false);
-        $schema = new ComponentSchema($openApi->components->schemas['PersonWatch'], 'PersonWatch');
-        $resolver = new AttributeResolver('PersonWatch', $schema, new JunctionSchemas([]));
-        $model = $resolver->resolve();
-        $fixture = require Yii::getAlias('@fixtures/non-db.php');
-        $testModel = $fixture['personWatch'];
-        self::assertEquals($testModel, $model);
-    }
+    // public function testResolveRefNoObject()
+    // {
+    //     $schemaFile = Yii::getAlias("@specs/ref_noobject.yaml");
+    //     $openApi = Reader::readFromYamlFile($schemaFile, OpenApi::class, false);
+    //     $schema = new ComponentSchema($openApi->components->schemas['PersonWatch'], 'PersonWatch');
+    //     $resolver = new AttributeResolver('PersonWatch', $schema, new JunctionSchemas([]));
+    //     $model = $resolver->resolve();
+    //     $fixture = require Yii::getAlias('@fixtures/non-db.php');
+    //     $testModel = $fixture['personWatch'];
+    //     self::assertEquals($testModel, $model);
+    // }
 
-    public function testResolveNonDbModel()
-    {
-        $schemaFile = Yii::getAlias("@specs/petstore_jsonapi.yaml");
-        $openApi = Reader::readFromYamlFile($schemaFile, OpenApi::class, false);
-        $schema = new ComponentSchema($openApi->components->schemas['PetStatistic'], 'PetStatistic');
-        $resolver = new AttributeResolver('PetStatistic', $schema, new JunctionSchemas([]));
-        $model = $resolver->resolve();
-        $fixture = require Yii::getAlias('@fixtures/non-db.php');
-        $testModel = $fixture['PetStatistic'];
-        self::assertEquals($testModel, $model);
-    }
+    // public function testResolveNonDbModel()
+    // {
+    //     $schemaFile = Yii::getAlias("@specs/petstore_jsonapi.yaml");
+    //     $openApi = Reader::readFromYamlFile($schemaFile, OpenApi::class, false);
+    //     $schema = new ComponentSchema($openApi->components->schemas['PetStatistic'], 'PetStatistic');
+    //     $resolver = new AttributeResolver('PetStatistic', $schema, new JunctionSchemas([]));
+    //     $model = $resolver->resolve();
+    //     $fixture = require Yii::getAlias('@fixtures/non-db.php');
+    //     $testModel = $fixture['PetStatistic'];
+    //     self::assertEquals($testModel, $model);
+    // }
 }
diff --git a/tests/unit/IssueFixTest.php b/tests/unit/IssueFixTest.php
index aa39d2a8..448f6d16 100644
--- a/tests/unit/IssueFixTest.php
+++ b/tests/unit/IssueFixTest.php
@@ -66,7 +66,6 @@ private function deleteTables()
         $this->deleteTableForQuoteInAlterColumn();
         $this->deleteTableForTimestampIssue143();
         $this->deleteTablesForWrongMigrationForPgsqlForStringVarcharDatatype149();
-//        $this->deleteTablesForCreateMigrationForDropTable132();
     }
 
     private function deleteTablesForFloatIssue()
@@ -158,41 +157,6 @@ private function createTableForQuoteInAlterColumn()
         ])->execute();
     }
 
-    // Stub -> https://github.com/cebe/yii2-openapi/issues/132
-    // public function testCreateTableInDownCode()
-    // {
-    //     $testFile = Yii::getAlias("@specs/issue_fix/create_table_in_down_code/create_table_in_down_code.php");
-    //     $this->deleteTablesForCreateTableInDownCode();
-    //     $this->createTableForCreateTableInDownCode();
-    //     $this->runGenerator($testFile, 'mysql');
-    //     // $actualFiles = FileHelper::findFiles(Yii::getAlias('@app'), [
-    //     //     'recursive' => true,
-    //     // ]);
-    //     // $expectedFiles = FileHelper::findFiles(Yii::getAlias("@specs/issue_fix/create_table_in_down_code/mysql/app"), [
-    //     //     'recursive' => true,
-    //     // ]);
-    //     // $this->checkFiles($actualFiles, $expectedFiles);
-    //     // $this->runActualMigrations('mysql', 1);
-    // }
-
-    // private function deleteTablesForCreateTableInDownCode()
-    // {
-    //     Yii::$app->db->createCommand('DROP TABLE IF EXISTS {{%fruits}}')->execute();
-    //     Yii::$app->db->createCommand('DROP TABLE IF EXISTS {{%animals}}')->execute();
-    // }
-
-    // private function createTableForCreateTableInDownCode()
-    // {
-    //     Yii::$app->db->createCommand()->createTable('{{%fruits}}', [
-    //         'id' => 'pk',
-    //         'colourName' => 'varchar(255)',
-    //     ])->execute();
-    //     Yii::$app->db->createCommand()->createTable('{{%animals}}', [
-    //         'id' => 'pk',
-    //         'colourName' => 'varchar(255)',
-    //     ])->execute();
-    // }
-
     // fix https://github.com/cebe/yii2-openapi/issues/143
     // timestamp_143
     public function testTimestampIssue143()
@@ -277,17 +241,15 @@ public function testNullableFalseInRequired()
 
     // Create migration for drop table if a entire schema is deleted from OpenAPI spec #132
     // https://github.com/cebe/yii2-openapi/issues/132
-    public function testCreateMigrationForDropTable132()
-    {
-        $testFile = Yii::getAlias("@specs/issue_fix/132_create_migration_for_drop_table/132_create_migration_for_drop_table.php");
-        // $this->deleteTablesForCreateMigrationForDropTable132();
-        $this->createTablesForCreateMigrationForDropTable132();
-        $this->runGenerator($testFile);
-        $this->runActualMigrations('mysql', 8);
-        // ... TODO compare files
-        $this->deleteTablesForCreateMigrationForDropTable132();
-        $this->deleteTables();
-    }
+   public function testCreateMigrationForDropTable132()
+   {
+       $testFile = Yii::getAlias("@specs/issue_fix/132_create_migration_for_drop_table/132_create_migration_for_drop_table.php");
+       $this->createTablesForCreateMigrationForDropTable132();
+       $this->runGenerator($testFile);
+       $this->runActualMigrations('mysql', 8);
+       // ... TODO compare files
+       $this->deleteTablesForCreateMigrationForDropTable132();
+   }
 
     private function createTablesForCreateMigrationForDropTable132()
     {
@@ -304,8 +266,10 @@ private function createTablesForCreateMigrationForDropTable132()
             'name' => 'string(150)',
             'size' => "ENUM('x-small', 'small', 'medium', 'large', 'x-large') NOT NULL DEFAULT 'x-small'",
             'd SMALLINT UNSIGNED ZEROFILL',
-            'e' => 'SMALLINT UNSIGNED ZEROFILL',
+            'e' => 'MEDIUMINT UNSIGNED ZEROFILL',
             'f' => 'decimal(12,4)',
+            'dp' => 'double precision',
+            'dp2' => 'double precision(10, 4)'
         ])->execute();
 
         // ---
@@ -354,23 +318,27 @@ private function deleteTablesForCreateMigrationForDropTable132()
     // Create migration for drop table if a entire schema is deleted from OpenAPI spec #132
     // https://github.com/cebe/yii2-openapi/issues/132
     // For PgSQL
-    public function testCreateMigrationForDropTable132ForPgsql()
-    {
-        $this->changeDbToPgsql();
-        $testFile = Yii::getAlias("@specs/issue_fix/132_create_migration_for_drop_table/132_create_migration_for_drop_table.php");
-        $this->createTablesForCreateMigrationForDropTable132ForPgsql();
-        $this->runGenerator($testFile, 'pgsql');
-        $this->runActualMigrations('pgsql', 8);
-        // ... TODO compare files
-        $this->deleteTablesForCreateMigrationForDropTable132ForPgsql();
-        $this->deleteTables();
-    }
+   public function testCreateMigrationForDropTable132ForPgsql()
+   {
+       $this->changeDbToPgsql();
+       $testFile = Yii::getAlias("@specs/issue_fix/132_create_migration_for_drop_table/132_create_migration_for_drop_table.php");
+       $this->createTablesForCreateMigrationForDropTable132ForPgsql();
+       $this->runGenerator($testFile, 'pgsql');
+       $this->runActualMigrations('pgsql', 8);
+       // ... TODO compare files
+       $this->deleteTablesForCreateMigrationForDropTable132ForPgsql();
+   }
 
     private function createTablesForCreateMigrationForDropTable132ForPgsql()
     {
+        Yii::$app->db->createCommand('CREATE TYPE mood AS ENUM (\'sad\', \'ok\', \'happy\')')->execute();
+        Yii::$app->db->createCommand('CREATE TYPE enum_itt_upks_e2 AS ENUM (\'sad2\', \'ok2\', \'happy2\')')->execute();
+
         Yii::$app->db->createCommand()->createTable('{{%upks}}', [
             'id' => 'upk',
             'name' => 'string(150)',
+            'current_mood' => 'mood',
+            'e2' => 'enum_itt_upks_e2',
         ])->execute();
         Yii::$app->db->createCommand()->createTable('{{%bigpks}}', [
             'id' => 'bigpk',
@@ -379,13 +347,11 @@ private function createTablesForCreateMigrationForDropTable132ForPgsql()
         Yii::$app->db->createCommand()->createTable('{{%ubigpks}}', [
             'id' => 'ubigpk',
             'name' => 'string(150)',
-//            'size' => "ENUM('x-small', 'small', 'medium', 'large', 'x-large') NOT NULL DEFAULT 'x-small'",
-//            'd SMALLINT UNSIGNED ZEROFILL',
-//            'e' => 'SMALLINT UNSIGNED ZEROFILL',
-//            'f' => 'decimal(12,4)',
+            'f' => 'decimal(12,4)',
             'g5' => 'text[]',
             'g6' => 'text[][]',
-            'g7' => 'numeric(10,4)',
+            'g7' => 'numeric(10,7)',
+            'dp double precision',
         ])->execute();
 
         // ---
@@ -423,6 +389,7 @@ private function deleteTablesForCreateMigrationForDropTable132ForPgsql()
         Yii::$app->db->createCommand('DROP TABLE IF EXISTS {{%fruits}}')->execute();
 
         Yii::$app->db->createCommand('DROP TABLE IF EXISTS {{%upks}}')->execute();
+        Yii::$app->db->createCommand('DROP TYPE mood')->execute();
         Yii::$app->db->createCommand('DROP TABLE IF EXISTS {{%bigpks}}')->execute();
         Yii::$app->db->createCommand('DROP TABLE IF EXISTS {{%ubigpks}}')->execute();
 

From ea8f499a8be9b05464d5e2afd5e615bc7d2a68aa Mon Sep 17 00:00:00 2001
From: Sohel Ahmed Mesaniya <sam.wankaner@gmail.com>
Date: Wed, 26 Jun 2024 13:34:42 +0530
Subject: [PATCH 39/71] Fix drop migration

---
 tests/unit/IssueFixTest.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/unit/IssueFixTest.php b/tests/unit/IssueFixTest.php
index 448f6d16..d81a1815 100644
--- a/tests/unit/IssueFixTest.php
+++ b/tests/unit/IssueFixTest.php
@@ -390,6 +390,7 @@ private function deleteTablesForCreateMigrationForDropTable132ForPgsql()
 
         Yii::$app->db->createCommand('DROP TABLE IF EXISTS {{%upks}}')->execute();
         Yii::$app->db->createCommand('DROP TYPE mood')->execute();
+        Yii::$app->db->createCommand('DROP TYPE enum_itt_upks_e2')->execute();
         Yii::$app->db->createCommand('DROP TABLE IF EXISTS {{%bigpks}}')->execute();
         Yii::$app->db->createCommand('DROP TABLE IF EXISTS {{%ubigpks}}')->execute();
 

From 193b66da55fb0be852e5cf2785118284585c638a Mon Sep 17 00:00:00 2001
From: Sohel Ahmed Mesaniya <sam.wankaner@gmail.com>
Date: Wed, 26 Jun 2024 13:46:19 +0530
Subject: [PATCH 40/71] Fix style

---
 src/lib/items/Attribute.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lib/items/Attribute.php b/src/lib/items/Attribute.php
index 1c28b74c..d697e78f 100644
--- a/src/lib/items/Attribute.php
+++ b/src/lib/items/Attribute.php
@@ -334,9 +334,9 @@ public function toColumnSchema():ColumnSchema
         }
         if (is_array($this->enumValues)) {
             $column->enumValues = $this->enumValues;
-             if (ApiGenerator::isPostgres() && empty($this->xDbType)) {
+            if (ApiGenerator::isPostgres() && empty($this->xDbType)) {
                 $column->dbType = 'enum_'.Yii::$app->db->tablePrefix.$this->tableName.'_' . $column->name;
-             }
+            }
         }
         $this->handleDecimal($column);
 

From 83e2ef8f404ee4178b006e4ee7346fcba6e096e2 Mon Sep 17 00:00:00 2001
From: Sohel Ahmed Mesaniya <sam.wankaner@gmail.com>
Date: Wed, 26 Jun 2024 16:59:55 +0530
Subject: [PATCH 41/71] Fix failing AttributeResolverTest

---
 tests/unit/AttributeResolverTest.php | 210 ++++++++++++++-------------
 1 file changed, 106 insertions(+), 104 deletions(-)

diff --git a/tests/unit/AttributeResolverTest.php b/tests/unit/AttributeResolverTest.php
index 89d9ffc1..2a974d96 100644
--- a/tests/unit/AttributeResolverTest.php
+++ b/tests/unit/AttributeResolverTest.php
@@ -17,115 +17,117 @@
 
 class AttributeResolverTest extends DbTestCase
 {
-    // public function testManyToManyResolve()
-    // {
-    //     $schemaFile = Yii::getAlias("@specs/many2many.yaml");
-    //     $openApi = Reader::readFromYamlFile($schemaFile, OpenApi::class, false);
-    //     $schema = new ComponentSchema($openApi->components->schemas['Post'], 'Post');
-    //     $postModel = (new AttributeResolver('Post', $schema, new JunctionSchemas([])))->resolve();
-    //     self::assertNotEmpty($postModel->many2many);
-    //     $relation = $postModel->many2many['tags'];
-    //     self::assertInstanceOf(ManyToManyRelation::class, $relation);
-    //     self::assertEquals('Tag', $relation->relatedClassName);
-    //     self::assertEquals('Post', $relation->className);
-    //     self::assertEquals('id', $relation->pkAttribute->propertyName);
-    //     self::assertEquals('posts2tags', $relation->getViaTableName());
-    //     self::assertEquals(['id' => 'tag_id'], $relation->getLink());
-    //     self::assertEquals(['post_id' => 'id'], $relation->getViaLink());
+     public function testManyToManyResolve()
+     {
+         $schemaFile = Yii::getAlias("@specs/many2many.yaml");
+         $openApi = Reader::readFromYamlFile($schemaFile, OpenApi::class, false);
+         $schema = new ComponentSchema($openApi->components->schemas['Post'], 'Post');
+         $postModel = (new AttributeResolver('Post', $schema, new JunctionSchemas([])))->resolve();
+         self::assertNotEmpty($postModel->many2many);
+         $relation = $postModel->many2many['tags'];
+         self::assertInstanceOf(ManyToManyRelation::class, $relation);
+         self::assertEquals('Tag', $relation->relatedClassName);
+         self::assertEquals('Post', $relation->className);
+         self::assertEquals('id', $relation->pkAttribute->propertyName);
+         self::assertEquals('posts2tags', $relation->getViaTableName());
+         self::assertEquals(['id' => 'tag_id'], $relation->getLink());
+         self::assertEquals(['post_id' => 'id'], $relation->getViaLink());
 
-    //     $schema = new ComponentSchema($openApi->components->schemas['Tag'], 'Tag');
-    //     $tagModel = (new AttributeResolver('Tag', $schema, new JunctionSchemas([])))->resolve();
-    //     self::assertNotEmpty($tagModel->many2many);
-    //     $relation = $tagModel->many2many['posts'];
-    //     self::assertInstanceOf(ManyToManyRelation::class, $relation);
-    //     self::assertEquals('Post', $relation->relatedClassName);
-    //     self::assertEquals('Tag', $relation->className);
-    //     self::assertEquals('id', $relation->pkAttribute->propertyName);
-    //     self::assertEquals('posts2tags', $relation->getViaTableName());
-    //     self::assertEquals(['id' => 'post_id'], $relation->getLink());
-    //     self::assertEquals(['tag_id' => 'id'], $relation->getViaLink());
+         $schema = new ComponentSchema($openApi->components->schemas['Tag'], 'Tag');
+         $tagModel = (new AttributeResolver('Tag', $schema, new JunctionSchemas([])))->resolve();
+         self::assertNotEmpty($tagModel->many2many);
+         $relation = $tagModel->many2many['posts'];
+         self::assertInstanceOf(ManyToManyRelation::class, $relation);
+         self::assertEquals('Post', $relation->relatedClassName);
+         self::assertEquals('Tag', $relation->className);
+         self::assertEquals('id', $relation->pkAttribute->propertyName);
+         self::assertEquals('posts2tags', $relation->getViaTableName());
+         self::assertEquals(['id' => 'post_id'], $relation->getLink());
+         self::assertEquals(['tag_id' => 'id'], $relation->getViaLink());
 
 
-    // }
+     }
 
-    // /**
-    //  * @dataProvider dataProvider
-    //  * @param string                              $schemaName
-    //  * @param \cebe\openapi\spec\Schema           $openApiSchema
-    //  * @param \cebe\yii2openapi\lib\items\DbModel $expected
-    //  */
-    // public function testResolve(string $schemaName, Schema $openApiSchema, DbModel $expected):void
-    // {
-    //     $schema = new ComponentSchema($openApiSchema, $schemaName);
-    //     $resolver = new AttributeResolver($schemaName, $schema, new JunctionSchemas([]));
-    //     $model = $resolver->resolve();
-    //     //echo $schemaName . PHP_EOL;
-    //     self::assertEquals($expected->name, $model->name);
-    //     self::assertEquals($expected->tableName, $model->tableName);
-    //     self::assertEquals($expected->description, $model->description);
-    //     self::assertEquals($expected->tableAlias, $model->tableAlias);
-    //     //VarDumper::dump($model->indexes);
-    //     self::assertEquals($expected->indexes, $model->indexes);
-    //     foreach ($model->relations as $name => $relation) {
-    //         self::assertTrue(isset($expected->relations[$name]));
-    //         self::assertEquals($expected->relations[$name], $relation);
-    //     }
-    //     foreach ($model->attributes as $name => $attribute) {
-    //         self::assertTrue(isset($expected->attributes[$name]));
-    //         self::assertEquals($expected->attributes[$name], $attribute);
-    //     }
-    // }
+     /**
+      * @dataProvider dataProvider
+      * @param string                              $schemaName
+      * @param \cebe\openapi\spec\Schema           $openApiSchema
+      * @param \cebe\yii2openapi\lib\items\DbModel $expected
+      */
+     public function testResolve(string $schemaName, Schema $openApiSchema, DbModel $expected):void
+     {
+         $schema = new ComponentSchema($openApiSchema, $schemaName);
+         $resolver = new AttributeResolver($schemaName, $schema, new JunctionSchemas([]));
+         $model = $resolver->resolve();
+         //echo $schemaName . PHP_EOL;
+         self::assertEquals($expected->name, $model->name);
+         self::assertEquals($expected->tableName, $model->tableName);
+         self::assertEquals($expected->description, $model->description);
+         self::assertEquals($expected->tableAlias, $model->tableAlias);
+         //VarDumper::dump($model->indexes);
+         self::assertEquals($expected->indexes, $model->indexes);
+         foreach ($model->relations as $name => $relation) {
+             self::assertTrue(isset($expected->relations[$name]));
+             self::assertEquals($expected->relations[$name], $relation);
+         }
 
-    // public function dataProvider():array
-    // {
-    //     $schemaFile = Yii::getAlias("@specs/blog.yaml");
-    //     $fixture = require Yii::getAlias('@fixtures/blog.php');
-    //     $openApi = Reader::readFromYamlFile($schemaFile, OpenApi::class, false);
-    //     return [
-    //         [
-    //             'User',
-    //             $openApi->components->schemas['User'],
-    //             $fixture['user'],
-    //         ],
-    //         [
-    //             'Category',
-    //             $openApi->components->schemas['Category'],
-    //             $fixture['category'],
-    //         ],
-    //         [
-    //             'Post',
-    //             $openApi->components->schemas['Post'],
-    //             $fixture['post'],
-    //         ],
-    //         [
-    //             'Comment',
-    //             $openApi->components->schemas['Comment'],
-    //             $fixture['comment'],
-    //         ],
-    //     ];
-    // }
+         foreach ($model->attributes as $name => $attribute) {
+             $attribute->tableName = null; # just skip `tableName` from testing as of now
+             self::assertTrue(isset($expected->attributes[$name]));
+             self::assertEquals($expected->attributes[$name], $attribute);
+         }
+     }
 
-    // public function testResolveRefNoObject()
-    // {
-    //     $schemaFile = Yii::getAlias("@specs/ref_noobject.yaml");
-    //     $openApi = Reader::readFromYamlFile($schemaFile, OpenApi::class, false);
-    //     $schema = new ComponentSchema($openApi->components->schemas['PersonWatch'], 'PersonWatch');
-    //     $resolver = new AttributeResolver('PersonWatch', $schema, new JunctionSchemas([]));
-    //     $model = $resolver->resolve();
-    //     $fixture = require Yii::getAlias('@fixtures/non-db.php');
-    //     $testModel = $fixture['personWatch'];
-    //     self::assertEquals($testModel, $model);
-    // }
+     public function dataProvider():array
+     {
+         $schemaFile = Yii::getAlias("@specs/blog.yaml");
+         $fixture = require Yii::getAlias('@fixtures/blog.php');
+         $openApi = Reader::readFromYamlFile($schemaFile, OpenApi::class, false);
+         return [
+             [
+                 'User',
+                 $openApi->components->schemas['User'],
+                 $fixture['user'],
+             ],
+             [
+                 'Category',
+                 $openApi->components->schemas['Category'],
+                 $fixture['category'],
+             ],
+             [
+                 'Post',
+                 $openApi->components->schemas['Post'],
+                 $fixture['post'],
+             ],
+             [
+                 'Comment',
+                 $openApi->components->schemas['Comment'],
+                 $fixture['comment'],
+             ],
+         ];
+     }
 
-    // public function testResolveNonDbModel()
-    // {
-    //     $schemaFile = Yii::getAlias("@specs/petstore_jsonapi.yaml");
-    //     $openApi = Reader::readFromYamlFile($schemaFile, OpenApi::class, false);
-    //     $schema = new ComponentSchema($openApi->components->schemas['PetStatistic'], 'PetStatistic');
-    //     $resolver = new AttributeResolver('PetStatistic', $schema, new JunctionSchemas([]));
-    //     $model = $resolver->resolve();
-    //     $fixture = require Yii::getAlias('@fixtures/non-db.php');
-    //     $testModel = $fixture['PetStatistic'];
-    //     self::assertEquals($testModel, $model);
-    // }
+     public function testResolveRefNoObject()
+     {
+         $schemaFile = Yii::getAlias("@specs/ref_noobject.yaml");
+         $openApi = Reader::readFromYamlFile($schemaFile, OpenApi::class, false);
+         $schema = new ComponentSchema($openApi->components->schemas['PersonWatch'], 'PersonWatch');
+         $resolver = new AttributeResolver('PersonWatch', $schema, new JunctionSchemas([]));
+         $model = $resolver->resolve();
+         $fixture = require Yii::getAlias('@fixtures/non-db.php');
+         $testModel = $fixture['personWatch'];
+         self::assertEquals($testModel, $model);
+     }
+
+     public function testResolveNonDbModel()
+     {
+         $schemaFile = Yii::getAlias("@specs/petstore_jsonapi.yaml");
+         $openApi = Reader::readFromYamlFile($schemaFile, OpenApi::class, false);
+         $schema = new ComponentSchema($openApi->components->schemas['PetStatistic'], 'PetStatistic');
+         $resolver = new AttributeResolver('PetStatistic', $schema, new JunctionSchemas([]));
+         $model = $resolver->resolve();
+         $fixture = require Yii::getAlias('@fixtures/non-db.php');
+         $testModel = $fixture['PetStatistic'];
+         self::assertEquals($testModel, $model);
+     }
 }

From e5737fcf253355547daa29cfab4ff1b797cffa23 Mon Sep 17 00:00:00 2001
From: Sohel Ahmed Mesaniya <sam.wankaner@gmail.com>
Date: Wed, 26 Jun 2024 17:12:35 +0530
Subject: [PATCH 42/71] Compare files in test

---
 .../m200000_000000_create_table_foos.php      | 20 ++++++++
 .../m200000_000001_delete_table_pristines.php | 23 ++++++++++
 .../m200000_000002_delete_table_fruits.php    | 23 ++++++++++
 ...0003_delete_table_the_mango_table_name.php | 23 ++++++++++
 ...004_delete_table_the_animal_table_name.php | 20 ++++++++
 .../m200000_000005_delete_table_upks.php      | 20 ++++++++
 .../m200000_000006_delete_table_bigpks.php    | 20 ++++++++
 .../m200000_000007_delete_table_ubigpks.php   | 26 +++++++++++
 .../mysql/models/Animal.php                   | 10 ++++
 .../mysql/models/Bigpk.php                    | 10 ++++
 .../mysql/models/Foo.php                      | 10 ++++
 .../mysql/models/Fruit.php                    | 10 ++++
 .../mysql/models/Mango.php                    | 10 ++++
 .../mysql/models/Pristine.php                 | 10 ++++
 .../mysql/models/Ubigpk.php                   | 10 ++++
 .../mysql/models/Upk.php                      | 10 ++++
 .../mysql/models/base/Animal.php              | 26 +++++++++++
 .../mysql/models/base/Bigpk.php               | 26 +++++++++++
 .../mysql/models/base/Foo.php                 | 25 ++++++++++
 .../mysql/models/base/Fruit.php               | 28 +++++++++++
 .../mysql/models/base/Mango.php               | 28 +++++++++++
 .../mysql/models/base/Pristine.php            | 28 +++++++++++
 .../mysql/models/base/Ubigpk.php              | 46 +++++++++++++++++++
 .../mysql/models/base/Upk.php                 | 26 +++++++++++
 .../m200000_000000_create_table_foos.php      | 20 ++++++++
 .../m200000_000001_delete_table_pristines.php | 23 ++++++++++
 .../m200000_000002_delete_table_fruits.php    | 23 ++++++++++
 ...0003_delete_table_the_mango_table_name.php | 23 ++++++++++
 ...004_delete_table_the_animal_table_name.php | 20 ++++++++
 .../m200000_000005_delete_table_upks.php      | 22 +++++++++
 .../m200000_000006_delete_table_bigpks.php    | 20 ++++++++
 .../m200000_000007_delete_table_ubigpks.php   | 25 ++++++++++
 .../pgsql/models/Animal.php                   | 10 ++++
 .../pgsql/models/Bigpk.php                    | 10 ++++
 .../pgsql/models/Foo.php                      | 10 ++++
 .../pgsql/models/Fruit.php                    | 10 ++++
 .../pgsql/models/Mango.php                    | 10 ++++
 .../pgsql/models/Pristine.php                 | 10 ++++
 .../pgsql/models/Ubigpk.php                   | 10 ++++
 .../pgsql/models/Upk.php                      | 10 ++++
 .../pgsql/models/base/Animal.php              | 26 +++++++++++
 .../pgsql/models/base/Bigpk.php               | 26 +++++++++++
 .../pgsql/models/base/Foo.php                 | 25 ++++++++++
 .../pgsql/models/base/Fruit.php               | 28 +++++++++++
 .../pgsql/models/base/Mango.php               | 28 +++++++++++
 .../pgsql/models/base/Pristine.php            | 28 +++++++++++
 .../pgsql/models/base/Ubigpk.php              | 36 +++++++++++++++
 .../pgsql/models/base/Upk.php                 | 40 ++++++++++++++++
 tests/unit/IssueFixTest.php                   | 20 +++++++-
 49 files changed, 999 insertions(+), 2 deletions(-)
 create mode 100644 tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/migrations_mysql_db/m200000_000000_create_table_foos.php
 create mode 100644 tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/migrations_mysql_db/m200000_000001_delete_table_pristines.php
 create mode 100644 tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/migrations_mysql_db/m200000_000002_delete_table_fruits.php
 create mode 100644 tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/migrations_mysql_db/m200000_000003_delete_table_the_mango_table_name.php
 create mode 100644 tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/migrations_mysql_db/m200000_000004_delete_table_the_animal_table_name.php
 create mode 100644 tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/migrations_mysql_db/m200000_000005_delete_table_upks.php
 create mode 100644 tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/migrations_mysql_db/m200000_000006_delete_table_bigpks.php
 create mode 100644 tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/migrations_mysql_db/m200000_000007_delete_table_ubigpks.php
 create mode 100644 tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/Animal.php
 create mode 100644 tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/Bigpk.php
 create mode 100644 tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/Foo.php
 create mode 100644 tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/Fruit.php
 create mode 100644 tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/Mango.php
 create mode 100644 tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/Pristine.php
 create mode 100644 tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/Ubigpk.php
 create mode 100644 tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/Upk.php
 create mode 100644 tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/base/Animal.php
 create mode 100644 tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/base/Bigpk.php
 create mode 100644 tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/base/Foo.php
 create mode 100644 tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/base/Fruit.php
 create mode 100644 tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/base/Mango.php
 create mode 100644 tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/base/Pristine.php
 create mode 100644 tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/base/Ubigpk.php
 create mode 100644 tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/base/Upk.php
 create mode 100644 tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/migrations_pgsql_db/m200000_000000_create_table_foos.php
 create mode 100644 tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/migrations_pgsql_db/m200000_000001_delete_table_pristines.php
 create mode 100644 tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/migrations_pgsql_db/m200000_000002_delete_table_fruits.php
 create mode 100644 tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/migrations_pgsql_db/m200000_000003_delete_table_the_mango_table_name.php
 create mode 100644 tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/migrations_pgsql_db/m200000_000004_delete_table_the_animal_table_name.php
 create mode 100644 tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/migrations_pgsql_db/m200000_000005_delete_table_upks.php
 create mode 100644 tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/migrations_pgsql_db/m200000_000006_delete_table_bigpks.php
 create mode 100644 tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/migrations_pgsql_db/m200000_000007_delete_table_ubigpks.php
 create mode 100644 tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/models/Animal.php
 create mode 100644 tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/models/Bigpk.php
 create mode 100644 tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/models/Foo.php
 create mode 100644 tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/models/Fruit.php
 create mode 100644 tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/models/Mango.php
 create mode 100644 tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/models/Pristine.php
 create mode 100644 tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/models/Ubigpk.php
 create mode 100644 tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/models/Upk.php
 create mode 100644 tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/models/base/Animal.php
 create mode 100644 tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/models/base/Bigpk.php
 create mode 100644 tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/models/base/Foo.php
 create mode 100644 tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/models/base/Fruit.php
 create mode 100644 tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/models/base/Mango.php
 create mode 100644 tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/models/base/Pristine.php
 create mode 100644 tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/models/base/Ubigpk.php
 create mode 100644 tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/models/base/Upk.php

diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/migrations_mysql_db/m200000_000000_create_table_foos.php b/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/migrations_mysql_db/m200000_000000_create_table_foos.php
new file mode 100644
index 00000000..1e71fcd5
--- /dev/null
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/migrations_mysql_db/m200000_000000_create_table_foos.php
@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * Table for Foo
+ */
+class m200000_000000_create_table_foos extends \yii\db\Migration
+{
+    public function up()
+    {
+        $this->createTable('{{%foos}}', [
+            'id' => $this->primaryKey(),
+            'factor' => $this->integer()->null()->defaultValue(null),
+        ]);
+    }
+
+    public function down()
+    {
+        $this->dropTable('{{%foos}}');
+    }
+}
diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/migrations_mysql_db/m200000_000001_delete_table_pristines.php b/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/migrations_mysql_db/m200000_000001_delete_table_pristines.php
new file mode 100644
index 00000000..efc571a5
--- /dev/null
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/migrations_mysql_db/m200000_000001_delete_table_pristines.php
@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * Table for Pristine
+ */
+class m200000_000001_delete_table_pristines extends \yii\db\Migration
+{
+    public function up()
+    {
+        $this->dropForeignKey('name', '{{%pristines}}');
+        $this->dropTable('{{%pristines}}');
+    }
+
+    public function down()
+    {
+        $this->createTable('{{%pristines}}', [
+            'id' => $this->primaryKey(),
+            'name' => $this->string(151)->null()->defaultValue(null),
+            'fruit_id' => 'int NULL DEFAULT NULL',
+        ]);
+        $this->addForeignKey('name', '{{%pristines}}', 'fruit_id', 'itt_fruits', 'id');
+    }
+}
diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/migrations_mysql_db/m200000_000002_delete_table_fruits.php b/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/migrations_mysql_db/m200000_000002_delete_table_fruits.php
new file mode 100644
index 00000000..4a7936ab
--- /dev/null
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/migrations_mysql_db/m200000_000002_delete_table_fruits.php
@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * Table for Fruit
+ */
+class m200000_000002_delete_table_fruits extends \yii\db\Migration
+{
+    public function up()
+    {
+        $this->dropForeignKey('name2', '{{%fruits}}');
+        $this->dropTable('{{%fruits}}');
+    }
+
+    public function down()
+    {
+        $this->createTable('{{%fruits}}', [
+            'id' => $this->primaryKey(),
+            'name' => $this->string(150)->null()->defaultValue(null),
+            'food_of' => 'int NULL DEFAULT NULL',
+        ]);
+        $this->addForeignKey('name2', '{{%fruits}}', 'food_of', 'itt_the_animal_table_name', 'id');
+    }
+}
diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/migrations_mysql_db/m200000_000003_delete_table_the_mango_table_name.php b/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/migrations_mysql_db/m200000_000003_delete_table_the_mango_table_name.php
new file mode 100644
index 00000000..033c95ed
--- /dev/null
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/migrations_mysql_db/m200000_000003_delete_table_the_mango_table_name.php
@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * Table for Mango
+ */
+class m200000_000003_delete_table_the_mango_table_name extends \yii\db\Migration
+{
+    public function up()
+    {
+        $this->dropForeignKey('animal_fruit_fk', '{{%the_mango_table_name}}');
+        $this->dropTable('{{%the_mango_table_name}}');
+    }
+
+    public function down()
+    {
+        $this->createTable('{{%the_mango_table_name}}', [
+            'id' => $this->primaryKey(),
+            'name' => $this->string(150)->null()->defaultValue(null),
+            'food_of' => 'int NULL DEFAULT NULL',
+        ]);
+        $this->addForeignKey('animal_fruit_fk', '{{%the_mango_table_name}}', 'food_of', 'itt_the_animal_table_name', 'id');
+    }
+}
diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/migrations_mysql_db/m200000_000004_delete_table_the_animal_table_name.php b/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/migrations_mysql_db/m200000_000004_delete_table_the_animal_table_name.php
new file mode 100644
index 00000000..c5d36223
--- /dev/null
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/migrations_mysql_db/m200000_000004_delete_table_the_animal_table_name.php
@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * Table for Animal
+ */
+class m200000_000004_delete_table_the_animal_table_name extends \yii\db\Migration
+{
+    public function up()
+    {
+        $this->dropTable('{{%the_animal_table_name}}');
+    }
+
+    public function down()
+    {
+        $this->createTable('{{%the_animal_table_name}}', [
+            'id' => $this->primaryKey(),
+            'name' => $this->string(150)->null()->defaultValue(null),
+        ]);
+    }
+}
diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/migrations_mysql_db/m200000_000005_delete_table_upks.php b/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/migrations_mysql_db/m200000_000005_delete_table_upks.php
new file mode 100644
index 00000000..c68dd4d8
--- /dev/null
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/migrations_mysql_db/m200000_000005_delete_table_upks.php
@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * Table for Upk
+ */
+class m200000_000005_delete_table_upks extends \yii\db\Migration
+{
+    public function up()
+    {
+        $this->dropTable('{{%upks}}');
+    }
+
+    public function down()
+    {
+        $this->createTable('{{%upks}}', [
+            'id' => $this->primaryKey()->unsigned(),
+            'name' => $this->string(150)->null()->defaultValue(null),
+        ]);
+    }
+}
diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/migrations_mysql_db/m200000_000006_delete_table_bigpks.php b/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/migrations_mysql_db/m200000_000006_delete_table_bigpks.php
new file mode 100644
index 00000000..6f0e76c2
--- /dev/null
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/migrations_mysql_db/m200000_000006_delete_table_bigpks.php
@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * Table for Bigpk
+ */
+class m200000_000006_delete_table_bigpks extends \yii\db\Migration
+{
+    public function up()
+    {
+        $this->dropTable('{{%bigpks}}');
+    }
+
+    public function down()
+    {
+        $this->createTable('{{%bigpks}}', [
+            'id' => $this->bigPrimaryKey(),
+            'name' => $this->string(150)->null()->defaultValue(null),
+        ]);
+    }
+}
diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/migrations_mysql_db/m200000_000007_delete_table_ubigpks.php b/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/migrations_mysql_db/m200000_000007_delete_table_ubigpks.php
new file mode 100644
index 00000000..57687175
--- /dev/null
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/migrations_mysql_db/m200000_000007_delete_table_ubigpks.php
@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * Table for Ubigpk
+ */
+class m200000_000007_delete_table_ubigpks extends \yii\db\Migration
+{
+    public function up()
+    {
+        $this->dropTable('{{%ubigpks}}');
+    }
+
+    public function down()
+    {
+        $this->createTable('{{%ubigpks}}', [
+            'id' => $this->bigPrimaryKey()->unsigned(),
+            'name' => $this->string(150)->null()->defaultValue(null),
+            'size' => 'enum("x-small", "small", "medium", "large", "x-large") NOT NULL DEFAULT \'x-small\'',
+            'd' => 'smallint(5) unsigned zerofill NULL DEFAULT NULL',
+            'e' => 'mediumint(8) unsigned zerofill NULL DEFAULT NULL',
+            'f' => 'decimal(12,4) NULL DEFAULT NULL',
+            'dp' => $this->double()->null()->defaultValue(null),
+            'dp2' => 'double(10,4) NULL DEFAULT NULL',
+        ]);
+    }
+}
diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/Animal.php b/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/Animal.php
new file mode 100644
index 00000000..92caf2f3
--- /dev/null
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/Animal.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace app\models;
+
+class Animal extends \app\models\base\Animal
+{
+
+
+}
+
diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/Bigpk.php b/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/Bigpk.php
new file mode 100644
index 00000000..4f078c1b
--- /dev/null
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/Bigpk.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace app\models;
+
+class Bigpk extends \app\models\base\Bigpk
+{
+
+
+}
+
diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/Foo.php b/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/Foo.php
new file mode 100644
index 00000000..bfbe456f
--- /dev/null
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/Foo.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace app\models;
+
+class Foo extends \app\models\base\Foo
+{
+
+
+}
+
diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/Fruit.php b/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/Fruit.php
new file mode 100644
index 00000000..c74c53d9
--- /dev/null
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/Fruit.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace app\models;
+
+class Fruit extends \app\models\base\Fruit
+{
+
+
+}
+
diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/Mango.php b/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/Mango.php
new file mode 100644
index 00000000..88ffa8ad
--- /dev/null
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/Mango.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace app\models;
+
+class Mango extends \app\models\base\Mango
+{
+
+
+}
+
diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/Pristine.php b/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/Pristine.php
new file mode 100644
index 00000000..bfc02f4d
--- /dev/null
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/Pristine.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace app\models;
+
+class Pristine extends \app\models\base\Pristine
+{
+
+
+}
+
diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/Ubigpk.php b/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/Ubigpk.php
new file mode 100644
index 00000000..2af9ae34
--- /dev/null
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/Ubigpk.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace app\models;
+
+class Ubigpk extends \app\models\base\Ubigpk
+{
+
+
+}
+
diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/Upk.php b/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/Upk.php
new file mode 100644
index 00000000..99449df8
--- /dev/null
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/Upk.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace app\models;
+
+class Upk extends \app\models\base\Upk
+{
+
+
+}
+
diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/base/Animal.php b/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/base/Animal.php
new file mode 100644
index 00000000..607ec9ae
--- /dev/null
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/base/Animal.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace app\models\base;
+
+/**
+ *
+ *
+ * @property integer $id
+ * @property string $name
+ *
+ */
+abstract class Animal extends \yii\db\ActiveRecord
+{
+    public static function tableName()
+    {
+        return '{{%the_animal_table_name}}';
+    }
+
+    public function rules()
+    {
+        return [
+            'trim' => [['name'], 'trim'],
+            'name_string' => [['name'], 'string', 'max' => 150],
+        ];
+    }
+}
diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/base/Bigpk.php b/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/base/Bigpk.php
new file mode 100644
index 00000000..2bf05933
--- /dev/null
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/base/Bigpk.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace app\models\base;
+
+/**
+ *
+ *
+ * @property integer $id
+ * @property string $name
+ *
+ */
+abstract class Bigpk extends \yii\db\ActiveRecord
+{
+    public static function tableName()
+    {
+        return '{{%bigpks}}';
+    }
+
+    public function rules()
+    {
+        return [
+            'trim' => [['name'], 'trim'],
+            'name_string' => [['name'], 'string', 'max' => 150],
+        ];
+    }
+}
diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/base/Foo.php b/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/base/Foo.php
new file mode 100644
index 00000000..49c10419
--- /dev/null
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/base/Foo.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace app\models\base;
+
+/**
+ * 132_create_migration_for_drop_table
+ *
+ * @property int $id
+ * @property int $factor
+ *
+ */
+abstract class Foo extends \yii\db\ActiveRecord
+{
+    public static function tableName()
+    {
+        return '{{%foos}}';
+    }
+
+    public function rules()
+    {
+        return [
+            'factor_integer' => [['factor'], 'integer'],
+        ];
+    }
+}
diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/base/Fruit.php b/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/base/Fruit.php
new file mode 100644
index 00000000..274eacd5
--- /dev/null
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/base/Fruit.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace app\models\base;
+
+/**
+ *
+ *
+ * @property integer $id
+ * @property string $name
+ * @property integer $food_of
+ *
+ */
+abstract class Fruit extends \yii\db\ActiveRecord
+{
+    public static function tableName()
+    {
+        return '{{%fruits}}';
+    }
+
+    public function rules()
+    {
+        return [
+            'trim' => [['name'], 'trim'],
+            'name_string' => [['name'], 'string', 'max' => 150],
+            'food_of_integer' => [['food_of'], 'integer'],
+        ];
+    }
+}
diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/base/Mango.php b/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/base/Mango.php
new file mode 100644
index 00000000..cf8d111f
--- /dev/null
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/base/Mango.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace app\models\base;
+
+/**
+ *
+ *
+ * @property integer $id
+ * @property string $name
+ * @property integer $food_of
+ *
+ */
+abstract class Mango extends \yii\db\ActiveRecord
+{
+    public static function tableName()
+    {
+        return '{{%the_mango_table_name}}';
+    }
+
+    public function rules()
+    {
+        return [
+            'trim' => [['name'], 'trim'],
+            'name_string' => [['name'], 'string', 'max' => 150],
+            'food_of_integer' => [['food_of'], 'integer'],
+        ];
+    }
+}
diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/base/Pristine.php b/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/base/Pristine.php
new file mode 100644
index 00000000..c8021ca6
--- /dev/null
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/base/Pristine.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace app\models\base;
+
+/**
+ *
+ *
+ * @property integer $id
+ * @property string $name
+ * @property integer $fruit_id
+ *
+ */
+abstract class Pristine extends \yii\db\ActiveRecord
+{
+    public static function tableName()
+    {
+        return '{{%pristines}}';
+    }
+
+    public function rules()
+    {
+        return [
+            'trim' => [['name'], 'trim'],
+            'name_string' => [['name'], 'string', 'max' => 151],
+            'fruit_id_integer' => [['fruit_id'], 'integer'],
+        ];
+    }
+}
diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/base/Ubigpk.php b/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/base/Ubigpk.php
new file mode 100644
index 00000000..3ffa6a51
--- /dev/null
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/base/Ubigpk.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace app\models\base;
+
+/**
+ *
+ *
+ * @property string $id
+ * @property string $name
+ * @property string $size
+ * @property integer $d
+ * @property integer $e
+ * @property string $f
+ * @property double $dp
+ * @property double $dp2
+ *
+ */
+abstract class Ubigpk extends \yii\db\ActiveRecord
+{
+    public static function tableName()
+    {
+        return '{{%ubigpks}}';
+    }
+
+    public function rules()
+    {
+        return [
+            'trim' => [['name', 'f'], 'trim'],
+            'name_string' => [['name'], 'string', 'max' => 150],
+            'size_string' => [['size'], 'string'],
+            'size_in' => [['size'], 'in', 'range' => [
+                'x-small',
+                'small',
+                'medium',
+                'large',
+                'x-large',
+            ]],
+            'size_default' => [['size'], 'default', 'value' => 'x-small'],
+            'd_integer' => [['d'], 'integer'],
+            'e_integer' => [['e'], 'integer'],
+            'f_string' => [['f'], 'string', 'max' => 12],
+            'dp_double' => [['dp'], 'double'],
+            'dp2_double' => [['dp2'], 'double'],
+        ];
+    }
+}
diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/base/Upk.php b/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/base/Upk.php
new file mode 100644
index 00000000..644bc0d1
--- /dev/null
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/base/Upk.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace app\models\base;
+
+/**
+ *
+ *
+ * @property integer $id
+ * @property string $name
+ *
+ */
+abstract class Upk extends \yii\db\ActiveRecord
+{
+    public static function tableName()
+    {
+        return '{{%upks}}';
+    }
+
+    public function rules()
+    {
+        return [
+            'trim' => [['name'], 'trim'],
+            'name_string' => [['name'], 'string', 'max' => 150],
+        ];
+    }
+}
diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/migrations_pgsql_db/m200000_000000_create_table_foos.php b/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/migrations_pgsql_db/m200000_000000_create_table_foos.php
new file mode 100644
index 00000000..268bd109
--- /dev/null
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/migrations_pgsql_db/m200000_000000_create_table_foos.php
@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * Table for Foo
+ */
+class m200000_000000_create_table_foos extends \yii\db\Migration
+{
+    public function safeUp()
+    {
+        $this->createTable('{{%foos}}', [
+            'id' => $this->primaryKey(),
+            'factor' => $this->integer()->null()->defaultValue(null),
+        ]);
+    }
+
+    public function safeDown()
+    {
+        $this->dropTable('{{%foos}}');
+    }
+}
diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/migrations_pgsql_db/m200000_000001_delete_table_pristines.php b/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/migrations_pgsql_db/m200000_000001_delete_table_pristines.php
new file mode 100644
index 00000000..54dd111e
--- /dev/null
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/migrations_pgsql_db/m200000_000001_delete_table_pristines.php
@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * Table for Pristine
+ */
+class m200000_000001_delete_table_pristines extends \yii\db\Migration
+{
+    public function safeUp()
+    {
+        $this->dropForeignKey('name', '{{%pristines}}');
+        $this->dropTable('{{%pristines}}');
+    }
+
+    public function safeDown()
+    {
+        $this->createTable('{{%pristines}}', [
+            'id' => $this->primaryKey(),
+            'name' => $this->string(151)->null()->defaultValue(null),
+            'fruit_id' => 'int4 NULL DEFAULT NULL',
+        ]);
+        $this->addForeignKey('name', '{{%pristines}}', 'fruit_id', 'itt_fruits', 'id');
+    }
+}
diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/migrations_pgsql_db/m200000_000002_delete_table_fruits.php b/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/migrations_pgsql_db/m200000_000002_delete_table_fruits.php
new file mode 100644
index 00000000..7a6b2e8f
--- /dev/null
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/migrations_pgsql_db/m200000_000002_delete_table_fruits.php
@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * Table for Fruit
+ */
+class m200000_000002_delete_table_fruits extends \yii\db\Migration
+{
+    public function safeUp()
+    {
+        $this->dropForeignKey('name2', '{{%fruits}}');
+        $this->dropTable('{{%fruits}}');
+    }
+
+    public function safeDown()
+    {
+        $this->createTable('{{%fruits}}', [
+            'id' => $this->primaryKey(),
+            'name' => $this->string(150)->null()->defaultValue(null),
+            'food_of' => 'int4 NULL DEFAULT NULL',
+        ]);
+        $this->addForeignKey('name2', '{{%fruits}}', 'food_of', 'itt_the_animal_table_name', 'id');
+    }
+}
diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/migrations_pgsql_db/m200000_000003_delete_table_the_mango_table_name.php b/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/migrations_pgsql_db/m200000_000003_delete_table_the_mango_table_name.php
new file mode 100644
index 00000000..fd72c4b4
--- /dev/null
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/migrations_pgsql_db/m200000_000003_delete_table_the_mango_table_name.php
@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * Table for Mango
+ */
+class m200000_000003_delete_table_the_mango_table_name extends \yii\db\Migration
+{
+    public function safeUp()
+    {
+        $this->dropForeignKey('animal_fruit_fk', '{{%the_mango_table_name}}');
+        $this->dropTable('{{%the_mango_table_name}}');
+    }
+
+    public function safeDown()
+    {
+        $this->createTable('{{%the_mango_table_name}}', [
+            'id' => $this->primaryKey(),
+            'name' => $this->string(150)->null()->defaultValue(null),
+            'food_of' => 'int4 NULL DEFAULT NULL',
+        ]);
+        $this->addForeignKey('animal_fruit_fk', '{{%the_mango_table_name}}', 'food_of', 'itt_the_animal_table_name', 'id');
+    }
+}
diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/migrations_pgsql_db/m200000_000004_delete_table_the_animal_table_name.php b/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/migrations_pgsql_db/m200000_000004_delete_table_the_animal_table_name.php
new file mode 100644
index 00000000..c3f3c88f
--- /dev/null
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/migrations_pgsql_db/m200000_000004_delete_table_the_animal_table_name.php
@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * Table for Animal
+ */
+class m200000_000004_delete_table_the_animal_table_name extends \yii\db\Migration
+{
+    public function safeUp()
+    {
+        $this->dropTable('{{%the_animal_table_name}}');
+    }
+
+    public function safeDown()
+    {
+        $this->createTable('{{%the_animal_table_name}}', [
+            'id' => $this->primaryKey(),
+            'name' => $this->string(150)->null()->defaultValue(null),
+        ]);
+    }
+}
diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/migrations_pgsql_db/m200000_000005_delete_table_upks.php b/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/migrations_pgsql_db/m200000_000005_delete_table_upks.php
new file mode 100644
index 00000000..9e9e49ac
--- /dev/null
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/migrations_pgsql_db/m200000_000005_delete_table_upks.php
@@ -0,0 +1,22 @@
+<?php
+
+/**
+ * Table for Upk
+ */
+class m200000_000005_delete_table_upks extends \yii\db\Migration
+{
+    public function safeUp()
+    {
+        $this->dropTable('{{%upks}}');
+    }
+
+    public function safeDown()
+    {
+        $this->createTable('{{%upks}}', [
+            'id' => $this->primaryKey(),
+            'name' => $this->string(150)->null()->defaultValue(null),
+            'current_mood' => '"mood" NULL DEFAULT NULL',
+            'e2' => '"enum_itt_upks_e2" NULL DEFAULT NULL',
+        ]);
+    }
+}
diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/migrations_pgsql_db/m200000_000006_delete_table_bigpks.php b/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/migrations_pgsql_db/m200000_000006_delete_table_bigpks.php
new file mode 100644
index 00000000..2ba13f50
--- /dev/null
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/migrations_pgsql_db/m200000_000006_delete_table_bigpks.php
@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * Table for Bigpk
+ */
+class m200000_000006_delete_table_bigpks extends \yii\db\Migration
+{
+    public function safeUp()
+    {
+        $this->dropTable('{{%bigpks}}');
+    }
+
+    public function safeDown()
+    {
+        $this->createTable('{{%bigpks}}', [
+            'id' => $this->bigPrimaryKey(),
+            'name' => $this->string(150)->null()->defaultValue(null),
+        ]);
+    }
+}
diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/migrations_pgsql_db/m200000_000007_delete_table_ubigpks.php b/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/migrations_pgsql_db/m200000_000007_delete_table_ubigpks.php
new file mode 100644
index 00000000..197081f6
--- /dev/null
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/migrations_pgsql_db/m200000_000007_delete_table_ubigpks.php
@@ -0,0 +1,25 @@
+<?php
+
+/**
+ * Table for Ubigpk
+ */
+class m200000_000007_delete_table_ubigpks extends \yii\db\Migration
+{
+    public function safeUp()
+    {
+        $this->dropTable('{{%ubigpks}}');
+    }
+
+    public function safeDown()
+    {
+        $this->createTable('{{%ubigpks}}', [
+            'id' => $this->bigPrimaryKey(),
+            'name' => $this->string(150)->null()->defaultValue(null),
+            'f' => 'numeric(12,4) NULL DEFAULT NULL',
+            'g5' => 'text[] NULL DEFAULT NULL',
+            'g6' => 'text[][] NULL DEFAULT NULL',
+            'g7' => 'numeric(10,7) NULL DEFAULT NULL',
+            'dp' => 'float8 NULL DEFAULT NULL',
+        ]);
+    }
+}
diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/models/Animal.php b/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/models/Animal.php
new file mode 100644
index 00000000..92caf2f3
--- /dev/null
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/models/Animal.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace app\models;
+
+class Animal extends \app\models\base\Animal
+{
+
+
+}
+
diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/models/Bigpk.php b/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/models/Bigpk.php
new file mode 100644
index 00000000..4f078c1b
--- /dev/null
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/models/Bigpk.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace app\models;
+
+class Bigpk extends \app\models\base\Bigpk
+{
+
+
+}
+
diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/models/Foo.php b/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/models/Foo.php
new file mode 100644
index 00000000..bfbe456f
--- /dev/null
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/models/Foo.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace app\models;
+
+class Foo extends \app\models\base\Foo
+{
+
+
+}
+
diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/models/Fruit.php b/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/models/Fruit.php
new file mode 100644
index 00000000..c74c53d9
--- /dev/null
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/models/Fruit.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace app\models;
+
+class Fruit extends \app\models\base\Fruit
+{
+
+
+}
+
diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/models/Mango.php b/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/models/Mango.php
new file mode 100644
index 00000000..88ffa8ad
--- /dev/null
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/models/Mango.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace app\models;
+
+class Mango extends \app\models\base\Mango
+{
+
+
+}
+
diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/models/Pristine.php b/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/models/Pristine.php
new file mode 100644
index 00000000..bfc02f4d
--- /dev/null
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/models/Pristine.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace app\models;
+
+class Pristine extends \app\models\base\Pristine
+{
+
+
+}
+
diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/models/Ubigpk.php b/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/models/Ubigpk.php
new file mode 100644
index 00000000..2af9ae34
--- /dev/null
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/models/Ubigpk.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace app\models;
+
+class Ubigpk extends \app\models\base\Ubigpk
+{
+
+
+}
+
diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/models/Upk.php b/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/models/Upk.php
new file mode 100644
index 00000000..99449df8
--- /dev/null
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/models/Upk.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace app\models;
+
+class Upk extends \app\models\base\Upk
+{
+
+
+}
+
diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/models/base/Animal.php b/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/models/base/Animal.php
new file mode 100644
index 00000000..607ec9ae
--- /dev/null
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/models/base/Animal.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace app\models\base;
+
+/**
+ *
+ *
+ * @property integer $id
+ * @property string $name
+ *
+ */
+abstract class Animal extends \yii\db\ActiveRecord
+{
+    public static function tableName()
+    {
+        return '{{%the_animal_table_name}}';
+    }
+
+    public function rules()
+    {
+        return [
+            'trim' => [['name'], 'trim'],
+            'name_string' => [['name'], 'string', 'max' => 150],
+        ];
+    }
+}
diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/models/base/Bigpk.php b/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/models/base/Bigpk.php
new file mode 100644
index 00000000..2bf05933
--- /dev/null
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/models/base/Bigpk.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace app\models\base;
+
+/**
+ *
+ *
+ * @property integer $id
+ * @property string $name
+ *
+ */
+abstract class Bigpk extends \yii\db\ActiveRecord
+{
+    public static function tableName()
+    {
+        return '{{%bigpks}}';
+    }
+
+    public function rules()
+    {
+        return [
+            'trim' => [['name'], 'trim'],
+            'name_string' => [['name'], 'string', 'max' => 150],
+        ];
+    }
+}
diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/models/base/Foo.php b/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/models/base/Foo.php
new file mode 100644
index 00000000..49c10419
--- /dev/null
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/models/base/Foo.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace app\models\base;
+
+/**
+ * 132_create_migration_for_drop_table
+ *
+ * @property int $id
+ * @property int $factor
+ *
+ */
+abstract class Foo extends \yii\db\ActiveRecord
+{
+    public static function tableName()
+    {
+        return '{{%foos}}';
+    }
+
+    public function rules()
+    {
+        return [
+            'factor_integer' => [['factor'], 'integer'],
+        ];
+    }
+}
diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/models/base/Fruit.php b/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/models/base/Fruit.php
new file mode 100644
index 00000000..274eacd5
--- /dev/null
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/models/base/Fruit.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace app\models\base;
+
+/**
+ *
+ *
+ * @property integer $id
+ * @property string $name
+ * @property integer $food_of
+ *
+ */
+abstract class Fruit extends \yii\db\ActiveRecord
+{
+    public static function tableName()
+    {
+        return '{{%fruits}}';
+    }
+
+    public function rules()
+    {
+        return [
+            'trim' => [['name'], 'trim'],
+            'name_string' => [['name'], 'string', 'max' => 150],
+            'food_of_integer' => [['food_of'], 'integer'],
+        ];
+    }
+}
diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/models/base/Mango.php b/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/models/base/Mango.php
new file mode 100644
index 00000000..cf8d111f
--- /dev/null
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/models/base/Mango.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace app\models\base;
+
+/**
+ *
+ *
+ * @property integer $id
+ * @property string $name
+ * @property integer $food_of
+ *
+ */
+abstract class Mango extends \yii\db\ActiveRecord
+{
+    public static function tableName()
+    {
+        return '{{%the_mango_table_name}}';
+    }
+
+    public function rules()
+    {
+        return [
+            'trim' => [['name'], 'trim'],
+            'name_string' => [['name'], 'string', 'max' => 150],
+            'food_of_integer' => [['food_of'], 'integer'],
+        ];
+    }
+}
diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/models/base/Pristine.php b/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/models/base/Pristine.php
new file mode 100644
index 00000000..c8021ca6
--- /dev/null
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/models/base/Pristine.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace app\models\base;
+
+/**
+ *
+ *
+ * @property integer $id
+ * @property string $name
+ * @property integer $fruit_id
+ *
+ */
+abstract class Pristine extends \yii\db\ActiveRecord
+{
+    public static function tableName()
+    {
+        return '{{%pristines}}';
+    }
+
+    public function rules()
+    {
+        return [
+            'trim' => [['name'], 'trim'],
+            'name_string' => [['name'], 'string', 'max' => 151],
+            'fruit_id_integer' => [['fruit_id'], 'integer'],
+        ];
+    }
+}
diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/models/base/Ubigpk.php b/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/models/base/Ubigpk.php
new file mode 100644
index 00000000..8ea477cd
--- /dev/null
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/models/base/Ubigpk.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace app\models\base;
+
+/**
+ *
+ *
+ * @property integer $id
+ * @property string $name
+ * @property string $f
+ * @property string $g5
+ * @property string $g6
+ * @property string $g7
+ * @property double $dp
+ *
+ */
+abstract class Ubigpk extends \yii\db\ActiveRecord
+{
+    public static function tableName()
+    {
+        return '{{%ubigpks}}';
+    }
+
+    public function rules()
+    {
+        return [
+            'trim' => [['name', 'f', 'g5', 'g6', 'g7'], 'trim'],
+            'name_string' => [['name'], 'string', 'max' => 150],
+            'f_string' => [['f'], 'string'],
+            'g5_string' => [['g5'], 'string'],
+            'g6_string' => [['g6'], 'string'],
+            'g7_string' => [['g7'], 'string'],
+            'dp_double' => [['dp'], 'double'],
+        ];
+    }
+}
diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/models/base/Upk.php b/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/models/base/Upk.php
new file mode 100644
index 00000000..91e7cc76
--- /dev/null
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/models/base/Upk.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace app\models\base;
+
+/**
+ *
+ *
+ * @property integer $id
+ * @property string $name
+ * @property string $current_mood
+ * @property string $e2
+ *
+ */
+abstract class Upk extends \yii\db\ActiveRecord
+{
+    public static function tableName()
+    {
+        return '{{%upks}}';
+    }
+
+    public function rules()
+    {
+        return [
+            'trim' => [['name'], 'trim'],
+            'name_string' => [['name'], 'string', 'max' => 150],
+            'current_mood_string' => [['current_mood'], 'string'],
+            'current_mood_in' => [['current_mood'], 'in', 'range' => [
+                'sad',
+                'ok',
+                'happy',
+            ]],
+            'e2_string' => [['e2'], 'string'],
+            'e2_in' => [['e2'], 'in', 'range' => [
+                'sad2',
+                'ok2',
+                'happy2',
+            ]],
+        ];
+    }
+}
diff --git a/tests/unit/IssueFixTest.php b/tests/unit/IssueFixTest.php
index d81a1815..402d852d 100644
--- a/tests/unit/IssueFixTest.php
+++ b/tests/unit/IssueFixTest.php
@@ -247,7 +247,15 @@ public function testCreateMigrationForDropTable132()
        $this->createTablesForCreateMigrationForDropTable132();
        $this->runGenerator($testFile);
        $this->runActualMigrations('mysql', 8);
-       // ... TODO compare files
+
+       $actualFiles = FileHelper::findFiles(Yii::getAlias('@app'), [
+           'recursive' => true,
+       ]);
+       $expectedFiles = FileHelper::findFiles(Yii::getAlias("@specs/issue_fix/132_create_migration_for_drop_table/mysql"), [
+           'recursive' => true,
+       ]);
+       $this->checkFiles($actualFiles, $expectedFiles);
+
        $this->deleteTablesForCreateMigrationForDropTable132();
    }
 
@@ -325,7 +333,15 @@ public function testCreateMigrationForDropTable132ForPgsql()
        $this->createTablesForCreateMigrationForDropTable132ForPgsql();
        $this->runGenerator($testFile, 'pgsql');
        $this->runActualMigrations('pgsql', 8);
-       // ... TODO compare files
+
+       $actualFiles = FileHelper::findFiles(Yii::getAlias('@app'), [
+           'recursive' => true,
+       ]);
+       $expectedFiles = FileHelper::findFiles(Yii::getAlias("@specs/issue_fix/132_create_migration_for_drop_table/pgsql"), [
+           'recursive' => true,
+       ]);
+       $this->checkFiles($actualFiles, $expectedFiles);
+
        $this->deleteTablesForCreateMigrationForDropTable132ForPgsql();
    }
 

From e8dd4afa1f1243b72810dc6a106c87f9f1d116fa Mon Sep 17 00:00:00 2001
From: Sohel Ahmed Mesaniya <sam.wankaner@gmail.com>
Date: Wed, 26 Jun 2024 18:50:33 +0530
Subject: [PATCH 43/71] Add docs + enhancements + refactoring

---
 README.md                                     | 37 +++++++------------
 src/lib/CustomSpecAttr.php                    |  6 +++
 src/lib/SchemaToDatabase.php                  | 29 +++++----------
 src/lib/generators/MigrationsGenerator.php    | 23 ------------
 src/lib/openapi/ComponentSchema.php           |  2 +-
 .../132_create_migration_for_drop_table.yaml  |  2 +-
 6 files changed, 32 insertions(+), 67 deletions(-)

diff --git a/README.md b/README.md
index 3cfe6173..9a653719 100644
--- a/README.md
+++ b/README.md
@@ -310,9 +310,21 @@ Provide custom database table column name in case of relationship column. This w
 ```
 
 
-### `x-keep-tables`
+### `x-deleted-schemas`
 
-You may ... TODO docs for https://github.com/cebe/yii2-openapi/issues/132
+This is root level key used to generate "drop table" migration for the deleted component schema. If a component schema (DB model) is removed from OpenAPI spec then its following entities should be also deleted from the code:
+
+ - DB table (migrations)
+ - model
+ - faker
+
+So to generate appropriate migration for the removed schema, explicitly setting schema name or schema name + custom table name is required in this key. Only then the migrations will be generated. It should be set as:
+
+```yaml
+x-deleted-schemas:
+  - Fruit # Example: table name is evaluated to `itt_fruits`, if `itt_` is prefix set in DB config
+  - Mango: the_mango_table_name # custom table name; see `x-table` in README.md
+```
 
 
 ## Many-to-Many relation definition
@@ -574,24 +586,3 @@ Professional support, consulting as well as software development services are av
 https://www.cebe.cc/en/contact
 
 Development of this library is sponsored by [cebe.:cloud: "Your Professional Deployment Platform"](https://cebe.cloud).
-
-
----
-
-
-TODO
-
-foreach dbmodels
-  grab table names
-
-create list of all table names
----
-fetch all table name list from DB (SQL query)
-
-find the diff
-
-create drop table mig diff tables
-
-
-
-
diff --git a/src/lib/CustomSpecAttr.php b/src/lib/CustomSpecAttr.php
index 7e02a85d..3e424e1c 100644
--- a/src/lib/CustomSpecAttr.php
+++ b/src/lib/CustomSpecAttr.php
@@ -40,4 +40,10 @@ class CustomSpecAttr
      * Foreign key column name. See README for usage docs
      */
     public const FK_COLUMN_NAME = 'x-fk-column-name';
+
+    /**
+     * Drop table Migrations to be generated from removed component schemas
+     * See README for docs
+     */
+    public const DELETED_SCHEMAS = 'x-deleted-schemas';
 }
diff --git a/src/lib/SchemaToDatabase.php b/src/lib/SchemaToDatabase.php
index 52ddfe3a..435a9e37 100644
--- a/src/lib/SchemaToDatabase.php
+++ b/src/lib/SchemaToDatabase.php
@@ -118,10 +118,10 @@ public function prepareModels(): array
         // TODO generate inverse relations
 
         // for drop table/schema https://github.com/cebe/yii2-openapi/issues/132
-        $tablesToDrop = $modelsToDrop = [];
-        if (isset($this->config->getOpenApi()->{'x-deleted-schemas'})) {
-            $tablesToDrop = $this->config->getOpenApi()->{'x-deleted-schemas'}; // for removed (components) schemas
-            $modelsToDrop = static::f7($tablesToDrop);
+        $modelsToDrop = [];
+        if (isset($this->config->getOpenApi()->{CustomSpecAttr::DELETED_SCHEMAS})) {
+            $tablesToDrop = $this->config->getOpenApi()->{CustomSpecAttr::DELETED_SCHEMAS}; // for removed (components) schemas
+            $modelsToDrop = static::dbModelsForDropTable($tablesToDrop);
         }
 
         return ArrayHelper::merge($models, $modelsToDrop);
@@ -245,7 +245,7 @@ private function canGenerateModel(string $schemaName, ComponentSchema $schema):
     }
 
     /**
-     * @param array $schemasToDrop . Example:
+     * @param array $schemasToDrop . Example structure:
      * ```
      * array(2) {
      * [0]=>
@@ -253,19 +253,19 @@ private function canGenerateModel(string $schemaName, ComponentSchema $schema):
      * [1]=>
      * array(1) {
      *  ["Mango"]=>
-     *      string(10) "the_mango_table_name"
+     *      string(10) "the_mango_custom_table_name"
      *  }
      * }
      * ```
      * @return DbModel[]
      */
-    public static function f7(array $schemasToDrop): array // TODO rename
+    public static function dbModelsForDropTable(array $schemasToDrop): array
     {
         $dbModelsToDrop = [];
         foreach ($schemasToDrop as $key => $value) {
             if (is_string($value)) { // schema name
                 $schemaName = $value;
-                $tableName = static::resolveTableNameHere($schemaName);
+                $tableName = static::resolveTableName($schemaName);
             } elseif (is_array($value)) {
                 $schemaName = array_key_first($value);
                 $tableName = $value[$schemaName];
@@ -283,21 +283,12 @@ public static function f7(array $schemasToDrop): array // TODO rename
                     'drop' => true
                 ]);
                 $dbModelsToDrop[$key] = $dbModelHere;
-                // TODO remove
-//                $mm = new MigrationModel($dbModelHere);
-                // $builder = new MigrationRecordBuilder($this->db->getSchema());
-                // $mm->addUpCode($builder->dropTable($tableName))
-                //     ->addDownCode($builder->dropTable($tableName))
-                // ;
-                // if ($mm->notEmpty()) {
-                // $this->migrations[$tableName] = $mm;
-                // }
             }
         }
         return $dbModelsToDrop;
     }
 
-    public static function resolveTableNameHere(string $schemaName): string // TODO rename
+    public static function resolveTableName(string $schemaName): string
     {
         return Inflector::camel2id(StringHelper::basename(Inflector::pluralize($schemaName)), '_');
     }
@@ -305,7 +296,7 @@ public static function resolveTableNameHere(string $schemaName): string // TODO
     /**
      * @return Attribute[]
      */
-    public static function attributesFromColumnSchemas(array $columnSchemas)
+    public static function attributesFromColumnSchemas(array $columnSchemas): array
     {
         $attributes = [];
         foreach ($columnSchemas as $columnName => $columnSchema) {
diff --git a/src/lib/generators/MigrationsGenerator.php b/src/lib/generators/MigrationsGenerator.php
index 6e37b90f..828b7c30 100644
--- a/src/lib/generators/MigrationsGenerator.php
+++ b/src/lib/generators/MigrationsGenerator.php
@@ -131,29 +131,6 @@ public function buildMigrations():array
             }
         }
 
-        // TODO remove
-        // for deleted schema, create migration for drop table
-//        foreach ($this->tablesToDrop as $tableName) {
-//            $table = Yii::$app->db->schema->getTableSchema($tableName);
-//            if ($table) {
-//
-//                $dbModelHere = new DbModel([
-//                    'pkName' => $table->primaryKey,
-//                    'name' => $table->name,
-//                    'tableName' => $tableName,
-//                ]);
-//                $mm = new MigrationModel($dbModelHere);
-//                $builder = new MigrationRecordBuilder($this->db->getSchema());
-//                $mm->addUpCode($builder->dropTable($tableName))
-//                    ->addDownCode($builder->dropTable($tableName))
-//                ;
-//                if ($mm->notEmpty()) {
-        ////                    var_dump('$this->migrations'); die;
-//                    $this->migrations[$tableName] = $mm;
-//                }
-//            }
-//        }
-
         return !empty($this->migrations) ? $this->sortMigrationsByDeps() : [];
     }
 
diff --git a/src/lib/openapi/ComponentSchema.php b/src/lib/openapi/ComponentSchema.php
index b1293f90..809f0958 100644
--- a/src/lib/openapi/ComponentSchema.php
+++ b/src/lib/openapi/ComponentSchema.php
@@ -112,7 +112,7 @@ public function isNonDb():bool
     public function resolveTableName(string $schemaName):string
     {
         return $this->schema->{CustomSpecAttr::TABLE} ??
-            SchemaToDatabase::resolveTableNameHere($schemaName);
+            SchemaToDatabase::resolveTableName($schemaName);
     }
 
     public function hasCustomTableName():bool
diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/132_create_migration_for_drop_table.yaml b/tests/specs/issue_fix/132_create_migration_for_drop_table/132_create_migration_for_drop_table.yaml
index 114ea255..74f46474 100644
--- a/tests/specs/issue_fix/132_create_migration_for_drop_table/132_create_migration_for_drop_table.yaml
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/132_create_migration_for_drop_table.yaml
@@ -5,7 +5,7 @@ info:
 
 x-deleted-schemas:
   - Pristine
-  - Fruit # Example: table name evaluated to `itt_fruits`. `itt_` is prefix set in DB config
+  - Fruit # Example: table name is evaluated to `itt_fruits`, if `itt_` is prefix set in DB config
   - Mango: the_mango_table_name # custom table name; see `x-table` in README.md
   - Animal: the_animal_table_name
   - Upk

From d9bad2e15d9c802d3984bafcf54e66dfb6da6f71 Mon Sep 17 00:00:00 2001
From: Sohel Ahmed Mesaniya <sam.wankaner@gmail.com>
Date: Wed, 26 Jun 2024 19:41:32 +0530
Subject: [PATCH 44/71] Polish

---
 src/lib/AttributeResolver.php               | 154 +++++++-------
 src/lib/items/Attribute.php                 |   2 +-
 src/lib/migrations/BaseMigrationBuilder.php |   3 -
 tests/unit/AttributeResolverTest.php        | 212 ++++++++++----------
 4 files changed, 183 insertions(+), 188 deletions(-)

diff --git a/src/lib/AttributeResolver.php b/src/lib/AttributeResolver.php
index 7bb29bfa..a5a344f5 100644
--- a/src/lib/AttributeResolver.php
+++ b/src/lib/AttributeResolver.php
@@ -7,8 +7,6 @@
 
 namespace cebe\yii2openapi\lib;
 
-use cebe\yii2openapi\lib\Config;
-use cebe\yii2openapi\lib\CustomSpecAttr;
 use cebe\yii2openapi\lib\exceptions\InvalidDefinitionException;
 use cebe\yii2openapi\lib\items\Attribute;
 use cebe\yii2openapi\lib\items\AttributeRelation;
@@ -20,9 +18,9 @@
 use cebe\yii2openapi\lib\openapi\ComponentSchema;
 use cebe\yii2openapi\lib\openapi\PropertySchema;
 use Yii;
+use yii\base\InvalidConfigException;
 use yii\helpers\Inflector;
 use yii\helpers\StringHelper;
-use yii\helpers\VarDumper;
 use function explode;
 use function strpos;
 use function strtolower;
@@ -63,7 +61,7 @@ class AttributeResolver
     private $schema;
 
     /**
-     * @var \cebe\yii2openapi\lib\items\JunctionSchemas
+     * @var JunctionSchemas
      */
     private $junctions;
 
@@ -88,14 +86,14 @@ public function __construct(string $schemaName, ComponentSchema $schema, Junctio
     }
 
     /**
-     * @return \cebe\yii2openapi\lib\items\DbModel
-     * @throws \cebe\yii2openapi\lib\exceptions\InvalidDefinitionException
-     * @throws \yii\base\InvalidConfigException
+     * @return DbModel
+     * @throws InvalidDefinitionException
+     * @throws InvalidConfigException
      */
-    public function resolve():DbModel
+    public function resolve(): DbModel
     {
         foreach ($this->schema->getProperties() as $property) {
-            /** @var $property \cebe\yii2openapi\lib\openapi\PropertySchema */
+            /** @var $property PropertySchema */
 
             $isRequired = $this->schema->isRequiredProperty($property->getName());
             $nullableValue = $property->getProperty()->getSerializableData()->nullable ?? null;
@@ -130,25 +128,25 @@ public function resolve():DbModel
     }
 
     /**
-     * @param \cebe\yii2openapi\lib\openapi\PropertySchema $property
-     * @param bool                                         $isRequired
-     * @throws \cebe\yii2openapi\lib\exceptions\InvalidDefinitionException
-     * @throws \yii\base\InvalidConfigException
+     * @param PropertySchema $property
+     * @param bool $isRequired
+     * @throws InvalidDefinitionException
+     * @throws InvalidConfigException
      */
-    protected function resolveJunctionTableProperty(PropertySchema $property, bool $isRequired):void
+    protected function resolveJunctionTableProperty(PropertySchema $property, bool $isRequired): void
     {
         if ($this->junctions->isJunctionProperty($this->schemaName, $property->getName())) {
             $junkAttribute = $this->junctions->byJunctionSchema($this->schemaName)[$property->getName()];
             $attribute = Yii::createObject(Attribute::class, [$property->getName()]);
             $attribute->setRequired($isRequired)
-                      ->setDescription($property->getAttr('description', ''))
-                      ->setReadOnly($property->isReadonly())
-                      ->setIsPrimary($property->isPrimaryKey())
-                      ->asReference($junkAttribute['relatedClassName'])
-                      ->setPhpType($junkAttribute['phpType'])
-                      ->setDbType($junkAttribute['dbType'])
-                      ->setForeignKeyColumnName($property->fkColName)
-                      ->setTableName($this->schema->resolveTableName($this->schemaName));
+                ->setDescription($property->getAttr('description', ''))
+                ->setReadOnly($property->isReadonly())
+                ->setIsPrimary($property->isPrimaryKey())
+                ->asReference($junkAttribute['relatedClassName'])
+                ->setPhpType($junkAttribute['phpType'])
+                ->setDbType($junkAttribute['dbType'])
+                ->setForeignKeyColumnName($property->fkColName)
+                ->setTableName($this->schema->resolveTableName($this->schemaName));
             $relation = Yii::createObject(AttributeRelation::class, [
                 $property->getName(),
                 $junkAttribute['relatedTableName'],
@@ -163,12 +161,12 @@ protected function resolveJunctionTableProperty(PropertySchema $property, bool $
     }
 
     /**
-     * @param \cebe\yii2openapi\lib\openapi\PropertySchema $property
-     * @param bool                                         $isRequired
-     * @throws \cebe\yii2openapi\lib\exceptions\InvalidDefinitionException
-     * @throws \yii\base\InvalidConfigException
+     * @param PropertySchema $property
+     * @param bool $isRequired
+     * @throws InvalidDefinitionException
+     * @throws InvalidConfigException
      */
-    protected function resolveHasMany2ManyTableProperty(PropertySchema $property, bool $isRequired):void
+    protected function resolveHasMany2ManyTableProperty(PropertySchema $property, bool $isRequired): void
     {
         if ($this->junctions->isManyToManyProperty($this->schemaName, $property->getName())) {
             return;
@@ -198,7 +196,7 @@ protected function resolveHasMany2ManyTableProperty(PropertySchema $property, bo
 
             $this->relations[Inflector::pluralize($junkRef)] =
                 Yii::createObject(AttributeRelation::class, [$junkRef, $junkAttribute['junctionTable'], $viaModel])
-                   ->asHasMany([$junkAttribute['pairProperty'] . '_id' => $this->schema->getPkName()]);
+                    ->asHasMany([$junkAttribute['pairProperty'] . '_id' => $this->schema->getPkName()]);
             return;
         }
 
@@ -206,36 +204,37 @@ protected function resolveHasMany2ManyTableProperty(PropertySchema $property, bo
     }
 
     /**
-     * @param \cebe\yii2openapi\lib\openapi\PropertySchema $property
-     * @param bool                                         $isRequired
-     * @param bool|null|string                             $nullableValue if string then its value will be only constant `ARG_ABSENT`. Default `null` is avoided because it can be in passed value in method call
-     * @throws \cebe\yii2openapi\lib\exceptions\InvalidDefinitionException
-     * @throws \yii\base\InvalidConfigException
+     * @param PropertySchema $property
+     * @param bool $isRequired
+     * @param bool|null|string $nullableValue if string then its value will be only constant `ARG_ABSENT`. Default `null` is avoided because it can be in passed value in method call
+     * @throws InvalidDefinitionException
+     * @throws InvalidConfigException
      */
     protected function resolveProperty(
         PropertySchema $property,
-        bool $isRequired,
-        $nullableValue = 'ARG_ABSENT'
-    ):void {
+        bool           $isRequired,
+                       $nullableValue = 'ARG_ABSENT'
+    ): void
+    {
         if ($nullableValue === 'ARG_ABSENT') {
             $nullableValue = $property->getProperty()->getSerializableData()->nullable ?? null;
         }
         $attribute = Yii::createObject(Attribute::class, [$property->getName()]);
         $attribute->setRequired($isRequired)
-                  ->setDescription($property->getAttr('description', ''))
-                  ->setReadOnly($property->isReadonly())
-                  ->setDefault($property->guessDefault())
-                  ->setXDbType($property->getAttr(CustomSpecAttr::DB_TYPE))
-                  ->setXDbDefaultExpression($property->getAttr(CustomSpecAttr::DB_DEFAULT_EXPRESSION))
-                  ->setNullable($nullableValue)
-                  ->setIsPrimary($property->isPrimaryKey())
-                  ->setForeignKeyColumnName($property->fkColName)
-                  ->setTableName($this->schema->resolveTableName($this->schemaName));
+            ->setDescription($property->getAttr('description', ''))
+            ->setReadOnly($property->isReadonly())
+            ->setDefault($property->guessDefault())
+            ->setXDbType($property->getAttr(CustomSpecAttr::DB_TYPE))
+            ->setXDbDefaultExpression($property->getAttr(CustomSpecAttr::DB_DEFAULT_EXPRESSION))
+            ->setNullable($nullableValue)
+            ->setIsPrimary($property->isPrimaryKey())
+            ->setForeignKeyColumnName($property->fkColName)
+            ->setTableName($this->schema->resolveTableName($this->schemaName));
         if ($property->isReference()) {
             if ($property->isVirtual()) {
                 throw new InvalidDefinitionException('References not supported for virtual attributes');
             }
-            
+
             if ($property->isNonDbReference()) {
                 $attribute->asNonDbReference($property->getRefClassName());
                 $relation = Yii::createObject(
@@ -260,17 +259,17 @@ protected function resolveProperty(
             [$min, $max] = $fkProperty->guessMinMax();
             $attribute->asReference($relatedClassName);
             $attribute->setPhpType($fkProperty->guessPhpType())
-                      ->setDbType($fkProperty->guessDbType(true))
-                      ->setSize($fkProperty->getMaxLength())
-                      ->setDescription($property->getRefSchema()->getDescription())
-                      ->setDefault($fkProperty->guessDefault())
-                      ->setLimits($min, $max, $fkProperty->getMinLength());
+                ->setDbType($fkProperty->guessDbType(true))
+                ->setSize($fkProperty->getMaxLength())
+                ->setDescription($property->getRefSchema()->getDescription())
+                ->setDefault($fkProperty->guessDefault())
+                ->setLimits($min, $max, $fkProperty->getMinLength());
 
             $relation = Yii::createObject(
                 AttributeRelation::class,
                 [$property->getName(), $relatedTableName, $relatedClassName]
             )
-                           ->asHasOne([$fkProperty->getName() => $attribute->columnName]);
+                ->asHasOne([$fkProperty->getName() => $attribute->columnName]);
             $relation->onUpdateFkConstraint = $property->onUpdateFkConstraint;
             $relation->onDeleteFkConstraint = $property->onDeleteFkConstraint;
             if ($property->isRefPointerToSelf()) {
@@ -281,10 +280,10 @@ protected function resolveProperty(
         if (!$property->isReference() && !$property->hasRefItems()) {
             [$min, $max] = $property->guessMinMax();
             $attribute->setIsVirtual($property->isVirtual())
-                      ->setPhpType($property->guessPhpType())
-                      ->setDbType($property->guessDbType())
-                      ->setSize($property->getMaxLength())
-                      ->setLimits($min, $max, $property->getMinLength());
+                ->setPhpType($property->guessPhpType())
+                ->setDbType($property->guessDbType())
+                ->setSize($property->getMaxLength())
+                ->setLimits($min, $max, $property->getMinLength());
             if ($property->hasEnum()) {
                 $attribute->setEnumValues($property->getAttr('enum'));
             }
@@ -321,7 +320,7 @@ protected function resolveProperty(
                             AttributeRelation::class,
                             [$property->getName(), $relatedTableName, $relatedClassName]
                         )
-                           ->asHasMany([$fkProperty->getName() => $fkProperty->getName()])->asSelfReference();
+                            ->asHasMany([$fkProperty->getName() => $fkProperty->getName()])->asSelfReference();
                     return;
                 }
                 $foreignPk = Inflector::camel2id($fkProperty->getName(), '_') . '_id';
@@ -330,7 +329,7 @@ protected function resolveProperty(
                         AttributeRelation::class,
                         [$property->getName(), $relatedTableName, $relatedClassName]
                     )
-                       ->asHasMany([$foreignPk => $this->schema->getPkName()]);
+                        ->asHasMany([$foreignPk => $this->schema->getPkName()]);
                 return;
             }
             $relatedClassName = $property->getRefClassName();
@@ -349,7 +348,7 @@ protected function resolveProperty(
                     AttributeRelation::class,
                     [$property->getName(), $relatedTableName, $relatedClassName]
                 )
-                   ->asHasMany([Inflector::camel2id($this->schemaName, '_') . '_id' => $this->schema->getPkName()]);
+                    ->asHasMany([Inflector::camel2id($this->schemaName, '_') . '_id' => $this->schema->getPkName()]);
             return;
         }
         if ($this->schema->isNonDb() && $attribute->isReference()) {
@@ -369,14 +368,15 @@ protected function resolveProperty(
      * @param string $relatedTableName
      * @param ComponentSchema $refSchema
      * @return bool
-     * @throws \yii\base\InvalidConfigException
+     * @throws InvalidConfigException
      */
     protected function catchManyToMany(
-        string $propertyName,
-        string $relatedSchemaName,
-        string $relatedTableName,
+        string          $propertyName,
+        string          $relatedSchemaName,
+        string          $relatedTableName,
         ComponentSchema $refSchema
-    ):bool {
+    ): bool
+    {
         if (strtolower(Inflector::id2camel($propertyName, '_'))
             !== strtolower(Inflector::pluralize($relatedSchemaName))) {
             return false;
@@ -408,9 +408,9 @@ protected function catchManyToMany(
     }
 
     /**
-     * @throws \yii\base\InvalidConfigException
+     * @throws InvalidConfigException
      */
-    protected function guessFakerStub(Attribute $attribute, PropertySchema $property):?string
+    protected function guessFakerStub(Attribute $attribute, PropertySchema $property): ?string
     {
         $resolver = Yii::createObject(['class' => FakerStubResolver::class], [$attribute, $property, $this->config]);
         return $resolver->resolve();
@@ -419,9 +419,9 @@ protected function guessFakerStub(Attribute $attribute, PropertySchema $property
     /**
      * @param array $indexes
      * @return array|DbIndex[]
-     * @throws \cebe\yii2openapi\lib\exceptions\InvalidDefinitionException
+     * @throws InvalidDefinitionException
      */
-    protected function prepareIndexes(array $indexes):array
+    protected function prepareIndexes(array $indexes): array
     {
         $dbIndexes = [];
         foreach ($indexes as $index) {
@@ -472,12 +472,12 @@ protected function prepareIndexes(array $indexes):array
     }
 
     /**
-     * @param \cebe\yii2openapi\lib\openapi\PropertySchema $property
-     * @param \cebe\yii2openapi\lib\items\Attribute        $attribute
+     * @param PropertySchema $property
+     * @param Attribute $attribute
      * @return void
-     * @throws \yii\base\InvalidConfigException
+     * @throws InvalidConfigException
      */
-    protected function resolvePropertyRef(PropertySchema $property, Attribute $attribute):void
+    protected function resolvePropertyRef(PropertySchema $property, Attribute $attribute): void
     {
         $fkProperty = new PropertySchema(
             $property->getRefSchema()->getSchema(),
@@ -486,11 +486,11 @@ protected function resolvePropertyRef(PropertySchema $property, Attribute $attri
         );
         [$min, $max] = $fkProperty->guessMinMax();
         $attribute->setPhpType($fkProperty->guessPhpType())
-                  ->setDbType($fkProperty->guessDbType(true))
-                  ->setSize($fkProperty->getMaxLength())
-                  ->setDescription($fkProperty->getAttr('description'))
-                  ->setDefault($fkProperty->guessDefault())
-                  ->setLimits($min, $max, $fkProperty->getMinLength());
+            ->setDbType($fkProperty->guessDbType(true))
+            ->setSize($fkProperty->getMaxLength())
+            ->setDescription($fkProperty->getAttr('description'))
+            ->setDefault($fkProperty->guessDefault())
+            ->setLimits($min, $max, $fkProperty->getMinLength());
         $this->attributes[$property->getName()] =
             $attribute->setFakerStub($this->guessFakerStub($attribute, $fkProperty));
     }
diff --git a/src/lib/items/Attribute.php b/src/lib/items/Attribute.php
index d697e78f..26a079d9 100644
--- a/src/lib/items/Attribute.php
+++ b/src/lib/items/Attribute.php
@@ -150,7 +150,7 @@ public function setDbType(string $dbType):Attribute
         return $this;
     }
 
-    public function setTableName(string $tableName):Attribute
+    public function setTableName(string $tableName): Attribute
     {
         $this->tableName = $tableName;
         return $this;
diff --git a/src/lib/migrations/BaseMigrationBuilder.php b/src/lib/migrations/BaseMigrationBuilder.php
index d028612c..7ec2e3fc 100644
--- a/src/lib/migrations/BaseMigrationBuilder.php
+++ b/src/lib/migrations/BaseMigrationBuilder.php
@@ -598,13 +598,10 @@ public function buildTablesDrop(): void
             return;
         }
 
-//        $this->migration->addDownCode($this->recordBuilder->addPrimaryKey($this->model->getTableAlias(), $this->tableSchema->primaryKey));
-
         $this->migration->addUpCode($this->recordBuilder->dropTable($this->model->getTableAlias()))
             ->addDownCode(
                 $this->recordBuilder->createTable(
                     $this->model->getTableAlias(),
-//                    $this->model->attributesToColumnSchema()
                     SchemaToDatabase::enhanceColumnSchemas($this->tableSchema->columns)
                 )
             );
diff --git a/tests/unit/AttributeResolverTest.php b/tests/unit/AttributeResolverTest.php
index 2a974d96..9c55107c 100644
--- a/tests/unit/AttributeResolverTest.php
+++ b/tests/unit/AttributeResolverTest.php
@@ -12,122 +12,120 @@
 use cebe\yii2openapi\lib\openapi\ComponentSchema;
 use tests\DbTestCase;
 use Yii;
-use yii\helpers\VarDumper;
-use const PHP_EOL;
 
 class AttributeResolverTest extends DbTestCase
 {
-     public function testManyToManyResolve()
-     {
-         $schemaFile = Yii::getAlias("@specs/many2many.yaml");
-         $openApi = Reader::readFromYamlFile($schemaFile, OpenApi::class, false);
-         $schema = new ComponentSchema($openApi->components->schemas['Post'], 'Post');
-         $postModel = (new AttributeResolver('Post', $schema, new JunctionSchemas([])))->resolve();
-         self::assertNotEmpty($postModel->many2many);
-         $relation = $postModel->many2many['tags'];
-         self::assertInstanceOf(ManyToManyRelation::class, $relation);
-         self::assertEquals('Tag', $relation->relatedClassName);
-         self::assertEquals('Post', $relation->className);
-         self::assertEquals('id', $relation->pkAttribute->propertyName);
-         self::assertEquals('posts2tags', $relation->getViaTableName());
-         self::assertEquals(['id' => 'tag_id'], $relation->getLink());
-         self::assertEquals(['post_id' => 'id'], $relation->getViaLink());
+    public function testManyToManyResolve()
+    {
+        $schemaFile = Yii::getAlias("@specs/many2many.yaml");
+        $openApi = Reader::readFromYamlFile($schemaFile, OpenApi::class, false);
+        $schema = new ComponentSchema($openApi->components->schemas['Post'], 'Post');
+        $postModel = (new AttributeResolver('Post', $schema, new JunctionSchemas([])))->resolve();
+        self::assertNotEmpty($postModel->many2many);
+        $relation = $postModel->many2many['tags'];
+        self::assertInstanceOf(ManyToManyRelation::class, $relation);
+        self::assertEquals('Tag', $relation->relatedClassName);
+        self::assertEquals('Post', $relation->className);
+        self::assertEquals('id', $relation->pkAttribute->propertyName);
+        self::assertEquals('posts2tags', $relation->getViaTableName());
+        self::assertEquals(['id' => 'tag_id'], $relation->getLink());
+        self::assertEquals(['post_id' => 'id'], $relation->getViaLink());
 
-         $schema = new ComponentSchema($openApi->components->schemas['Tag'], 'Tag');
-         $tagModel = (new AttributeResolver('Tag', $schema, new JunctionSchemas([])))->resolve();
-         self::assertNotEmpty($tagModel->many2many);
-         $relation = $tagModel->many2many['posts'];
-         self::assertInstanceOf(ManyToManyRelation::class, $relation);
-         self::assertEquals('Post', $relation->relatedClassName);
-         self::assertEquals('Tag', $relation->className);
-         self::assertEquals('id', $relation->pkAttribute->propertyName);
-         self::assertEquals('posts2tags', $relation->getViaTableName());
-         self::assertEquals(['id' => 'post_id'], $relation->getLink());
-         self::assertEquals(['tag_id' => 'id'], $relation->getViaLink());
+        $schema = new ComponentSchema($openApi->components->schemas['Tag'], 'Tag');
+        $tagModel = (new AttributeResolver('Tag', $schema, new JunctionSchemas([])))->resolve();
+        self::assertNotEmpty($tagModel->many2many);
+        $relation = $tagModel->many2many['posts'];
+        self::assertInstanceOf(ManyToManyRelation::class, $relation);
+        self::assertEquals('Post', $relation->relatedClassName);
+        self::assertEquals('Tag', $relation->className);
+        self::assertEquals('id', $relation->pkAttribute->propertyName);
+        self::assertEquals('posts2tags', $relation->getViaTableName());
+        self::assertEquals(['id' => 'post_id'], $relation->getLink());
+        self::assertEquals(['tag_id' => 'id'], $relation->getViaLink());
 
 
-     }
+    }
 
-     /**
-      * @dataProvider dataProvider
-      * @param string                              $schemaName
-      * @param \cebe\openapi\spec\Schema           $openApiSchema
-      * @param \cebe\yii2openapi\lib\items\DbModel $expected
-      */
-     public function testResolve(string $schemaName, Schema $openApiSchema, DbModel $expected):void
-     {
-         $schema = new ComponentSchema($openApiSchema, $schemaName);
-         $resolver = new AttributeResolver($schemaName, $schema, new JunctionSchemas([]));
-         $model = $resolver->resolve();
-         //echo $schemaName . PHP_EOL;
-         self::assertEquals($expected->name, $model->name);
-         self::assertEquals($expected->tableName, $model->tableName);
-         self::assertEquals($expected->description, $model->description);
-         self::assertEquals($expected->tableAlias, $model->tableAlias);
-         //VarDumper::dump($model->indexes);
-         self::assertEquals($expected->indexes, $model->indexes);
-         foreach ($model->relations as $name => $relation) {
-             self::assertTrue(isset($expected->relations[$name]));
-             self::assertEquals($expected->relations[$name], $relation);
-         }
+    /**
+     * @dataProvider dataProvider
+     * @param string $schemaName
+     * @param Schema $openApiSchema
+     * @param DbModel $expected
+     */
+    public function testResolve(string $schemaName, Schema $openApiSchema, DbModel $expected): void
+    {
+        $schema = new ComponentSchema($openApiSchema, $schemaName);
+        $resolver = new AttributeResolver($schemaName, $schema, new JunctionSchemas([]));
+        $model = $resolver->resolve();
+        //echo $schemaName . PHP_EOL;
+        self::assertEquals($expected->name, $model->name);
+        self::assertEquals($expected->tableName, $model->tableName);
+        self::assertEquals($expected->description, $model->description);
+        self::assertEquals($expected->tableAlias, $model->tableAlias);
+        //VarDumper::dump($model->indexes);
+        self::assertEquals($expected->indexes, $model->indexes);
+        foreach ($model->relations as $name => $relation) {
+            self::assertTrue(isset($expected->relations[$name]));
+            self::assertEquals($expected->relations[$name], $relation);
+        }
 
-         foreach ($model->attributes as $name => $attribute) {
-             $attribute->tableName = null; # just skip `tableName` from testing as of now
-             self::assertTrue(isset($expected->attributes[$name]));
-             self::assertEquals($expected->attributes[$name], $attribute);
-         }
-     }
+        foreach ($model->attributes as $name => $attribute) {
+            $attribute->tableName = null; # just skip `tableName` from testing as of now
+            self::assertTrue(isset($expected->attributes[$name]));
+            self::assertEquals($expected->attributes[$name], $attribute);
+        }
+    }
 
-     public function dataProvider():array
-     {
-         $schemaFile = Yii::getAlias("@specs/blog.yaml");
-         $fixture = require Yii::getAlias('@fixtures/blog.php');
-         $openApi = Reader::readFromYamlFile($schemaFile, OpenApi::class, false);
-         return [
-             [
-                 'User',
-                 $openApi->components->schemas['User'],
-                 $fixture['user'],
-             ],
-             [
-                 'Category',
-                 $openApi->components->schemas['Category'],
-                 $fixture['category'],
-             ],
-             [
-                 'Post',
-                 $openApi->components->schemas['Post'],
-                 $fixture['post'],
-             ],
-             [
-                 'Comment',
-                 $openApi->components->schemas['Comment'],
-                 $fixture['comment'],
-             ],
-         ];
-     }
+    public function dataProvider(): array
+    {
+        $schemaFile = Yii::getAlias("@specs/blog.yaml");
+        $fixture = require Yii::getAlias('@fixtures/blog.php');
+        $openApi = Reader::readFromYamlFile($schemaFile, OpenApi::class, false);
+        return [
+            [
+                'User',
+                $openApi->components->schemas['User'],
+                $fixture['user'],
+            ],
+            [
+                'Category',
+                $openApi->components->schemas['Category'],
+                $fixture['category'],
+            ],
+            [
+                'Post',
+                $openApi->components->schemas['Post'],
+                $fixture['post'],
+            ],
+            [
+                'Comment',
+                $openApi->components->schemas['Comment'],
+                $fixture['comment'],
+            ],
+        ];
+    }
 
-     public function testResolveRefNoObject()
-     {
-         $schemaFile = Yii::getAlias("@specs/ref_noobject.yaml");
-         $openApi = Reader::readFromYamlFile($schemaFile, OpenApi::class, false);
-         $schema = new ComponentSchema($openApi->components->schemas['PersonWatch'], 'PersonWatch');
-         $resolver = new AttributeResolver('PersonWatch', $schema, new JunctionSchemas([]));
-         $model = $resolver->resolve();
-         $fixture = require Yii::getAlias('@fixtures/non-db.php');
-         $testModel = $fixture['personWatch'];
-         self::assertEquals($testModel, $model);
-     }
+    public function testResolveRefNoObject()
+    {
+        $schemaFile = Yii::getAlias("@specs/ref_noobject.yaml");
+        $openApi = Reader::readFromYamlFile($schemaFile, OpenApi::class, false);
+        $schema = new ComponentSchema($openApi->components->schemas['PersonWatch'], 'PersonWatch');
+        $resolver = new AttributeResolver('PersonWatch', $schema, new JunctionSchemas([]));
+        $model = $resolver->resolve();
+        $fixture = require Yii::getAlias('@fixtures/non-db.php');
+        $testModel = $fixture['personWatch'];
+        self::assertEquals($testModel, $model);
+    }
 
-     public function testResolveNonDbModel()
-     {
-         $schemaFile = Yii::getAlias("@specs/petstore_jsonapi.yaml");
-         $openApi = Reader::readFromYamlFile($schemaFile, OpenApi::class, false);
-         $schema = new ComponentSchema($openApi->components->schemas['PetStatistic'], 'PetStatistic');
-         $resolver = new AttributeResolver('PetStatistic', $schema, new JunctionSchemas([]));
-         $model = $resolver->resolve();
-         $fixture = require Yii::getAlias('@fixtures/non-db.php');
-         $testModel = $fixture['PetStatistic'];
-         self::assertEquals($testModel, $model);
-     }
+    public function testResolveNonDbModel()
+    {
+        $schemaFile = Yii::getAlias("@specs/petstore_jsonapi.yaml");
+        $openApi = Reader::readFromYamlFile($schemaFile, OpenApi::class, false);
+        $schema = new ComponentSchema($openApi->components->schemas['PetStatistic'], 'PetStatistic');
+        $resolver = new AttributeResolver('PetStatistic', $schema, new JunctionSchemas([]));
+        $model = $resolver->resolve();
+        $fixture = require Yii::getAlias('@fixtures/non-db.php');
+        $testModel = $fixture['PetStatistic'];
+        self::assertEquals($testModel, $model);
+    }
 }

From 29761255fecba33c30d662cbf42046187a4ead1c Mon Sep 17 00:00:00 2001
From: Sohel Ahmed Mesaniya <sam.wankaner@gmail.com>
Date: Wed, 26 Jun 2024 19:43:22 +0530
Subject: [PATCH 45/71] Fix style

---
 src/lib/AttributeResolver.php | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/lib/AttributeResolver.php b/src/lib/AttributeResolver.php
index a5a344f5..9c0d2c92 100644
--- a/src/lib/AttributeResolver.php
+++ b/src/lib/AttributeResolver.php
@@ -213,9 +213,8 @@ protected function resolveHasMany2ManyTableProperty(PropertySchema $property, bo
     protected function resolveProperty(
         PropertySchema $property,
         bool           $isRequired,
-                       $nullableValue = 'ARG_ABSENT'
-    ): void
-    {
+        $nullableValue = 'ARG_ABSENT'
+    ): void {
         if ($nullableValue === 'ARG_ABSENT') {
             $nullableValue = $property->getProperty()->getSerializableData()->nullable ?? null;
         }
@@ -375,8 +374,7 @@ protected function catchManyToMany(
         string          $relatedSchemaName,
         string          $relatedTableName,
         ComponentSchema $refSchema
-    ): bool
-    {
+    ): bool {
         if (strtolower(Inflector::id2camel($propertyName, '_'))
             !== strtolower(Inflector::pluralize($relatedSchemaName))) {
             return false;

From 5ffbb338c5e57fe7fc7e610476dbb7c6cab6fca8 Mon Sep 17 00:00:00 2001
From: Sohel Ahmed Mesaniya <sam.wankaner@gmail.com>
Date: Wed, 26 Jun 2024 20:11:53 +0530
Subject: [PATCH 46/71] Update README.md

---
 README.md | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/README.md b/README.md
index c32d577e..a1b22067 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,5 @@
 # yii2-openapi
 
->
-> **This repository has been moved to <https://github.com/php-openapi/yii2-openapi>.**  
-> **Please use the new package `php-openapi/yii2-openapi` instead.**
->
-
 REST API application generator for Yii2, openapi 3.0 YAML -> Yii2.
 
 Base on [Gii, the Yii Framework Code Generator](https://www.yiiframework.com/extension/yiisoft/yii2-gii).

From 48e07b251069874b4e47914c0bfcceca9842ba85 Mon Sep 17 00:00:00 2001
From: Sohel Ahmed Mesaniya <sam.wankaner@gmail.com>
Date: Thu, 25 Jul 2024 10:52:45 +0530
Subject: [PATCH 47/71] Undo disable sorting for non dependent models

---
 src/lib/generators/MigrationsGenerator.php | 29 ++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/src/lib/generators/MigrationsGenerator.php b/src/lib/generators/MigrationsGenerator.php
index 828b7c30..4a22e6f8 100644
--- a/src/lib/generators/MigrationsGenerator.php
+++ b/src/lib/generators/MigrationsGenerator.php
@@ -152,6 +152,9 @@ protected function createBuilder(DbModel $model):BaseMigrationBuilder
     protected function sortMigrationsByDeps():array
     {
         $this->sorted = [];
+        if ($this->shouldSortMigrations($this->migrations)) {
+            ksort($this->migrations);
+        }
         foreach ($this->migrations as $migration) {
             //echo "adding {$migration->tableAlias}\n";
             $this->sortByDependencyRecurse($migration);
@@ -181,4 +184,30 @@ protected function sortByDependencyRecurse(MigrationModel $migration):void
             throw new Exception("A circular dependency is detected for table '{$migration->tableAlias}'.");
         }
     }
+
+    /**
+     * Are tables to drop are internally dependent? If yes then don't sort (ksort)
+     * @param $migrations array (tableAlias => MigrationModel)[]
+     */
+    public function shouldSortMigrations(array $migrations): bool
+    {
+        $tables = array_keys($migrations);
+
+        foreach ($this->models as $dbModel) {
+            /** @var DbModel $dbModel */
+            if ($dbModel->drop) {
+                $ts = Yii::$app->db->getTableSchema('{{%'.$dbModel->tableName.'}}', true);
+                if ($ts) {
+                    foreach ($ts->foreignKeys as $fk) {
+                        $fkTableName = str_replace(Yii::$app->db->tablePrefix, '{{%', $fk[0]);
+                        $fkTableName .= '}}';
+                        if (in_array($fkTableName, $tables)) {
+                            return false;
+                        }
+                    }
+                }
+            }
+        }
+        return true;
+    }
 }

From cf12d6f8985eb5decc69bb47f71bc138c3831505 Mon Sep 17 00:00:00 2001
From: Sohel Ahmed Mesaniya <sam.wankaner@gmail.com>
Date: Thu, 25 Jul 2024 15:23:41 +0530
Subject: [PATCH 48/71] Add test for independent tables drop sort

---
 src/lib/generators/MigrationsGenerator.php    |  4 +-
 .../index.php                                 | 13 ++++
 .../index.yaml                                | 31 ++++++++++
 .../m200000_000000_delete_table_bigpks.php    | 20 ++++++
 .../m200000_000001_create_table_foos.php      | 20 ++++++
 .../m200000_000002_delete_table_ubigpks.php   | 26 ++++++++
 .../m200000_000003_delete_table_upks.php      | 20 ++++++
 .../mysql/models/Bigpk.php                    | 10 +++
 .../mysql/models/Foo.php                      | 10 +++
 .../mysql/models/Ubigpk.php                   | 10 +++
 .../mysql/models/Upk.php                      | 10 +++
 .../mysql/models/base/Bigpk.php               | 26 ++++++++
 .../mysql/models/base/Foo.php                 | 25 ++++++++
 .../mysql/models/base/Ubigpk.php              | 46 ++++++++++++++
 .../mysql/models/base/Upk.php                 | 26 ++++++++
 tests/unit/IssueFixTest.php                   | 62 +++++++++++++++----
 16 files changed, 344 insertions(+), 15 deletions(-)
 create mode 100644 tests/specs/issue_fix/132_create_migration_for_drop_table/case_independent_tables_drop_sort/index.php
 create mode 100644 tests/specs/issue_fix/132_create_migration_for_drop_table/case_independent_tables_drop_sort/index.yaml
 create mode 100644 tests/specs/issue_fix/132_create_migration_for_drop_table/case_independent_tables_drop_sort/mysql/migrations_mysql_db/m200000_000000_delete_table_bigpks.php
 create mode 100644 tests/specs/issue_fix/132_create_migration_for_drop_table/case_independent_tables_drop_sort/mysql/migrations_mysql_db/m200000_000001_create_table_foos.php
 create mode 100644 tests/specs/issue_fix/132_create_migration_for_drop_table/case_independent_tables_drop_sort/mysql/migrations_mysql_db/m200000_000002_delete_table_ubigpks.php
 create mode 100644 tests/specs/issue_fix/132_create_migration_for_drop_table/case_independent_tables_drop_sort/mysql/migrations_mysql_db/m200000_000003_delete_table_upks.php
 create mode 100644 tests/specs/issue_fix/132_create_migration_for_drop_table/case_independent_tables_drop_sort/mysql/models/Bigpk.php
 create mode 100644 tests/specs/issue_fix/132_create_migration_for_drop_table/case_independent_tables_drop_sort/mysql/models/Foo.php
 create mode 100644 tests/specs/issue_fix/132_create_migration_for_drop_table/case_independent_tables_drop_sort/mysql/models/Ubigpk.php
 create mode 100644 tests/specs/issue_fix/132_create_migration_for_drop_table/case_independent_tables_drop_sort/mysql/models/Upk.php
 create mode 100644 tests/specs/issue_fix/132_create_migration_for_drop_table/case_independent_tables_drop_sort/mysql/models/base/Bigpk.php
 create mode 100644 tests/specs/issue_fix/132_create_migration_for_drop_table/case_independent_tables_drop_sort/mysql/models/base/Foo.php
 create mode 100644 tests/specs/issue_fix/132_create_migration_for_drop_table/case_independent_tables_drop_sort/mysql/models/base/Ubigpk.php
 create mode 100644 tests/specs/issue_fix/132_create_migration_for_drop_table/case_independent_tables_drop_sort/mysql/models/base/Upk.php

diff --git a/src/lib/generators/MigrationsGenerator.php b/src/lib/generators/MigrationsGenerator.php
index 4a22e6f8..1c0dfb51 100644
--- a/src/lib/generators/MigrationsGenerator.php
+++ b/src/lib/generators/MigrationsGenerator.php
@@ -152,7 +152,7 @@ protected function createBuilder(DbModel $model):BaseMigrationBuilder
     protected function sortMigrationsByDeps():array
     {
         $this->sorted = [];
-        if ($this->shouldSortMigrations($this->migrations)) {
+        if ($this->shouldSortMigrationsForDropTables($this->migrations)) {
             ksort($this->migrations);
         }
         foreach ($this->migrations as $migration) {
@@ -189,7 +189,7 @@ protected function sortByDependencyRecurse(MigrationModel $migration):void
      * Are tables to drop are internally dependent? If yes then don't sort (ksort)
      * @param $migrations array (tableAlias => MigrationModel)[]
      */
-    public function shouldSortMigrations(array $migrations): bool
+    public function shouldSortMigrationsForDropTables(array $migrations): bool
     {
         $tables = array_keys($migrations);
 
diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/case_independent_tables_drop_sort/index.php b/tests/specs/issue_fix/132_create_migration_for_drop_table/case_independent_tables_drop_sort/index.php
new file mode 100644
index 00000000..3987f0d2
--- /dev/null
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/case_independent_tables_drop_sort/index.php
@@ -0,0 +1,13 @@
+<?php
+
+return [
+    'openApiPath' => '@specs/issue_fix/132_create_migration_for_drop_table/case_independent_tables_drop_sort/index.yaml',
+    'generateUrls' => false,
+    'generateModels' => true,
+    'excludeModels' => [
+        'Error',
+    ],
+    'generateControllers' => false,
+    'generateMigrations' => true,
+    'generateModelFaker' => false,
+];
diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/case_independent_tables_drop_sort/index.yaml b/tests/specs/issue_fix/132_create_migration_for_drop_table/case_independent_tables_drop_sort/index.yaml
new file mode 100644
index 00000000..7246c450
--- /dev/null
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/case_independent_tables_drop_sort/index.yaml
@@ -0,0 +1,31 @@
+openapi: "3.0.0"
+info:
+  version: 1.0.0
+  title: 132_create_migration_for_drop_table \#132
+
+x-deleted-schemas:
+  - Upk
+  - Bigpk
+  - Ubigpk
+
+paths:
+  /:
+    get:
+      summary: List
+      operationId: list
+      responses:
+        '200':
+          description: The information
+
+components:
+  schemas:
+    Foo: # if you remove this entire schema and want to remove its table then you need to add its table name in `x-deleted-schemas`
+      type: object
+      description: 132_create_migration_for_drop_table
+      required:
+        - id
+      properties:
+        id:
+          type: integer
+        factor:
+          type: integer
diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/case_independent_tables_drop_sort/mysql/migrations_mysql_db/m200000_000000_delete_table_bigpks.php b/tests/specs/issue_fix/132_create_migration_for_drop_table/case_independent_tables_drop_sort/mysql/migrations_mysql_db/m200000_000000_delete_table_bigpks.php
new file mode 100644
index 00000000..9f129332
--- /dev/null
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/case_independent_tables_drop_sort/mysql/migrations_mysql_db/m200000_000000_delete_table_bigpks.php
@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * Table for Bigpk
+ */
+class m200000_000000_delete_table_bigpks extends \yii\db\Migration
+{
+    public function up()
+    {
+        $this->dropTable('{{%bigpks}}');
+    }
+
+    public function down()
+    {
+        $this->createTable('{{%bigpks}}', [
+            'id' => $this->bigPrimaryKey(),
+            'name' => $this->string(150)->null()->defaultValue(null),
+        ]);
+    }
+}
diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/case_independent_tables_drop_sort/mysql/migrations_mysql_db/m200000_000001_create_table_foos.php b/tests/specs/issue_fix/132_create_migration_for_drop_table/case_independent_tables_drop_sort/mysql/migrations_mysql_db/m200000_000001_create_table_foos.php
new file mode 100644
index 00000000..9f90d171
--- /dev/null
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/case_independent_tables_drop_sort/mysql/migrations_mysql_db/m200000_000001_create_table_foos.php
@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * Table for Foo
+ */
+class m200000_000001_create_table_foos extends \yii\db\Migration
+{
+    public function up()
+    {
+        $this->createTable('{{%foos}}', [
+            'id' => $this->primaryKey(),
+            'factor' => $this->integer()->null()->defaultValue(null),
+        ]);
+    }
+
+    public function down()
+    {
+        $this->dropTable('{{%foos}}');
+    }
+}
diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/case_independent_tables_drop_sort/mysql/migrations_mysql_db/m200000_000002_delete_table_ubigpks.php b/tests/specs/issue_fix/132_create_migration_for_drop_table/case_independent_tables_drop_sort/mysql/migrations_mysql_db/m200000_000002_delete_table_ubigpks.php
new file mode 100644
index 00000000..574610ed
--- /dev/null
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/case_independent_tables_drop_sort/mysql/migrations_mysql_db/m200000_000002_delete_table_ubigpks.php
@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * Table for Ubigpk
+ */
+class m200000_000002_delete_table_ubigpks extends \yii\db\Migration
+{
+    public function up()
+    {
+        $this->dropTable('{{%ubigpks}}');
+    }
+
+    public function down()
+    {
+        $this->createTable('{{%ubigpks}}', [
+            'id' => $this->bigPrimaryKey()->unsigned(),
+            'name' => $this->string(150)->null()->defaultValue(null),
+            'size' => 'enum("x-small", "small", "medium", "large", "x-large") NOT NULL DEFAULT \'x-small\'',
+            'd' => 'smallint(5) unsigned zerofill NULL DEFAULT NULL',
+            'e' => 'mediumint(8) unsigned zerofill NULL DEFAULT NULL',
+            'f' => 'decimal(12,4) NULL DEFAULT NULL',
+            'dp' => $this->double()->null()->defaultValue(null),
+            'dp2' => 'double(10,4) NULL DEFAULT NULL',
+        ]);
+    }
+}
diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/case_independent_tables_drop_sort/mysql/migrations_mysql_db/m200000_000003_delete_table_upks.php b/tests/specs/issue_fix/132_create_migration_for_drop_table/case_independent_tables_drop_sort/mysql/migrations_mysql_db/m200000_000003_delete_table_upks.php
new file mode 100644
index 00000000..e0261bf1
--- /dev/null
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/case_independent_tables_drop_sort/mysql/migrations_mysql_db/m200000_000003_delete_table_upks.php
@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * Table for Upk
+ */
+class m200000_000003_delete_table_upks extends \yii\db\Migration
+{
+    public function up()
+    {
+        $this->dropTable('{{%upks}}');
+    }
+
+    public function down()
+    {
+        $this->createTable('{{%upks}}', [
+            'id' => $this->primaryKey()->unsigned(),
+            'name' => $this->string(150)->null()->defaultValue(null),
+        ]);
+    }
+}
diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/case_independent_tables_drop_sort/mysql/models/Bigpk.php b/tests/specs/issue_fix/132_create_migration_for_drop_table/case_independent_tables_drop_sort/mysql/models/Bigpk.php
new file mode 100644
index 00000000..4f078c1b
--- /dev/null
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/case_independent_tables_drop_sort/mysql/models/Bigpk.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace app\models;
+
+class Bigpk extends \app\models\base\Bigpk
+{
+
+
+}
+
diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/case_independent_tables_drop_sort/mysql/models/Foo.php b/tests/specs/issue_fix/132_create_migration_for_drop_table/case_independent_tables_drop_sort/mysql/models/Foo.php
new file mode 100644
index 00000000..bfbe456f
--- /dev/null
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/case_independent_tables_drop_sort/mysql/models/Foo.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace app\models;
+
+class Foo extends \app\models\base\Foo
+{
+
+
+}
+
diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/case_independent_tables_drop_sort/mysql/models/Ubigpk.php b/tests/specs/issue_fix/132_create_migration_for_drop_table/case_independent_tables_drop_sort/mysql/models/Ubigpk.php
new file mode 100644
index 00000000..2af9ae34
--- /dev/null
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/case_independent_tables_drop_sort/mysql/models/Ubigpk.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace app\models;
+
+class Ubigpk extends \app\models\base\Ubigpk
+{
+
+
+}
+
diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/case_independent_tables_drop_sort/mysql/models/Upk.php b/tests/specs/issue_fix/132_create_migration_for_drop_table/case_independent_tables_drop_sort/mysql/models/Upk.php
new file mode 100644
index 00000000..99449df8
--- /dev/null
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/case_independent_tables_drop_sort/mysql/models/Upk.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace app\models;
+
+class Upk extends \app\models\base\Upk
+{
+
+
+}
+
diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/case_independent_tables_drop_sort/mysql/models/base/Bigpk.php b/tests/specs/issue_fix/132_create_migration_for_drop_table/case_independent_tables_drop_sort/mysql/models/base/Bigpk.php
new file mode 100644
index 00000000..2bf05933
--- /dev/null
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/case_independent_tables_drop_sort/mysql/models/base/Bigpk.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace app\models\base;
+
+/**
+ *
+ *
+ * @property integer $id
+ * @property string $name
+ *
+ */
+abstract class Bigpk extends \yii\db\ActiveRecord
+{
+    public static function tableName()
+    {
+        return '{{%bigpks}}';
+    }
+
+    public function rules()
+    {
+        return [
+            'trim' => [['name'], 'trim'],
+            'name_string' => [['name'], 'string', 'max' => 150],
+        ];
+    }
+}
diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/case_independent_tables_drop_sort/mysql/models/base/Foo.php b/tests/specs/issue_fix/132_create_migration_for_drop_table/case_independent_tables_drop_sort/mysql/models/base/Foo.php
new file mode 100644
index 00000000..49c10419
--- /dev/null
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/case_independent_tables_drop_sort/mysql/models/base/Foo.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace app\models\base;
+
+/**
+ * 132_create_migration_for_drop_table
+ *
+ * @property int $id
+ * @property int $factor
+ *
+ */
+abstract class Foo extends \yii\db\ActiveRecord
+{
+    public static function tableName()
+    {
+        return '{{%foos}}';
+    }
+
+    public function rules()
+    {
+        return [
+            'factor_integer' => [['factor'], 'integer'],
+        ];
+    }
+}
diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/case_independent_tables_drop_sort/mysql/models/base/Ubigpk.php b/tests/specs/issue_fix/132_create_migration_for_drop_table/case_independent_tables_drop_sort/mysql/models/base/Ubigpk.php
new file mode 100644
index 00000000..3ffa6a51
--- /dev/null
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/case_independent_tables_drop_sort/mysql/models/base/Ubigpk.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace app\models\base;
+
+/**
+ *
+ *
+ * @property string $id
+ * @property string $name
+ * @property string $size
+ * @property integer $d
+ * @property integer $e
+ * @property string $f
+ * @property double $dp
+ * @property double $dp2
+ *
+ */
+abstract class Ubigpk extends \yii\db\ActiveRecord
+{
+    public static function tableName()
+    {
+        return '{{%ubigpks}}';
+    }
+
+    public function rules()
+    {
+        return [
+            'trim' => [['name', 'f'], 'trim'],
+            'name_string' => [['name'], 'string', 'max' => 150],
+            'size_string' => [['size'], 'string'],
+            'size_in' => [['size'], 'in', 'range' => [
+                'x-small',
+                'small',
+                'medium',
+                'large',
+                'x-large',
+            ]],
+            'size_default' => [['size'], 'default', 'value' => 'x-small'],
+            'd_integer' => [['d'], 'integer'],
+            'e_integer' => [['e'], 'integer'],
+            'f_string' => [['f'], 'string', 'max' => 12],
+            'dp_double' => [['dp'], 'double'],
+            'dp2_double' => [['dp2'], 'double'],
+        ];
+    }
+}
diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/case_independent_tables_drop_sort/mysql/models/base/Upk.php b/tests/specs/issue_fix/132_create_migration_for_drop_table/case_independent_tables_drop_sort/mysql/models/base/Upk.php
new file mode 100644
index 00000000..644bc0d1
--- /dev/null
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/case_independent_tables_drop_sort/mysql/models/base/Upk.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace app\models\base;
+
+/**
+ *
+ *
+ * @property integer $id
+ * @property string $name
+ *
+ */
+abstract class Upk extends \yii\db\ActiveRecord
+{
+    public static function tableName()
+    {
+        return '{{%upks}}';
+    }
+
+    public function rules()
+    {
+        return [
+            'trim' => [['name'], 'trim'],
+            'name_string' => [['name'], 'string', 'max' => 150],
+        ];
+    }
+}
diff --git a/tests/unit/IssueFixTest.php b/tests/unit/IssueFixTest.php
index 402d852d..757e26c8 100644
--- a/tests/unit/IssueFixTest.php
+++ b/tests/unit/IssueFixTest.php
@@ -241,23 +241,59 @@ public function testNullableFalseInRequired()
 
     // Create migration for drop table if a entire schema is deleted from OpenAPI spec #132
     // https://github.com/cebe/yii2-openapi/issues/132
-   public function testCreateMigrationForDropTable132()
-   {
-       $testFile = Yii::getAlias("@specs/issue_fix/132_create_migration_for_drop_table/132_create_migration_for_drop_table.php");
-       $this->createTablesForCreateMigrationForDropTable132();
-       $this->runGenerator($testFile);
-       $this->runActualMigrations('mysql', 8);
+    // https://github.com/php-openapi/yii2-openapi/pull/4#discussion_r1688225258
+    public function testCreateMigrationForDropTable132IndependentTablesDropSort()
+    {
+        $testFile = Yii::getAlias("@specs/issue_fix/132_create_migration_for_drop_table/case_independent_tables_drop_sort/index.php");
+        $this->createTablesForCreateMigrationForDropTable132();
+        $this->runGenerator($testFile);
+        $this->runActualMigrations('mysql', 4);
 
-       $actualFiles = FileHelper::findFiles(Yii::getAlias('@app'), [
+        $actualFiles = FileHelper::findFiles(Yii::getAlias('@app'), [
            'recursive' => true,
-       ]);
-       $expectedFiles = FileHelper::findFiles(Yii::getAlias("@specs/issue_fix/132_create_migration_for_drop_table/mysql"), [
+        ]);
+        $expectedFiles = FileHelper::findFiles(Yii::getAlias("@specs/issue_fix/132_create_migration_for_drop_table/case_independent_tables_drop_sort/mysql"), [
            'recursive' => true,
-       ]);
-       $this->checkFiles($actualFiles, $expectedFiles);
+        ]);
+        $this->checkFiles($actualFiles, $expectedFiles);
 
-       $this->deleteTablesForCreateMigrationForDropTable132();
-   }
+        $this->deleteTablesForCreateMigrationForDropTable132();
+    }
+
+    // Create migration for drop table if a entire schema is deleted from OpenAPI spec #132
+    // https://github.com/cebe/yii2-openapi/issues/132
+    public function testCreateMigrationForDropTable132()
+    {
+        $testFile = Yii::getAlias("@specs/issue_fix/132_create_migration_for_drop_table/132_create_migration_for_drop_table.php");
+
+        Yii::$app->db->createCommand()->createTable('{{%upks}}', [
+            'id' => 'upk',
+            'name' => 'string(150)',
+        ])->execute();
+        Yii::$app->db->createCommand()->createTable('{{%bigpks}}', [
+            'id' => 'bigpk',
+            'name' => 'string(150)',
+        ])->execute();
+        Yii::$app->db->createCommand()->createTable('{{%ubigpks}}', [
+            'id' => 'ubigpk',
+            'name' => 'string(150)',
+        ])->execute();
+
+        $this->runGenerator($testFile);
+        $this->runActualMigrations('mysql', 3);
+
+        $actualFiles = FileHelper::findFiles(Yii::getAlias('@app'), [
+           'recursive' => true,
+        ]);
+        $expectedFiles = FileHelper::findFiles(Yii::getAlias("@specs/issue_fix/132_create_migration_for_drop_table/mysql"), [
+           'recursive' => true,
+        ]);
+        $this->checkFiles($actualFiles, $expectedFiles);
+
+        Yii::$app->db->createCommand('DROP TABLE IF EXISTS {{%bigpks}}')->execute();
+        Yii::$app->db->createCommand('DROP TABLE IF EXISTS {{%bigpks}}')->execute();
+        Yii::$app->db->createCommand('DROP TABLE IF EXISTS {{%bigpks}}')->execute();
+    }
 
     private function createTablesForCreateMigrationForDropTable132()
     {

From 74ca15a5ac7f3989904d478110613554fad4ba84 Mon Sep 17 00:00:00 2001
From: Sohel Ahmed Mesaniya <sam.wankaner@gmail.com>
Date: Thu, 25 Jul 2024 15:25:22 +0530
Subject: [PATCH 49/71] Revert "Fix another failing tests -
 MultiDbSecondaryMigrationTest"

This reverts commit a4dc0a46b749b2ed7e5373a5f976cce5f6888548.
---
 ...le_v2_posts.php => m200000_000000_change_table_v2_posts.php} | 2 +-
 .../m200000_000001_create_table_v2_tags.php}                    | 2 +-
 ...osts2tags.php => m200000_000002_create_table_posts2tags.php} | 2 +-
 ...gories.php => m200000_000003_change_table_v2_categories.php} | 2 +-
 ...le_v2_users.php => m200000_000004_change_table_v2_users.php} | 2 +-
 ...le_v2_posts.php => m200000_000000_change_table_v2_posts.php} | 2 +-
 .../m200000_000001_create_table_v2_tags.php}                    | 2 +-
 ...osts2tags.php => m200000_000002_create_table_posts2tags.php} | 2 +-
 ...gories.php => m200000_000003_change_table_v2_categories.php} | 2 +-
 ...le_v2_users.php => m200000_000004_change_table_v2_users.php} | 2 +-
 ...le_v2_posts.php => m200000_000000_change_table_v2_posts.php} | 2 +-
 ...able_v2_tags.php => m200000_000001_create_table_v2_tags.php} | 2 +-
 ...osts2tags.php => m200000_000002_create_table_posts2tags.php} | 2 +-
 ...gories.php => m200000_000003_change_table_v2_categories.php} | 2 +-
 ...le_v2_users.php => m200000_000004_change_table_v2_users.php} | 2 +-
 15 files changed, 15 insertions(+), 15 deletions(-)
 rename tests/specs/blog_v2/migrations_maria_db/{m200000_000002_change_table_v2_posts.php => m200000_000000_change_table_v2_posts.php} (95%)
 rename tests/specs/blog_v2/{migrations_mysql_db/m200000_000003_create_table_v2_tags.php => migrations_maria_db/m200000_000001_create_table_v2_tags.php} (88%)
 rename tests/specs/blog_v2/migrations_maria_db/{m200000_000004_create_table_posts2tags.php => m200000_000002_create_table_posts2tags.php} (93%)
 rename tests/specs/blog_v2/migrations_maria_db/{m200000_000001_change_table_v2_categories.php => m200000_000003_change_table_v2_categories.php} (94%)
 rename tests/specs/blog_v2/migrations_maria_db/{m200000_000000_change_table_v2_users.php => m200000_000004_change_table_v2_users.php} (95%)
 rename tests/specs/blog_v2/migrations_mysql_db/{m200000_000002_change_table_v2_posts.php => m200000_000000_change_table_v2_posts.php} (95%)
 rename tests/specs/blog_v2/{migrations_maria_db/m200000_000003_create_table_v2_tags.php => migrations_mysql_db/m200000_000001_create_table_v2_tags.php} (88%)
 rename tests/specs/blog_v2/migrations_mysql_db/{m200000_000004_create_table_posts2tags.php => m200000_000002_create_table_posts2tags.php} (93%)
 rename tests/specs/blog_v2/migrations_mysql_db/{m200000_000001_change_table_v2_categories.php => m200000_000003_change_table_v2_categories.php} (94%)
 rename tests/specs/blog_v2/migrations_mysql_db/{m200000_000000_change_table_v2_users.php => m200000_000004_change_table_v2_users.php} (95%)
 rename tests/specs/blog_v2/migrations_pgsql_db/{m200000_000002_change_table_v2_posts.php => m200000_000000_change_table_v2_posts.php} (95%)
 rename tests/specs/blog_v2/migrations_pgsql_db/{m200000_000003_create_table_v2_tags.php => m200000_000001_create_table_v2_tags.php} (91%)
 rename tests/specs/blog_v2/migrations_pgsql_db/{m200000_000004_create_table_posts2tags.php => m200000_000002_create_table_posts2tags.php} (93%)
 rename tests/specs/blog_v2/migrations_pgsql_db/{m200000_000001_change_table_v2_categories.php => m200000_000003_change_table_v2_categories.php} (93%)
 rename tests/specs/blog_v2/migrations_pgsql_db/{m200000_000000_change_table_v2_users.php => m200000_000004_change_table_v2_users.php} (96%)

diff --git a/tests/specs/blog_v2/migrations_maria_db/m200000_000002_change_table_v2_posts.php b/tests/specs/blog_v2/migrations_maria_db/m200000_000000_change_table_v2_posts.php
similarity index 95%
rename from tests/specs/blog_v2/migrations_maria_db/m200000_000002_change_table_v2_posts.php
rename to tests/specs/blog_v2/migrations_maria_db/m200000_000000_change_table_v2_posts.php
index f8790fd3..5c43dabf 100644
--- a/tests/specs/blog_v2/migrations_maria_db/m200000_000002_change_table_v2_posts.php
+++ b/tests/specs/blog_v2/migrations_maria_db/m200000_000000_change_table_v2_posts.php
@@ -3,7 +3,7 @@
 /**
  * Table for Post
  */
-class m200000_000002_change_table_v2_posts extends \yii\db\Migration
+class m200000_000000_change_table_v2_posts extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/blog_v2/migrations_mysql_db/m200000_000003_create_table_v2_tags.php b/tests/specs/blog_v2/migrations_maria_db/m200000_000001_create_table_v2_tags.php
similarity index 88%
rename from tests/specs/blog_v2/migrations_mysql_db/m200000_000003_create_table_v2_tags.php
rename to tests/specs/blog_v2/migrations_maria_db/m200000_000001_create_table_v2_tags.php
index 5ed6326c..1e671e96 100644
--- a/tests/specs/blog_v2/migrations_mysql_db/m200000_000003_create_table_v2_tags.php
+++ b/tests/specs/blog_v2/migrations_maria_db/m200000_000001_create_table_v2_tags.php
@@ -3,7 +3,7 @@
 /**
  * Table for Tag
  */
-class m200000_000003_create_table_v2_tags extends \yii\db\Migration
+class m200000_000001_create_table_v2_tags extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/blog_v2/migrations_maria_db/m200000_000004_create_table_posts2tags.php b/tests/specs/blog_v2/migrations_maria_db/m200000_000002_create_table_posts2tags.php
similarity index 93%
rename from tests/specs/blog_v2/migrations_maria_db/m200000_000004_create_table_posts2tags.php
rename to tests/specs/blog_v2/migrations_maria_db/m200000_000002_create_table_posts2tags.php
index 9e50b861..2e959d10 100644
--- a/tests/specs/blog_v2/migrations_maria_db/m200000_000004_create_table_posts2tags.php
+++ b/tests/specs/blog_v2/migrations_maria_db/m200000_000002_create_table_posts2tags.php
@@ -3,7 +3,7 @@
 /**
  * Table for Posts2Tags
  */
-class m200000_000004_create_table_posts2tags extends \yii\db\Migration
+class m200000_000002_create_table_posts2tags extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/blog_v2/migrations_maria_db/m200000_000001_change_table_v2_categories.php b/tests/specs/blog_v2/migrations_maria_db/m200000_000003_change_table_v2_categories.php
similarity index 94%
rename from tests/specs/blog_v2/migrations_maria_db/m200000_000001_change_table_v2_categories.php
rename to tests/specs/blog_v2/migrations_maria_db/m200000_000003_change_table_v2_categories.php
index c488ec52..e608ed52 100644
--- a/tests/specs/blog_v2/migrations_maria_db/m200000_000001_change_table_v2_categories.php
+++ b/tests/specs/blog_v2/migrations_maria_db/m200000_000003_change_table_v2_categories.php
@@ -3,7 +3,7 @@
 /**
  * Table for Category
  */
-class m200000_000001_change_table_v2_categories extends \yii\db\Migration
+class m200000_000003_change_table_v2_categories extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/blog_v2/migrations_maria_db/m200000_000000_change_table_v2_users.php b/tests/specs/blog_v2/migrations_maria_db/m200000_000004_change_table_v2_users.php
similarity index 95%
rename from tests/specs/blog_v2/migrations_maria_db/m200000_000000_change_table_v2_users.php
rename to tests/specs/blog_v2/migrations_maria_db/m200000_000004_change_table_v2_users.php
index 4a946df2..bf1c82fd 100644
--- a/tests/specs/blog_v2/migrations_maria_db/m200000_000000_change_table_v2_users.php
+++ b/tests/specs/blog_v2/migrations_maria_db/m200000_000004_change_table_v2_users.php
@@ -3,7 +3,7 @@
 /**
  * Table for User
  */
-class m200000_000000_change_table_v2_users extends \yii\db\Migration
+class m200000_000004_change_table_v2_users extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/blog_v2/migrations_mysql_db/m200000_000002_change_table_v2_posts.php b/tests/specs/blog_v2/migrations_mysql_db/m200000_000000_change_table_v2_posts.php
similarity index 95%
rename from tests/specs/blog_v2/migrations_mysql_db/m200000_000002_change_table_v2_posts.php
rename to tests/specs/blog_v2/migrations_mysql_db/m200000_000000_change_table_v2_posts.php
index d3b7fc2b..be309829 100644
--- a/tests/specs/blog_v2/migrations_mysql_db/m200000_000002_change_table_v2_posts.php
+++ b/tests/specs/blog_v2/migrations_mysql_db/m200000_000000_change_table_v2_posts.php
@@ -3,7 +3,7 @@
 /**
  * Table for Post
  */
-class m200000_000002_change_table_v2_posts extends \yii\db\Migration
+class m200000_000000_change_table_v2_posts extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/blog_v2/migrations_maria_db/m200000_000003_create_table_v2_tags.php b/tests/specs/blog_v2/migrations_mysql_db/m200000_000001_create_table_v2_tags.php
similarity index 88%
rename from tests/specs/blog_v2/migrations_maria_db/m200000_000003_create_table_v2_tags.php
rename to tests/specs/blog_v2/migrations_mysql_db/m200000_000001_create_table_v2_tags.php
index 5ed6326c..1e671e96 100644
--- a/tests/specs/blog_v2/migrations_maria_db/m200000_000003_create_table_v2_tags.php
+++ b/tests/specs/blog_v2/migrations_mysql_db/m200000_000001_create_table_v2_tags.php
@@ -3,7 +3,7 @@
 /**
  * Table for Tag
  */
-class m200000_000003_create_table_v2_tags extends \yii\db\Migration
+class m200000_000001_create_table_v2_tags extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/blog_v2/migrations_mysql_db/m200000_000004_create_table_posts2tags.php b/tests/specs/blog_v2/migrations_mysql_db/m200000_000002_create_table_posts2tags.php
similarity index 93%
rename from tests/specs/blog_v2/migrations_mysql_db/m200000_000004_create_table_posts2tags.php
rename to tests/specs/blog_v2/migrations_mysql_db/m200000_000002_create_table_posts2tags.php
index 9e50b861..2e959d10 100644
--- a/tests/specs/blog_v2/migrations_mysql_db/m200000_000004_create_table_posts2tags.php
+++ b/tests/specs/blog_v2/migrations_mysql_db/m200000_000002_create_table_posts2tags.php
@@ -3,7 +3,7 @@
 /**
  * Table for Posts2Tags
  */
-class m200000_000004_create_table_posts2tags extends \yii\db\Migration
+class m200000_000002_create_table_posts2tags extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/blog_v2/migrations_mysql_db/m200000_000001_change_table_v2_categories.php b/tests/specs/blog_v2/migrations_mysql_db/m200000_000003_change_table_v2_categories.php
similarity index 94%
rename from tests/specs/blog_v2/migrations_mysql_db/m200000_000001_change_table_v2_categories.php
rename to tests/specs/blog_v2/migrations_mysql_db/m200000_000003_change_table_v2_categories.php
index c488ec52..e608ed52 100644
--- a/tests/specs/blog_v2/migrations_mysql_db/m200000_000001_change_table_v2_categories.php
+++ b/tests/specs/blog_v2/migrations_mysql_db/m200000_000003_change_table_v2_categories.php
@@ -3,7 +3,7 @@
 /**
  * Table for Category
  */
-class m200000_000001_change_table_v2_categories extends \yii\db\Migration
+class m200000_000003_change_table_v2_categories extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/blog_v2/migrations_mysql_db/m200000_000000_change_table_v2_users.php b/tests/specs/blog_v2/migrations_mysql_db/m200000_000004_change_table_v2_users.php
similarity index 95%
rename from tests/specs/blog_v2/migrations_mysql_db/m200000_000000_change_table_v2_users.php
rename to tests/specs/blog_v2/migrations_mysql_db/m200000_000004_change_table_v2_users.php
index 23a2e3b1..b7a1f5e3 100644
--- a/tests/specs/blog_v2/migrations_mysql_db/m200000_000000_change_table_v2_users.php
+++ b/tests/specs/blog_v2/migrations_mysql_db/m200000_000004_change_table_v2_users.php
@@ -3,7 +3,7 @@
 /**
  * Table for User
  */
-class m200000_000000_change_table_v2_users extends \yii\db\Migration
+class m200000_000004_change_table_v2_users extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/blog_v2/migrations_pgsql_db/m200000_000002_change_table_v2_posts.php b/tests/specs/blog_v2/migrations_pgsql_db/m200000_000000_change_table_v2_posts.php
similarity index 95%
rename from tests/specs/blog_v2/migrations_pgsql_db/m200000_000002_change_table_v2_posts.php
rename to tests/specs/blog_v2/migrations_pgsql_db/m200000_000000_change_table_v2_posts.php
index 474c6c82..5188983b 100644
--- a/tests/specs/blog_v2/migrations_pgsql_db/m200000_000002_change_table_v2_posts.php
+++ b/tests/specs/blog_v2/migrations_pgsql_db/m200000_000000_change_table_v2_posts.php
@@ -3,7 +3,7 @@
 /**
  * Table for Post
  */
-class m200000_000002_change_table_v2_posts extends \yii\db\Migration
+class m200000_000000_change_table_v2_posts extends \yii\db\Migration
 {
     public function safeUp()
     {
diff --git a/tests/specs/blog_v2/migrations_pgsql_db/m200000_000003_create_table_v2_tags.php b/tests/specs/blog_v2/migrations_pgsql_db/m200000_000001_create_table_v2_tags.php
similarity index 91%
rename from tests/specs/blog_v2/migrations_pgsql_db/m200000_000003_create_table_v2_tags.php
rename to tests/specs/blog_v2/migrations_pgsql_db/m200000_000001_create_table_v2_tags.php
index 45593cfa..2466cff0 100644
--- a/tests/specs/blog_v2/migrations_pgsql_db/m200000_000003_create_table_v2_tags.php
+++ b/tests/specs/blog_v2/migrations_pgsql_db/m200000_000001_create_table_v2_tags.php
@@ -3,7 +3,7 @@
 /**
  * Table for Tag
  */
-class m200000_000003_create_table_v2_tags extends \yii\db\Migration
+class m200000_000001_create_table_v2_tags extends \yii\db\Migration
 {
     public function safeUp()
     {
diff --git a/tests/specs/blog_v2/migrations_pgsql_db/m200000_000004_create_table_posts2tags.php b/tests/specs/blog_v2/migrations_pgsql_db/m200000_000002_create_table_posts2tags.php
similarity index 93%
rename from tests/specs/blog_v2/migrations_pgsql_db/m200000_000004_create_table_posts2tags.php
rename to tests/specs/blog_v2/migrations_pgsql_db/m200000_000002_create_table_posts2tags.php
index 4e4766fa..d518ff32 100644
--- a/tests/specs/blog_v2/migrations_pgsql_db/m200000_000004_create_table_posts2tags.php
+++ b/tests/specs/blog_v2/migrations_pgsql_db/m200000_000002_create_table_posts2tags.php
@@ -3,7 +3,7 @@
 /**
  * Table for Posts2Tags
  */
-class m200000_000004_create_table_posts2tags extends \yii\db\Migration
+class m200000_000002_create_table_posts2tags extends \yii\db\Migration
 {
     public function safeUp()
     {
diff --git a/tests/specs/blog_v2/migrations_pgsql_db/m200000_000001_change_table_v2_categories.php b/tests/specs/blog_v2/migrations_pgsql_db/m200000_000003_change_table_v2_categories.php
similarity index 93%
rename from tests/specs/blog_v2/migrations_pgsql_db/m200000_000001_change_table_v2_categories.php
rename to tests/specs/blog_v2/migrations_pgsql_db/m200000_000003_change_table_v2_categories.php
index 9c307743..5f934936 100644
--- a/tests/specs/blog_v2/migrations_pgsql_db/m200000_000001_change_table_v2_categories.php
+++ b/tests/specs/blog_v2/migrations_pgsql_db/m200000_000003_change_table_v2_categories.php
@@ -3,7 +3,7 @@
 /**
  * Table for Category
  */
-class m200000_000001_change_table_v2_categories extends \yii\db\Migration
+class m200000_000003_change_table_v2_categories extends \yii\db\Migration
 {
     public function safeUp()
     {
diff --git a/tests/specs/blog_v2/migrations_pgsql_db/m200000_000000_change_table_v2_users.php b/tests/specs/blog_v2/migrations_pgsql_db/m200000_000004_change_table_v2_users.php
similarity index 96%
rename from tests/specs/blog_v2/migrations_pgsql_db/m200000_000000_change_table_v2_users.php
rename to tests/specs/blog_v2/migrations_pgsql_db/m200000_000004_change_table_v2_users.php
index cb77b61d..a57ea8df 100644
--- a/tests/specs/blog_v2/migrations_pgsql_db/m200000_000000_change_table_v2_users.php
+++ b/tests/specs/blog_v2/migrations_pgsql_db/m200000_000004_change_table_v2_users.php
@@ -3,7 +3,7 @@
 /**
  * Table for User
  */
-class m200000_000000_change_table_v2_users extends \yii\db\Migration
+class m200000_000004_change_table_v2_users extends \yii\db\Migration
 {
     public function safeUp()
     {

From 9932d26232f3bf7804eddff0dfb0bb9ce9da3ac8 Mon Sep 17 00:00:00 2001
From: Sohel Ahmed Mesaniya <sam.wankaner@gmail.com>
Date: Thu, 25 Jul 2024 15:26:56 +0530
Subject: [PATCH 50/71] Revert "Fix another failing tests -
 NewColumnPositionTest::testAddOneNewColumnAtFirstPosition"

This reverts commit 3a1499b37cc587639d2dbcce2122ad46c9e9b655.
---
 ... => m200000_000000_change_table_addtwonewcolinbetween2s.php} | 2 +-
 ...p => m200000_000001_change_table_addtwonewcolinbetweens.php} | 2 +-
 ...stcols.php => m200000_000002_change_table_dropfirstcols.php} | 2 +-
 ...ols.php => m200000_000003_change_table_dropfirsttwocols.php} | 2 +-
 ...able_fruit2s.php => m200000_000004_change_table_fruit2s.php} | 2 +-
 ..._table_fruits.php => m200000_000005_change_table_fruits.php} | 2 +-
 ...le_twocol2s.php => m200000_000006_change_table_twocol2s.php} | 2 +-
 ...able_twocols.php => m200000_000007_change_table_twocols.php} | 2 +-
 ...2s.php => m200000_000008_change_table_twonewcolatlast2s.php} | 2 +-
 ...sts.php => m200000_000009_change_table_twonewcolatlasts.php} | 2 +-
 ... => m200000_000000_change_table_addtwonewcolinbetween2s.php} | 2 +-
 ...p => m200000_000001_change_table_addtwonewcolinbetweens.php} | 2 +-
 ...stcols.php => m200000_000002_change_table_dropfirstcols.php} | 2 +-
 ...ols.php => m200000_000003_change_table_dropfirsttwocols.php} | 2 +-
 ...able_fruit2s.php => m200000_000004_change_table_fruit2s.php} | 2 +-
 ..._table_fruits.php => m200000_000005_change_table_fruits.php} | 2 +-
 ...le_twocol2s.php => m200000_000006_change_table_twocol2s.php} | 2 +-
 ...able_twocols.php => m200000_000007_change_table_twocols.php} | 2 +-
 ...2s.php => m200000_000008_change_table_twonewcolatlast2s.php} | 2 +-
 ...sts.php => m200000_000009_change_table_twonewcolatlasts.php} | 2 +-
 20 files changed, 20 insertions(+), 20 deletions(-)
 rename tests/specs/new_column_position/maria/app/migrations_maria_db/{m200000_000007_change_table_addtwonewcolinbetween2s.php => m200000_000000_change_table_addtwonewcolinbetween2s.php} (92%)
 rename tests/specs/new_column_position/maria/app/migrations_maria_db/{m200000_000006_change_table_addtwonewcolinbetweens.php => m200000_000001_change_table_addtwonewcolinbetweens.php} (92%)
 rename tests/specs/new_column_position/maria/app/migrations_maria_db/{m200000_000004_change_table_dropfirstcols.php => m200000_000002_change_table_dropfirstcols.php} (82%)
 rename tests/specs/new_column_position/maria/app/migrations_maria_db/{m200000_000005_change_table_dropfirsttwocols.php => m200000_000003_change_table_dropfirsttwocols.php} (88%)
 rename tests/specs/new_column_position/maria/app/migrations_maria_db/{m200000_000001_change_table_fruit2s.php => m200000_000004_change_table_fruit2s.php} (81%)
 rename tests/specs/new_column_position/maria/app/migrations_maria_db/{m200000_000000_change_table_fruits.php => m200000_000005_change_table_fruits.php} (79%)
 rename tests/specs/new_column_position/maria/app/migrations_maria_db/{m200000_000003_change_table_twocol2s.php => m200000_000006_change_table_twocol2s.php} (88%)
 rename tests/specs/new_column_position/maria/app/migrations_maria_db/{m200000_000002_change_table_twocols.php => m200000_000007_change_table_twocols.php} (87%)
 rename tests/specs/new_column_position/maria/app/migrations_maria_db/{m200000_000009_change_table_twonewcolatlast2s.php => m200000_000008_change_table_twonewcolatlast2s.php} (89%)
 rename tests/specs/new_column_position/maria/app/migrations_maria_db/{m200000_000008_change_table_twonewcolatlasts.php => m200000_000009_change_table_twonewcolatlasts.php} (88%)
 rename tests/specs/new_column_position/mysql/app/migrations_mysql_db/{m200000_000007_change_table_addtwonewcolinbetween2s.php => m200000_000000_change_table_addtwonewcolinbetween2s.php} (92%)
 rename tests/specs/new_column_position/mysql/app/migrations_mysql_db/{m200000_000006_change_table_addtwonewcolinbetweens.php => m200000_000001_change_table_addtwonewcolinbetweens.php} (91%)
 rename tests/specs/new_column_position/mysql/app/migrations_mysql_db/{m200000_000004_change_table_dropfirstcols.php => m200000_000002_change_table_dropfirstcols.php} (81%)
 rename tests/specs/new_column_position/mysql/app/migrations_mysql_db/{m200000_000005_change_table_dropfirsttwocols.php => m200000_000003_change_table_dropfirsttwocols.php} (87%)
 rename tests/specs/new_column_position/mysql/app/migrations_mysql_db/{m200000_000001_change_table_fruit2s.php => m200000_000004_change_table_fruit2s.php} (81%)
 rename tests/specs/new_column_position/mysql/app/migrations_mysql_db/{m200000_000000_change_table_fruits.php => m200000_000005_change_table_fruits.php} (79%)
 rename tests/specs/new_column_position/mysql/app/migrations_mysql_db/{m200000_000003_change_table_twocol2s.php => m200000_000006_change_table_twocol2s.php} (87%)
 rename tests/specs/new_column_position/mysql/app/migrations_mysql_db/{m200000_000002_change_table_twocols.php => m200000_000007_change_table_twocols.php} (86%)
 rename tests/specs/new_column_position/mysql/app/migrations_mysql_db/{m200000_000009_change_table_twonewcolatlast2s.php => m200000_000008_change_table_twonewcolatlast2s.php} (88%)
 rename tests/specs/new_column_position/mysql/app/migrations_mysql_db/{m200000_000008_change_table_twonewcolatlasts.php => m200000_000009_change_table_twonewcolatlasts.php} (88%)

diff --git a/tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000007_change_table_addtwonewcolinbetween2s.php b/tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000000_change_table_addtwonewcolinbetween2s.php
similarity index 92%
rename from tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000007_change_table_addtwonewcolinbetween2s.php
rename to tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000000_change_table_addtwonewcolinbetween2s.php
index 002a045e..544d1084 100644
--- a/tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000007_change_table_addtwonewcolinbetween2s.php
+++ b/tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000000_change_table_addtwonewcolinbetween2s.php
@@ -3,7 +3,7 @@
 /**
  * Table for Addtwonewcolinbetween2s
  */
-class m200000_000007_change_table_addtwonewcolinbetween2s extends \yii\db\Migration
+class m200000_000000_change_table_addtwonewcolinbetween2s extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000006_change_table_addtwonewcolinbetweens.php b/tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000001_change_table_addtwonewcolinbetweens.php
similarity index 92%
rename from tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000006_change_table_addtwonewcolinbetweens.php
rename to tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000001_change_table_addtwonewcolinbetweens.php
index 62790337..b9648922 100644
--- a/tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000006_change_table_addtwonewcolinbetweens.php
+++ b/tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000001_change_table_addtwonewcolinbetweens.php
@@ -3,7 +3,7 @@
 /**
  * Table for Addtwonewcolinbetweens
  */
-class m200000_000006_change_table_addtwonewcolinbetweens extends \yii\db\Migration
+class m200000_000001_change_table_addtwonewcolinbetweens extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000004_change_table_dropfirstcols.php b/tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000002_change_table_dropfirstcols.php
similarity index 82%
rename from tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000004_change_table_dropfirstcols.php
rename to tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000002_change_table_dropfirstcols.php
index a6fcdbb9..56f0692d 100644
--- a/tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000004_change_table_dropfirstcols.php
+++ b/tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000002_change_table_dropfirstcols.php
@@ -3,7 +3,7 @@
 /**
  * Table for Dropfirstcol
  */
-class m200000_000004_change_table_dropfirstcols extends \yii\db\Migration
+class m200000_000002_change_table_dropfirstcols extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000005_change_table_dropfirsttwocols.php b/tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000003_change_table_dropfirsttwocols.php
similarity index 88%
rename from tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000005_change_table_dropfirsttwocols.php
rename to tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000003_change_table_dropfirsttwocols.php
index 9d438149..89ef1937 100644
--- a/tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000005_change_table_dropfirsttwocols.php
+++ b/tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000003_change_table_dropfirsttwocols.php
@@ -3,7 +3,7 @@
 /**
  * Table for Dropfirsttwocol
  */
-class m200000_000005_change_table_dropfirsttwocols extends \yii\db\Migration
+class m200000_000003_change_table_dropfirsttwocols extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000001_change_table_fruit2s.php b/tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000004_change_table_fruit2s.php
similarity index 81%
rename from tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000001_change_table_fruit2s.php
rename to tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000004_change_table_fruit2s.php
index 547fdbf2..68bfd09e 100644
--- a/tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000001_change_table_fruit2s.php
+++ b/tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000004_change_table_fruit2s.php
@@ -3,7 +3,7 @@
 /**
  * Table for Fruit2
  */
-class m200000_000001_change_table_fruit2s extends \yii\db\Migration
+class m200000_000004_change_table_fruit2s extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000000_change_table_fruits.php b/tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000005_change_table_fruits.php
similarity index 79%
rename from tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000000_change_table_fruits.php
rename to tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000005_change_table_fruits.php
index 2cb90b8e..8accdd87 100644
--- a/tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000000_change_table_fruits.php
+++ b/tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000005_change_table_fruits.php
@@ -3,7 +3,7 @@
 /**
  * Table for Fruit
  */
-class m200000_000000_change_table_fruits extends \yii\db\Migration
+class m200000_000005_change_table_fruits extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000003_change_table_twocol2s.php b/tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000006_change_table_twocol2s.php
similarity index 88%
rename from tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000003_change_table_twocol2s.php
rename to tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000006_change_table_twocol2s.php
index 94f91d2f..45325e91 100644
--- a/tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000003_change_table_twocol2s.php
+++ b/tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000006_change_table_twocol2s.php
@@ -3,7 +3,7 @@
 /**
  * Table for Twocol2
  */
-class m200000_000003_change_table_twocol2s extends \yii\db\Migration
+class m200000_000006_change_table_twocol2s extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000002_change_table_twocols.php b/tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000007_change_table_twocols.php
similarity index 87%
rename from tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000002_change_table_twocols.php
rename to tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000007_change_table_twocols.php
index 0ee4668e..d63f7443 100644
--- a/tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000002_change_table_twocols.php
+++ b/tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000007_change_table_twocols.php
@@ -3,7 +3,7 @@
 /**
  * Table for Twocol
  */
-class m200000_000002_change_table_twocols extends \yii\db\Migration
+class m200000_000007_change_table_twocols extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000009_change_table_twonewcolatlast2s.php b/tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000008_change_table_twonewcolatlast2s.php
similarity index 89%
rename from tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000009_change_table_twonewcolatlast2s.php
rename to tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000008_change_table_twonewcolatlast2s.php
index 51db951e..0a88452d 100644
--- a/tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000009_change_table_twonewcolatlast2s.php
+++ b/tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000008_change_table_twonewcolatlast2s.php
@@ -3,7 +3,7 @@
 /**
  * Table for Twonewcolatlast2
  */
-class m200000_000009_change_table_twonewcolatlast2s extends \yii\db\Migration
+class m200000_000008_change_table_twonewcolatlast2s extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000008_change_table_twonewcolatlasts.php b/tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000009_change_table_twonewcolatlasts.php
similarity index 88%
rename from tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000008_change_table_twonewcolatlasts.php
rename to tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000009_change_table_twonewcolatlasts.php
index 307f1375..0a332d7a 100644
--- a/tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000008_change_table_twonewcolatlasts.php
+++ b/tests/specs/new_column_position/maria/app/migrations_maria_db/m200000_000009_change_table_twonewcolatlasts.php
@@ -3,7 +3,7 @@
 /**
  * Table for Twonewcolatlast
  */
-class m200000_000008_change_table_twonewcolatlasts extends \yii\db\Migration
+class m200000_000009_change_table_twonewcolatlasts extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000007_change_table_addtwonewcolinbetween2s.php b/tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000000_change_table_addtwonewcolinbetween2s.php
similarity index 92%
rename from tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000007_change_table_addtwonewcolinbetween2s.php
rename to tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000000_change_table_addtwonewcolinbetween2s.php
index 7fc2bd8d..7d4f8bfa 100644
--- a/tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000007_change_table_addtwonewcolinbetween2s.php
+++ b/tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000000_change_table_addtwonewcolinbetween2s.php
@@ -3,7 +3,7 @@
 /**
  * Table for Addtwonewcolinbetween2s
  */
-class m200000_000007_change_table_addtwonewcolinbetween2s extends \yii\db\Migration
+class m200000_000000_change_table_addtwonewcolinbetween2s extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000006_change_table_addtwonewcolinbetweens.php b/tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000001_change_table_addtwonewcolinbetweens.php
similarity index 91%
rename from tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000006_change_table_addtwonewcolinbetweens.php
rename to tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000001_change_table_addtwonewcolinbetweens.php
index 963c74dc..355597ac 100644
--- a/tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000006_change_table_addtwonewcolinbetweens.php
+++ b/tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000001_change_table_addtwonewcolinbetweens.php
@@ -3,7 +3,7 @@
 /**
  * Table for Addtwonewcolinbetweens
  */
-class m200000_000006_change_table_addtwonewcolinbetweens extends \yii\db\Migration
+class m200000_000001_change_table_addtwonewcolinbetweens extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000004_change_table_dropfirstcols.php b/tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000002_change_table_dropfirstcols.php
similarity index 81%
rename from tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000004_change_table_dropfirstcols.php
rename to tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000002_change_table_dropfirstcols.php
index a103bad4..4ae589d3 100644
--- a/tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000004_change_table_dropfirstcols.php
+++ b/tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000002_change_table_dropfirstcols.php
@@ -3,7 +3,7 @@
 /**
  * Table for Dropfirstcol
  */
-class m200000_000004_change_table_dropfirstcols extends \yii\db\Migration
+class m200000_000002_change_table_dropfirstcols extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000005_change_table_dropfirsttwocols.php b/tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000003_change_table_dropfirsttwocols.php
similarity index 87%
rename from tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000005_change_table_dropfirsttwocols.php
rename to tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000003_change_table_dropfirsttwocols.php
index 482bfa72..aaa54835 100644
--- a/tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000005_change_table_dropfirsttwocols.php
+++ b/tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000003_change_table_dropfirsttwocols.php
@@ -3,7 +3,7 @@
 /**
  * Table for Dropfirsttwocol
  */
-class m200000_000005_change_table_dropfirsttwocols extends \yii\db\Migration
+class m200000_000003_change_table_dropfirsttwocols extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000001_change_table_fruit2s.php b/tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000004_change_table_fruit2s.php
similarity index 81%
rename from tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000001_change_table_fruit2s.php
rename to tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000004_change_table_fruit2s.php
index 547fdbf2..68bfd09e 100644
--- a/tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000001_change_table_fruit2s.php
+++ b/tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000004_change_table_fruit2s.php
@@ -3,7 +3,7 @@
 /**
  * Table for Fruit2
  */
-class m200000_000001_change_table_fruit2s extends \yii\db\Migration
+class m200000_000004_change_table_fruit2s extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000000_change_table_fruits.php b/tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000005_change_table_fruits.php
similarity index 79%
rename from tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000000_change_table_fruits.php
rename to tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000005_change_table_fruits.php
index 2cb90b8e..8accdd87 100644
--- a/tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000000_change_table_fruits.php
+++ b/tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000005_change_table_fruits.php
@@ -3,7 +3,7 @@
 /**
  * Table for Fruit
  */
-class m200000_000000_change_table_fruits extends \yii\db\Migration
+class m200000_000005_change_table_fruits extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000003_change_table_twocol2s.php b/tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000006_change_table_twocol2s.php
similarity index 87%
rename from tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000003_change_table_twocol2s.php
rename to tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000006_change_table_twocol2s.php
index 05585780..40e3d693 100644
--- a/tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000003_change_table_twocol2s.php
+++ b/tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000006_change_table_twocol2s.php
@@ -3,7 +3,7 @@
 /**
  * Table for Twocol2
  */
-class m200000_000003_change_table_twocol2s extends \yii\db\Migration
+class m200000_000006_change_table_twocol2s extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000002_change_table_twocols.php b/tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000007_change_table_twocols.php
similarity index 86%
rename from tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000002_change_table_twocols.php
rename to tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000007_change_table_twocols.php
index d49b200e..33c954e0 100644
--- a/tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000002_change_table_twocols.php
+++ b/tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000007_change_table_twocols.php
@@ -3,7 +3,7 @@
 /**
  * Table for Twocol
  */
-class m200000_000002_change_table_twocols extends \yii\db\Migration
+class m200000_000007_change_table_twocols extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000009_change_table_twonewcolatlast2s.php b/tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000008_change_table_twonewcolatlast2s.php
similarity index 88%
rename from tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000009_change_table_twonewcolatlast2s.php
rename to tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000008_change_table_twonewcolatlast2s.php
index 85dbdb59..60931d95 100644
--- a/tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000009_change_table_twonewcolatlast2s.php
+++ b/tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000008_change_table_twonewcolatlast2s.php
@@ -3,7 +3,7 @@
 /**
  * Table for Twonewcolatlast2
  */
-class m200000_000009_change_table_twonewcolatlast2s extends \yii\db\Migration
+class m200000_000008_change_table_twonewcolatlast2s extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000008_change_table_twonewcolatlasts.php b/tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000009_change_table_twonewcolatlasts.php
similarity index 88%
rename from tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000008_change_table_twonewcolatlasts.php
rename to tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000009_change_table_twonewcolatlasts.php
index 307f1375..0a332d7a 100644
--- a/tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000008_change_table_twonewcolatlasts.php
+++ b/tests/specs/new_column_position/mysql/app/migrations_mysql_db/m200000_000009_change_table_twonewcolatlasts.php
@@ -3,7 +3,7 @@
 /**
  * Table for Twonewcolatlast
  */
-class m200000_000008_change_table_twonewcolatlasts extends \yii\db\Migration
+class m200000_000009_change_table_twonewcolatlasts extends \yii\db\Migration
 {
     public function up()
     {

From bed7fbb7f856d81f966661d87f10e8850a090327 Mon Sep 17 00:00:00 2001
From: Sohel Ahmed Mesaniya <sam.wankaner@gmail.com>
Date: Thu, 25 Jul 2024 15:27:56 +0530
Subject: [PATCH 51/71] Revert "Fix another failing tests -
 GeneratorTest::testGenerate"

This reverts commit ba2ef56799d3c6ed77b0e8613f2714a8ca2dbd47.
---
 .../m200000_000000_create_table_categories.php}                 | 2 +-
 ...te_table_users.php => m200000_000001_create_table_users.php} | 2 +-
 .../m200000_000003_create_table_fakerable.php}                  | 2 +-
 .../m200000_000004_create_table_post_comments.php}              | 2 +-
 .../m200000_000000_create_table_categories.php}                 | 2 +-
 .../m200000_000001_create_table_users.php}                      | 2 +-
 ..._fakerable.php => m200000_000003_create_table_fakerable.php} | 2 +-
 ...mments.php => m200000_000004_create_table_post_comments.php} | 2 +-
 .../m200000_000000_create_table_categories.php}                 | 2 +-
 .../m200000_000001_create_table_users.php}                      | 2 +-
 .../m200000_000003_create_table_fakerable.php}                  | 2 +-
 .../m200000_000004_create_table_post_comments.php}              | 2 +-
 ...ategories.php => m200000_000000_create_table_categories.php} | 2 +-
 ...te_table_users.php => m200000_000001_create_table_users.php} | 2 +-
 ..._fakerable.php => m200000_000003_create_table_fakerable.php} | 2 +-
 ...mments.php => m200000_000004_create_table_post_comments.php} | 2 +-
 ...te_table_photo.php => m200000_000000_create_table_photo.php} | 2 +-
 ...te_table_posts.php => m200000_000001_create_table_posts.php} | 2 +-
 ...s2posts.php => m200000_000002_create_table_photos2posts.php} | 2 +-
 ...eate_table_tags.php => m200000_000003_create_table_tags.php} | 2 +-
 ...osts2tags.php => m200000_000004_create_table_posts2tags.php} | 2 +-
 ...aches.php => m200000_000005_create_table_posts_attaches.php} | 2 +-
 ...allery.php => m200000_000006_create_table_posts_gallery.php} | 2 +-
 23 files changed, 23 insertions(+), 23 deletions(-)
 rename tests/specs/blog/{migrations_mysql_db/m200000_000001_create_table_categories.php => migrations/m200000_000000_create_table_categories.php} (91%)
 rename tests/specs/blog/migrations/{m200000_000000_create_table_users.php => m200000_000001_create_table_users.php} (94%)
 rename tests/specs/blog/{migrations_mysql_db/m200000_000004_create_table_fakerable.php => migrations/m200000_000003_create_table_fakerable.php} (95%)
 rename tests/specs/blog/{migrations_mysql_db/m200000_000003_create_table_post_comments.php => migrations/m200000_000004_create_table_post_comments.php} (93%)
 rename tests/specs/blog/{migrations/m200000_000001_create_table_categories.php => migrations_maria_db/m200000_000000_create_table_categories.php} (91%)
 rename tests/specs/blog/{migrations_mysql_db/m200000_000000_create_table_users.php => migrations_maria_db/m200000_000001_create_table_users.php} (94%)
 rename tests/specs/blog/migrations_maria_db/{m200000_000004_create_table_fakerable.php => m200000_000003_create_table_fakerable.php} (95%)
 rename tests/specs/blog/migrations_maria_db/{m200000_000003_create_table_post_comments.php => m200000_000004_create_table_post_comments.php} (94%)
 rename tests/specs/blog/{migrations_maria_db/m200000_000001_create_table_categories.php => migrations_mysql_db/m200000_000000_create_table_categories.php} (91%)
 rename tests/specs/blog/{migrations_maria_db/m200000_000000_create_table_users.php => migrations_mysql_db/m200000_000001_create_table_users.php} (94%)
 rename tests/specs/blog/{migrations/m200000_000004_create_table_fakerable.php => migrations_mysql_db/m200000_000003_create_table_fakerable.php} (95%)
 rename tests/specs/blog/{migrations/m200000_000003_create_table_post_comments.php => migrations_mysql_db/m200000_000004_create_table_post_comments.php} (93%)
 rename tests/specs/blog/migrations_pgsql_db/{m200000_000001_create_table_categories.php => m200000_000000_create_table_categories.php} (91%)
 rename tests/specs/blog/migrations_pgsql_db/{m200000_000000_create_table_users.php => m200000_000001_create_table_users.php} (94%)
 rename tests/specs/blog/migrations_pgsql_db/{m200000_000004_create_table_fakerable.php => m200000_000003_create_table_fakerable.php} (95%)
 rename tests/specs/blog/migrations_pgsql_db/{m200000_000003_create_table_post_comments.php => m200000_000004_create_table_post_comments.php} (94%)
 rename tests/specs/many2many/migrations/{m200000_000003_create_table_photo.php => m200000_000000_create_table_photo.php} (82%)
 rename tests/specs/many2many/migrations/{m200000_000000_create_table_posts.php => m200000_000001_create_table_posts.php} (82%)
 rename tests/specs/many2many/migrations/{m200000_000004_create_table_photos2posts.php => m200000_000002_create_table_photos2posts.php} (92%)
 rename tests/specs/many2many/migrations/{m200000_000001_create_table_tags.php => m200000_000003_create_table_tags.php} (82%)
 rename tests/specs/many2many/migrations/{m200000_000002_create_table_posts2tags.php => m200000_000004_create_table_posts2tags.php} (93%)
 rename tests/specs/many2many/migrations/{m200000_000006_create_table_posts_attaches.php => m200000_000005_create_table_posts_attaches.php} (93%)
 rename tests/specs/many2many/migrations/{m200000_000005_create_table_posts_gallery.php => m200000_000006_create_table_posts_gallery.php} (94%)

diff --git a/tests/specs/blog/migrations_mysql_db/m200000_000001_create_table_categories.php b/tests/specs/blog/migrations/m200000_000000_create_table_categories.php
similarity index 91%
rename from tests/specs/blog/migrations_mysql_db/m200000_000001_create_table_categories.php
rename to tests/specs/blog/migrations/m200000_000000_create_table_categories.php
index 957966fb..0485cafc 100644
--- a/tests/specs/blog/migrations_mysql_db/m200000_000001_create_table_categories.php
+++ b/tests/specs/blog/migrations/m200000_000000_create_table_categories.php
@@ -3,7 +3,7 @@
 /**
  * Table for Category
  */
-class m200000_000001_create_table_categories extends \yii\db\Migration
+class m200000_000000_create_table_categories extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/blog/migrations/m200000_000000_create_table_users.php b/tests/specs/blog/migrations/m200000_000001_create_table_users.php
similarity index 94%
rename from tests/specs/blog/migrations/m200000_000000_create_table_users.php
rename to tests/specs/blog/migrations/m200000_000001_create_table_users.php
index de42dde7..a90792e9 100644
--- a/tests/specs/blog/migrations/m200000_000000_create_table_users.php
+++ b/tests/specs/blog/migrations/m200000_000001_create_table_users.php
@@ -3,7 +3,7 @@
 /**
  * Table for User
  */
-class m200000_000000_create_table_users extends \yii\db\Migration
+class m200000_000001_create_table_users extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/blog/migrations_mysql_db/m200000_000004_create_table_fakerable.php b/tests/specs/blog/migrations/m200000_000003_create_table_fakerable.php
similarity index 95%
rename from tests/specs/blog/migrations_mysql_db/m200000_000004_create_table_fakerable.php
rename to tests/specs/blog/migrations/m200000_000003_create_table_fakerable.php
index 82c4db07..0f3eebad 100644
--- a/tests/specs/blog/migrations_mysql_db/m200000_000004_create_table_fakerable.php
+++ b/tests/specs/blog/migrations/m200000_000003_create_table_fakerable.php
@@ -3,7 +3,7 @@
 /**
  * Table for Fakerable
  */
-class m200000_000004_create_table_fakerable extends \yii\db\Migration
+class m200000_000003_create_table_fakerable extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/blog/migrations_mysql_db/m200000_000003_create_table_post_comments.php b/tests/specs/blog/migrations/m200000_000004_create_table_post_comments.php
similarity index 93%
rename from tests/specs/blog/migrations_mysql_db/m200000_000003_create_table_post_comments.php
rename to tests/specs/blog/migrations/m200000_000004_create_table_post_comments.php
index 45b512c3..c16766da 100644
--- a/tests/specs/blog/migrations_mysql_db/m200000_000003_create_table_post_comments.php
+++ b/tests/specs/blog/migrations/m200000_000004_create_table_post_comments.php
@@ -3,7 +3,7 @@
 /**
  * Table for Comment
  */
-class m200000_000003_create_table_post_comments extends \yii\db\Migration
+class m200000_000004_create_table_post_comments extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/blog/migrations/m200000_000001_create_table_categories.php b/tests/specs/blog/migrations_maria_db/m200000_000000_create_table_categories.php
similarity index 91%
rename from tests/specs/blog/migrations/m200000_000001_create_table_categories.php
rename to tests/specs/blog/migrations_maria_db/m200000_000000_create_table_categories.php
index 957966fb..0485cafc 100644
--- a/tests/specs/blog/migrations/m200000_000001_create_table_categories.php
+++ b/tests/specs/blog/migrations_maria_db/m200000_000000_create_table_categories.php
@@ -3,7 +3,7 @@
 /**
  * Table for Category
  */
-class m200000_000001_create_table_categories extends \yii\db\Migration
+class m200000_000000_create_table_categories extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/blog/migrations_mysql_db/m200000_000000_create_table_users.php b/tests/specs/blog/migrations_maria_db/m200000_000001_create_table_users.php
similarity index 94%
rename from tests/specs/blog/migrations_mysql_db/m200000_000000_create_table_users.php
rename to tests/specs/blog/migrations_maria_db/m200000_000001_create_table_users.php
index de42dde7..a90792e9 100644
--- a/tests/specs/blog/migrations_mysql_db/m200000_000000_create_table_users.php
+++ b/tests/specs/blog/migrations_maria_db/m200000_000001_create_table_users.php
@@ -3,7 +3,7 @@
 /**
  * Table for User
  */
-class m200000_000000_create_table_users extends \yii\db\Migration
+class m200000_000001_create_table_users extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/blog/migrations_maria_db/m200000_000004_create_table_fakerable.php b/tests/specs/blog/migrations_maria_db/m200000_000003_create_table_fakerable.php
similarity index 95%
rename from tests/specs/blog/migrations_maria_db/m200000_000004_create_table_fakerable.php
rename to tests/specs/blog/migrations_maria_db/m200000_000003_create_table_fakerable.php
index 4ec0bb94..84f6247c 100644
--- a/tests/specs/blog/migrations_maria_db/m200000_000004_create_table_fakerable.php
+++ b/tests/specs/blog/migrations_maria_db/m200000_000003_create_table_fakerable.php
@@ -3,7 +3,7 @@
 /**
  * Table for Fakerable
  */
-class m200000_000004_create_table_fakerable extends \yii\db\Migration
+class m200000_000003_create_table_fakerable extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/blog/migrations_maria_db/m200000_000003_create_table_post_comments.php b/tests/specs/blog/migrations_maria_db/m200000_000004_create_table_post_comments.php
similarity index 94%
rename from tests/specs/blog/migrations_maria_db/m200000_000003_create_table_post_comments.php
rename to tests/specs/blog/migrations_maria_db/m200000_000004_create_table_post_comments.php
index fc617edf..d4971f43 100644
--- a/tests/specs/blog/migrations_maria_db/m200000_000003_create_table_post_comments.php
+++ b/tests/specs/blog/migrations_maria_db/m200000_000004_create_table_post_comments.php
@@ -3,7 +3,7 @@
 /**
  * Table for Comment
  */
-class m200000_000003_create_table_post_comments extends \yii\db\Migration
+class m200000_000004_create_table_post_comments extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/blog/migrations_maria_db/m200000_000001_create_table_categories.php b/tests/specs/blog/migrations_mysql_db/m200000_000000_create_table_categories.php
similarity index 91%
rename from tests/specs/blog/migrations_maria_db/m200000_000001_create_table_categories.php
rename to tests/specs/blog/migrations_mysql_db/m200000_000000_create_table_categories.php
index 957966fb..0485cafc 100644
--- a/tests/specs/blog/migrations_maria_db/m200000_000001_create_table_categories.php
+++ b/tests/specs/blog/migrations_mysql_db/m200000_000000_create_table_categories.php
@@ -3,7 +3,7 @@
 /**
  * Table for Category
  */
-class m200000_000001_create_table_categories extends \yii\db\Migration
+class m200000_000000_create_table_categories extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/blog/migrations_maria_db/m200000_000000_create_table_users.php b/tests/specs/blog/migrations_mysql_db/m200000_000001_create_table_users.php
similarity index 94%
rename from tests/specs/blog/migrations_maria_db/m200000_000000_create_table_users.php
rename to tests/specs/blog/migrations_mysql_db/m200000_000001_create_table_users.php
index de42dde7..a90792e9 100644
--- a/tests/specs/blog/migrations_maria_db/m200000_000000_create_table_users.php
+++ b/tests/specs/blog/migrations_mysql_db/m200000_000001_create_table_users.php
@@ -3,7 +3,7 @@
 /**
  * Table for User
  */
-class m200000_000000_create_table_users extends \yii\db\Migration
+class m200000_000001_create_table_users extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/blog/migrations/m200000_000004_create_table_fakerable.php b/tests/specs/blog/migrations_mysql_db/m200000_000003_create_table_fakerable.php
similarity index 95%
rename from tests/specs/blog/migrations/m200000_000004_create_table_fakerable.php
rename to tests/specs/blog/migrations_mysql_db/m200000_000003_create_table_fakerable.php
index 82c4db07..0f3eebad 100644
--- a/tests/specs/blog/migrations/m200000_000004_create_table_fakerable.php
+++ b/tests/specs/blog/migrations_mysql_db/m200000_000003_create_table_fakerable.php
@@ -3,7 +3,7 @@
 /**
  * Table for Fakerable
  */
-class m200000_000004_create_table_fakerable extends \yii\db\Migration
+class m200000_000003_create_table_fakerable extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/blog/migrations/m200000_000003_create_table_post_comments.php b/tests/specs/blog/migrations_mysql_db/m200000_000004_create_table_post_comments.php
similarity index 93%
rename from tests/specs/blog/migrations/m200000_000003_create_table_post_comments.php
rename to tests/specs/blog/migrations_mysql_db/m200000_000004_create_table_post_comments.php
index 45b512c3..c16766da 100644
--- a/tests/specs/blog/migrations/m200000_000003_create_table_post_comments.php
+++ b/tests/specs/blog/migrations_mysql_db/m200000_000004_create_table_post_comments.php
@@ -3,7 +3,7 @@
 /**
  * Table for Comment
  */
-class m200000_000003_create_table_post_comments extends \yii\db\Migration
+class m200000_000004_create_table_post_comments extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/blog/migrations_pgsql_db/m200000_000001_create_table_categories.php b/tests/specs/blog/migrations_pgsql_db/m200000_000000_create_table_categories.php
similarity index 91%
rename from tests/specs/blog/migrations_pgsql_db/m200000_000001_create_table_categories.php
rename to tests/specs/blog/migrations_pgsql_db/m200000_000000_create_table_categories.php
index d99b8299..9c328a2d 100644
--- a/tests/specs/blog/migrations_pgsql_db/m200000_000001_create_table_categories.php
+++ b/tests/specs/blog/migrations_pgsql_db/m200000_000000_create_table_categories.php
@@ -3,7 +3,7 @@
 /**
  * Table for Category
  */
-class m200000_000001_create_table_categories extends \yii\db\Migration
+class m200000_000000_create_table_categories extends \yii\db\Migration
 {
     public function safeUp()
     {
diff --git a/tests/specs/blog/migrations_pgsql_db/m200000_000000_create_table_users.php b/tests/specs/blog/migrations_pgsql_db/m200000_000001_create_table_users.php
similarity index 94%
rename from tests/specs/blog/migrations_pgsql_db/m200000_000000_create_table_users.php
rename to tests/specs/blog/migrations_pgsql_db/m200000_000001_create_table_users.php
index a00af878..e2bc0165 100644
--- a/tests/specs/blog/migrations_pgsql_db/m200000_000000_create_table_users.php
+++ b/tests/specs/blog/migrations_pgsql_db/m200000_000001_create_table_users.php
@@ -3,7 +3,7 @@
 /**
  * Table for User
  */
-class m200000_000000_create_table_users extends \yii\db\Migration
+class m200000_000001_create_table_users extends \yii\db\Migration
 {
     public function safeUp()
     {
diff --git a/tests/specs/blog/migrations_pgsql_db/m200000_000004_create_table_fakerable.php b/tests/specs/blog/migrations_pgsql_db/m200000_000003_create_table_fakerable.php
similarity index 95%
rename from tests/specs/blog/migrations_pgsql_db/m200000_000004_create_table_fakerable.php
rename to tests/specs/blog/migrations_pgsql_db/m200000_000003_create_table_fakerable.php
index ae6929cb..a42b8954 100644
--- a/tests/specs/blog/migrations_pgsql_db/m200000_000004_create_table_fakerable.php
+++ b/tests/specs/blog/migrations_pgsql_db/m200000_000003_create_table_fakerable.php
@@ -3,7 +3,7 @@
 /**
  * Table for Fakerable
  */
-class m200000_000004_create_table_fakerable extends \yii\db\Migration
+class m200000_000003_create_table_fakerable extends \yii\db\Migration
 {
     public function safeUp()
     {
diff --git a/tests/specs/blog/migrations_pgsql_db/m200000_000003_create_table_post_comments.php b/tests/specs/blog/migrations_pgsql_db/m200000_000004_create_table_post_comments.php
similarity index 94%
rename from tests/specs/blog/migrations_pgsql_db/m200000_000003_create_table_post_comments.php
rename to tests/specs/blog/migrations_pgsql_db/m200000_000004_create_table_post_comments.php
index 5f31afad..2aa48549 100644
--- a/tests/specs/blog/migrations_pgsql_db/m200000_000003_create_table_post_comments.php
+++ b/tests/specs/blog/migrations_pgsql_db/m200000_000004_create_table_post_comments.php
@@ -3,7 +3,7 @@
 /**
  * Table for Comment
  */
-class m200000_000003_create_table_post_comments extends \yii\db\Migration
+class m200000_000004_create_table_post_comments extends \yii\db\Migration
 {
     public function safeUp()
     {
diff --git a/tests/specs/many2many/migrations/m200000_000003_create_table_photo.php b/tests/specs/many2many/migrations/m200000_000000_create_table_photo.php
similarity index 82%
rename from tests/specs/many2many/migrations/m200000_000003_create_table_photo.php
rename to tests/specs/many2many/migrations/m200000_000000_create_table_photo.php
index 2d783bbf..4e578d91 100644
--- a/tests/specs/many2many/migrations/m200000_000003_create_table_photo.php
+++ b/tests/specs/many2many/migrations/m200000_000000_create_table_photo.php
@@ -3,7 +3,7 @@
 /**
  * Table for Photo
  */
-class m200000_000003_create_table_photo extends \yii\db\Migration
+class m200000_000000_create_table_photo extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/many2many/migrations/m200000_000000_create_table_posts.php b/tests/specs/many2many/migrations/m200000_000001_create_table_posts.php
similarity index 82%
rename from tests/specs/many2many/migrations/m200000_000000_create_table_posts.php
rename to tests/specs/many2many/migrations/m200000_000001_create_table_posts.php
index 4febc421..2d07a0d1 100644
--- a/tests/specs/many2many/migrations/m200000_000000_create_table_posts.php
+++ b/tests/specs/many2many/migrations/m200000_000001_create_table_posts.php
@@ -3,7 +3,7 @@
 /**
  * Table for Post
  */
-class m200000_000000_create_table_posts extends \yii\db\Migration
+class m200000_000001_create_table_posts extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/many2many/migrations/m200000_000004_create_table_photos2posts.php b/tests/specs/many2many/migrations/m200000_000002_create_table_photos2posts.php
similarity index 92%
rename from tests/specs/many2many/migrations/m200000_000004_create_table_photos2posts.php
rename to tests/specs/many2many/migrations/m200000_000002_create_table_photos2posts.php
index b509a525..f10b43a6 100644
--- a/tests/specs/many2many/migrations/m200000_000004_create_table_photos2posts.php
+++ b/tests/specs/many2many/migrations/m200000_000002_create_table_photos2posts.php
@@ -3,7 +3,7 @@
 /**
  * Table for Photos2Posts
  */
-class m200000_000004_create_table_photos2posts extends \yii\db\Migration
+class m200000_000002_create_table_photos2posts extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/many2many/migrations/m200000_000001_create_table_tags.php b/tests/specs/many2many/migrations/m200000_000003_create_table_tags.php
similarity index 82%
rename from tests/specs/many2many/migrations/m200000_000001_create_table_tags.php
rename to tests/specs/many2many/migrations/m200000_000003_create_table_tags.php
index b78dfe66..253b8513 100644
--- a/tests/specs/many2many/migrations/m200000_000001_create_table_tags.php
+++ b/tests/specs/many2many/migrations/m200000_000003_create_table_tags.php
@@ -3,7 +3,7 @@
 /**
  * Table for Tag
  */
-class m200000_000001_create_table_tags extends \yii\db\Migration
+class m200000_000003_create_table_tags extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/many2many/migrations/m200000_000002_create_table_posts2tags.php b/tests/specs/many2many/migrations/m200000_000004_create_table_posts2tags.php
similarity index 93%
rename from tests/specs/many2many/migrations/m200000_000002_create_table_posts2tags.php
rename to tests/specs/many2many/migrations/m200000_000004_create_table_posts2tags.php
index 373e2e65..dbc82bc3 100644
--- a/tests/specs/many2many/migrations/m200000_000002_create_table_posts2tags.php
+++ b/tests/specs/many2many/migrations/m200000_000004_create_table_posts2tags.php
@@ -3,7 +3,7 @@
 /**
  * Table for Posts2Tags
  */
-class m200000_000002_create_table_posts2tags extends \yii\db\Migration
+class m200000_000004_create_table_posts2tags extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/many2many/migrations/m200000_000006_create_table_posts_attaches.php b/tests/specs/many2many/migrations/m200000_000005_create_table_posts_attaches.php
similarity index 93%
rename from tests/specs/many2many/migrations/m200000_000006_create_table_posts_attaches.php
rename to tests/specs/many2many/migrations/m200000_000005_create_table_posts_attaches.php
index db479676..f5092acb 100644
--- a/tests/specs/many2many/migrations/m200000_000006_create_table_posts_attaches.php
+++ b/tests/specs/many2many/migrations/m200000_000005_create_table_posts_attaches.php
@@ -3,7 +3,7 @@
 /**
  * Table for PostsAttaches
  */
-class m200000_000006_create_table_posts_attaches extends \yii\db\Migration
+class m200000_000005_create_table_posts_attaches extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/many2many/migrations/m200000_000005_create_table_posts_gallery.php b/tests/specs/many2many/migrations/m200000_000006_create_table_posts_gallery.php
similarity index 94%
rename from tests/specs/many2many/migrations/m200000_000005_create_table_posts_gallery.php
rename to tests/specs/many2many/migrations/m200000_000006_create_table_posts_gallery.php
index fe358e21..aeb6c64f 100644
--- a/tests/specs/many2many/migrations/m200000_000005_create_table_posts_gallery.php
+++ b/tests/specs/many2many/migrations/m200000_000006_create_table_posts_gallery.php
@@ -3,7 +3,7 @@
 /**
  * Table for PostsGallery
  */
-class m200000_000005_create_table_posts_gallery extends \yii\db\Migration
+class m200000_000006_create_table_posts_gallery extends \yii\db\Migration
 {
     public function up()
     {

From b08a7dcc0f33198644f45fd25b229063d2a21ef5 Mon Sep 17 00:00:00 2001
From: Sohel Ahmed Mesaniya <sam.wankaner@gmail.com>
Date: Thu, 25 Jul 2024 15:28:41 +0530
Subject: [PATCH 52/71] Revert "Fix another failing tests -
 ForeignKeyColumnNameTest::testIndexForColumnWithCustomName"

This reverts commit 0c552cec91c01a242b0111d536615f240609ee86.
---
 ...eliveries.php => m200000_000000_create_table_deliveries.php} | 2 +-
 ...te_table_users.php => m200000_000001_create_table_users.php} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename tests/specs/fk_col_name_index/app/migrations_mysql_db/{m200000_000001_create_table_deliveries.php => m200000_000000_create_table_deliveries.php} (83%)
 rename tests/specs/fk_col_name_index/app/migrations_mysql_db/{m200000_000000_create_table_users.php => m200000_000001_create_table_users.php} (82%)

diff --git a/tests/specs/fk_col_name_index/app/migrations_mysql_db/m200000_000001_create_table_deliveries.php b/tests/specs/fk_col_name_index/app/migrations_mysql_db/m200000_000000_create_table_deliveries.php
similarity index 83%
rename from tests/specs/fk_col_name_index/app/migrations_mysql_db/m200000_000001_create_table_deliveries.php
rename to tests/specs/fk_col_name_index/app/migrations_mysql_db/m200000_000000_create_table_deliveries.php
index b99ba258..e88d0ea9 100644
--- a/tests/specs/fk_col_name_index/app/migrations_mysql_db/m200000_000001_create_table_deliveries.php
+++ b/tests/specs/fk_col_name_index/app/migrations_mysql_db/m200000_000000_create_table_deliveries.php
@@ -3,7 +3,7 @@
 /**
  * Table for Delivery
  */
-class m200000_000001_create_table_deliveries extends \yii\db\Migration
+class m200000_000000_create_table_deliveries extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/fk_col_name_index/app/migrations_mysql_db/m200000_000000_create_table_users.php b/tests/specs/fk_col_name_index/app/migrations_mysql_db/m200000_000001_create_table_users.php
similarity index 82%
rename from tests/specs/fk_col_name_index/app/migrations_mysql_db/m200000_000000_create_table_users.php
rename to tests/specs/fk_col_name_index/app/migrations_mysql_db/m200000_000001_create_table_users.php
index 2616e0a4..e6e9afe4 100644
--- a/tests/specs/fk_col_name_index/app/migrations_mysql_db/m200000_000000_create_table_users.php
+++ b/tests/specs/fk_col_name_index/app/migrations_mysql_db/m200000_000001_create_table_users.php
@@ -3,7 +3,7 @@
 /**
  * Table for User
  */
-class m200000_000000_create_table_users extends \yii\db\Migration
+class m200000_000001_create_table_users extends \yii\db\Migration
 {
     public function up()
     {

From 73d36d3ff3c2b30a40210a9ebbbea31a7c8d1a32 Mon Sep 17 00:00:00 2001
From: Sohel Ahmed Mesaniya <sam.wankaner@gmail.com>
Date: Thu, 25 Jul 2024 15:29:02 +0530
Subject: [PATCH 53/71] Revert "Fix another failing tests -
 ForeignKeyColumnNameTest::testIndex"

This reverts commit 07b00b1bd2e6839256d4ff7a49f969e2b7927fa3.
---
 ...eliveries.php => m200000_000000_create_table_deliveries.php} | 2 +-
 ...te_table_users.php => m200000_000001_create_table_users.php} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename tests/specs/fk_col_name/app/migrations_mysql_db/{m200000_000001_create_table_deliveries.php => m200000_000000_create_table_deliveries.php} (83%)
 rename tests/specs/fk_col_name/app/migrations_mysql_db/{m200000_000000_create_table_users.php => m200000_000001_create_table_users.php} (82%)

diff --git a/tests/specs/fk_col_name/app/migrations_mysql_db/m200000_000001_create_table_deliveries.php b/tests/specs/fk_col_name/app/migrations_mysql_db/m200000_000000_create_table_deliveries.php
similarity index 83%
rename from tests/specs/fk_col_name/app/migrations_mysql_db/m200000_000001_create_table_deliveries.php
rename to tests/specs/fk_col_name/app/migrations_mysql_db/m200000_000000_create_table_deliveries.php
index b99ba258..e88d0ea9 100644
--- a/tests/specs/fk_col_name/app/migrations_mysql_db/m200000_000001_create_table_deliveries.php
+++ b/tests/specs/fk_col_name/app/migrations_mysql_db/m200000_000000_create_table_deliveries.php
@@ -3,7 +3,7 @@
 /**
  * Table for Delivery
  */
-class m200000_000001_create_table_deliveries extends \yii\db\Migration
+class m200000_000000_create_table_deliveries extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/fk_col_name/app/migrations_mysql_db/m200000_000000_create_table_users.php b/tests/specs/fk_col_name/app/migrations_mysql_db/m200000_000001_create_table_users.php
similarity index 82%
rename from tests/specs/fk_col_name/app/migrations_mysql_db/m200000_000000_create_table_users.php
rename to tests/specs/fk_col_name/app/migrations_mysql_db/m200000_000001_create_table_users.php
index 2616e0a4..e6e9afe4 100644
--- a/tests/specs/fk_col_name/app/migrations_mysql_db/m200000_000000_create_table_users.php
+++ b/tests/specs/fk_col_name/app/migrations_mysql_db/m200000_000001_create_table_users.php
@@ -3,7 +3,7 @@
 /**
  * Table for User
  */
-class m200000_000000_create_table_users extends \yii\db\Migration
+class m200000_000001_create_table_users extends \yii\db\Migration
 {
     public function up()
     {

From 8d835c05d5bc83443dd1e77211ceadc01a80dff0 Mon Sep 17 00:00:00 2001
From: Sohel Ahmed Mesaniya <sam.wankaner@gmail.com>
Date: Thu, 25 Jul 2024 15:29:31 +0530
Subject: [PATCH 54/71] Revert "Fix another failing tests -
 EnumTest::testChangeToAndFromEnum"

This reverts commit ad7b022c48a2f263fea0cec59d8db9b0cbc49a68.
---
 ...tcolumns.php => m200000_000000_change_table_editcolumns.php} | 2 +-
 ..._pristines.php => m200000_000002_create_table_pristines.php} | 2 +-
 ...tcolumns.php => m200000_000000_change_table_editcolumns.php} | 2 +-
 ..._pristines.php => m200000_000002_create_table_pristines.php} | 2 +-
 ...tcolumns.php => m200000_000000_change_table_editcolumns.php} | 2 +-
 ..._pristines.php => m200000_000002_create_table_pristines.php} | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)
 rename tests/specs/enum/change/maria/app/migrations_maria_db/{m200000_000002_change_table_editcolumns.php => m200000_000000_change_table_editcolumns.php} (92%)
 rename tests/specs/enum/change/maria/app/migrations_maria_db/{m200000_000000_create_table_pristines.php => m200000_000002_create_table_pristines.php} (84%)
 rename tests/specs/enum/change/mysql/app/migrations_mysql_db/{m200000_000002_change_table_editcolumns.php => m200000_000000_change_table_editcolumns.php} (92%)
 rename tests/specs/enum/change/mysql/app/migrations_mysql_db/{m200000_000000_create_table_pristines.php => m200000_000002_create_table_pristines.php} (84%)
 rename tests/specs/enum/change/pgsql/app/migrations_pgsql_db/{m200000_000002_change_table_editcolumns.php => m200000_000000_change_table_editcolumns.php} (97%)
 rename tests/specs/enum/change/pgsql/app/migrations_pgsql_db/{m200000_000000_create_table_pristines.php => m200000_000002_create_table_pristines.php} (89%)

diff --git a/tests/specs/enum/change/maria/app/migrations_maria_db/m200000_000002_change_table_editcolumns.php b/tests/specs/enum/change/maria/app/migrations_maria_db/m200000_000000_change_table_editcolumns.php
similarity index 92%
rename from tests/specs/enum/change/maria/app/migrations_maria_db/m200000_000002_change_table_editcolumns.php
rename to tests/specs/enum/change/maria/app/migrations_maria_db/m200000_000000_change_table_editcolumns.php
index a2b3f68d..3df0a659 100644
--- a/tests/specs/enum/change/maria/app/migrations_maria_db/m200000_000002_change_table_editcolumns.php
+++ b/tests/specs/enum/change/maria/app/migrations_maria_db/m200000_000000_change_table_editcolumns.php
@@ -3,7 +3,7 @@
 /**
  * Table for Editcolumn
  */
-class m200000_000002_change_table_editcolumns extends \yii\db\Migration
+class m200000_000000_change_table_editcolumns extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/enum/change/maria/app/migrations_maria_db/m200000_000000_create_table_pristines.php b/tests/specs/enum/change/maria/app/migrations_maria_db/m200000_000002_create_table_pristines.php
similarity index 84%
rename from tests/specs/enum/change/maria/app/migrations_maria_db/m200000_000000_create_table_pristines.php
rename to tests/specs/enum/change/maria/app/migrations_maria_db/m200000_000002_create_table_pristines.php
index 2b602da7..bdd46f98 100644
--- a/tests/specs/enum/change/maria/app/migrations_maria_db/m200000_000000_create_table_pristines.php
+++ b/tests/specs/enum/change/maria/app/migrations_maria_db/m200000_000002_create_table_pristines.php
@@ -3,7 +3,7 @@
 /**
  * Table for Pristine
  */
-class m200000_000000_create_table_pristines extends \yii\db\Migration
+class m200000_000002_create_table_pristines extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/enum/change/mysql/app/migrations_mysql_db/m200000_000002_change_table_editcolumns.php b/tests/specs/enum/change/mysql/app/migrations_mysql_db/m200000_000000_change_table_editcolumns.php
similarity index 92%
rename from tests/specs/enum/change/mysql/app/migrations_mysql_db/m200000_000002_change_table_editcolumns.php
rename to tests/specs/enum/change/mysql/app/migrations_mysql_db/m200000_000000_change_table_editcolumns.php
index 8d4e499b..117d6069 100644
--- a/tests/specs/enum/change/mysql/app/migrations_mysql_db/m200000_000002_change_table_editcolumns.php
+++ b/tests/specs/enum/change/mysql/app/migrations_mysql_db/m200000_000000_change_table_editcolumns.php
@@ -3,7 +3,7 @@
 /**
  * Table for Editcolumn
  */
-class m200000_000002_change_table_editcolumns extends \yii\db\Migration
+class m200000_000000_change_table_editcolumns extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/enum/change/mysql/app/migrations_mysql_db/m200000_000000_create_table_pristines.php b/tests/specs/enum/change/mysql/app/migrations_mysql_db/m200000_000002_create_table_pristines.php
similarity index 84%
rename from tests/specs/enum/change/mysql/app/migrations_mysql_db/m200000_000000_create_table_pristines.php
rename to tests/specs/enum/change/mysql/app/migrations_mysql_db/m200000_000002_create_table_pristines.php
index 2b602da7..bdd46f98 100644
--- a/tests/specs/enum/change/mysql/app/migrations_mysql_db/m200000_000000_create_table_pristines.php
+++ b/tests/specs/enum/change/mysql/app/migrations_mysql_db/m200000_000002_create_table_pristines.php
@@ -3,7 +3,7 @@
 /**
  * Table for Pristine
  */
-class m200000_000000_create_table_pristines extends \yii\db\Migration
+class m200000_000002_create_table_pristines extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/enum/change/pgsql/app/migrations_pgsql_db/m200000_000002_change_table_editcolumns.php b/tests/specs/enum/change/pgsql/app/migrations_pgsql_db/m200000_000000_change_table_editcolumns.php
similarity index 97%
rename from tests/specs/enum/change/pgsql/app/migrations_pgsql_db/m200000_000002_change_table_editcolumns.php
rename to tests/specs/enum/change/pgsql/app/migrations_pgsql_db/m200000_000000_change_table_editcolumns.php
index 0bbb27a9..66287960 100644
--- a/tests/specs/enum/change/pgsql/app/migrations_pgsql_db/m200000_000002_change_table_editcolumns.php
+++ b/tests/specs/enum/change/pgsql/app/migrations_pgsql_db/m200000_000000_change_table_editcolumns.php
@@ -3,7 +3,7 @@
 /**
  * Table for Editcolumn
  */
-class m200000_000002_change_table_editcolumns extends \yii\db\Migration
+class m200000_000000_change_table_editcolumns extends \yii\db\Migration
 {
     public function safeUp()
     {
diff --git a/tests/specs/enum/change/pgsql/app/migrations_pgsql_db/m200000_000000_create_table_pristines.php b/tests/specs/enum/change/pgsql/app/migrations_pgsql_db/m200000_000002_create_table_pristines.php
similarity index 89%
rename from tests/specs/enum/change/pgsql/app/migrations_pgsql_db/m200000_000000_create_table_pristines.php
rename to tests/specs/enum/change/pgsql/app/migrations_pgsql_db/m200000_000002_create_table_pristines.php
index e336e5e2..45b63115 100644
--- a/tests/specs/enum/change/pgsql/app/migrations_pgsql_db/m200000_000000_create_table_pristines.php
+++ b/tests/specs/enum/change/pgsql/app/migrations_pgsql_db/m200000_000002_create_table_pristines.php
@@ -3,7 +3,7 @@
 /**
  * Table for Pristine
  */
-class m200000_000000_create_table_pristines extends \yii\db\Migration
+class m200000_000002_create_table_pristines extends \yii\db\Migration
 {
     public function safeUp()
     {

From 1c0f3b6cfa9f2efd1fabd52266be6e00f0599c42 Mon Sep 17 00:00:00 2001
From: Sohel Ahmed Mesaniya <sam.wankaner@gmail.com>
Date: Thu, 25 Jul 2024 15:30:28 +0530
Subject: [PATCH 55/71] Revert "Fix another failing tests -
 EnumTest::testAddNewColumn"

This reverts commit 72b927b270822ecbc161ee5bbe6e2d8b9243c782.
---
 ...tcolumns.php => m200000_000000_create_table_editcolumns.php} | 2 +-
 ..._pristines.php => m200000_000002_create_table_pristines.php} | 2 +-
 ...tcolumns.php => m200000_000000_create_table_editcolumns.php} | 2 +-
 ..._pristines.php => m200000_000002_create_table_pristines.php} | 2 +-
 ...tcolumns.php => m200000_000000_create_table_editcolumns.php} | 2 +-
 ..._pristines.php => m200000_000002_create_table_pristines.php} | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)
 rename tests/specs/enum/new_column/maria/app/migrations_maria_db/{m200000_000002_create_table_editcolumns.php => m200000_000000_create_table_editcolumns.php} (88%)
 rename tests/specs/enum/new_column/maria/app/migrations_maria_db/{m200000_000000_create_table_pristines.php => m200000_000002_create_table_pristines.php} (84%)
 rename tests/specs/enum/new_column/mysql/app/migrations_mysql_db/{m200000_000002_create_table_editcolumns.php => m200000_000000_create_table_editcolumns.php} (88%)
 rename tests/specs/enum/new_column/mysql/app/migrations_mysql_db/{m200000_000000_create_table_pristines.php => m200000_000002_create_table_pristines.php} (84%)
 rename tests/specs/enum/new_column/pgsql/app/migrations_pgsql_db/{m200000_000002_create_table_editcolumns.php => m200000_000000_create_table_editcolumns.php} (93%)
 rename tests/specs/enum/new_column/pgsql/app/migrations_pgsql_db/{m200000_000000_create_table_pristines.php => m200000_000002_create_table_pristines.php} (89%)

diff --git a/tests/specs/enum/new_column/maria/app/migrations_maria_db/m200000_000002_create_table_editcolumns.php b/tests/specs/enum/new_column/maria/app/migrations_maria_db/m200000_000000_create_table_editcolumns.php
similarity index 88%
rename from tests/specs/enum/new_column/maria/app/migrations_maria_db/m200000_000002_create_table_editcolumns.php
rename to tests/specs/enum/new_column/maria/app/migrations_maria_db/m200000_000000_create_table_editcolumns.php
index d4e6b085..1d2581bf 100644
--- a/tests/specs/enum/new_column/maria/app/migrations_maria_db/m200000_000002_create_table_editcolumns.php
+++ b/tests/specs/enum/new_column/maria/app/migrations_maria_db/m200000_000000_create_table_editcolumns.php
@@ -3,7 +3,7 @@
 /**
  * Table for Editcolumn
  */
-class m200000_000002_create_table_editcolumns extends \yii\db\Migration
+class m200000_000000_create_table_editcolumns extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/enum/new_column/maria/app/migrations_maria_db/m200000_000000_create_table_pristines.php b/tests/specs/enum/new_column/maria/app/migrations_maria_db/m200000_000002_create_table_pristines.php
similarity index 84%
rename from tests/specs/enum/new_column/maria/app/migrations_maria_db/m200000_000000_create_table_pristines.php
rename to tests/specs/enum/new_column/maria/app/migrations_maria_db/m200000_000002_create_table_pristines.php
index 2b602da7..bdd46f98 100644
--- a/tests/specs/enum/new_column/maria/app/migrations_maria_db/m200000_000000_create_table_pristines.php
+++ b/tests/specs/enum/new_column/maria/app/migrations_maria_db/m200000_000002_create_table_pristines.php
@@ -3,7 +3,7 @@
 /**
  * Table for Pristine
  */
-class m200000_000000_create_table_pristines extends \yii\db\Migration
+class m200000_000002_create_table_pristines extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/enum/new_column/mysql/app/migrations_mysql_db/m200000_000002_create_table_editcolumns.php b/tests/specs/enum/new_column/mysql/app/migrations_mysql_db/m200000_000000_create_table_editcolumns.php
similarity index 88%
rename from tests/specs/enum/new_column/mysql/app/migrations_mysql_db/m200000_000002_create_table_editcolumns.php
rename to tests/specs/enum/new_column/mysql/app/migrations_mysql_db/m200000_000000_create_table_editcolumns.php
index 241a5fd7..3aeb5b25 100644
--- a/tests/specs/enum/new_column/mysql/app/migrations_mysql_db/m200000_000002_create_table_editcolumns.php
+++ b/tests/specs/enum/new_column/mysql/app/migrations_mysql_db/m200000_000000_create_table_editcolumns.php
@@ -3,7 +3,7 @@
 /**
  * Table for Editcolumn
  */
-class m200000_000002_create_table_editcolumns extends \yii\db\Migration
+class m200000_000000_create_table_editcolumns extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/enum/new_column/mysql/app/migrations_mysql_db/m200000_000000_create_table_pristines.php b/tests/specs/enum/new_column/mysql/app/migrations_mysql_db/m200000_000002_create_table_pristines.php
similarity index 84%
rename from tests/specs/enum/new_column/mysql/app/migrations_mysql_db/m200000_000000_create_table_pristines.php
rename to tests/specs/enum/new_column/mysql/app/migrations_mysql_db/m200000_000002_create_table_pristines.php
index 2b602da7..bdd46f98 100644
--- a/tests/specs/enum/new_column/mysql/app/migrations_mysql_db/m200000_000000_create_table_pristines.php
+++ b/tests/specs/enum/new_column/mysql/app/migrations_mysql_db/m200000_000002_create_table_pristines.php
@@ -3,7 +3,7 @@
 /**
  * Table for Pristine
  */
-class m200000_000000_create_table_pristines extends \yii\db\Migration
+class m200000_000002_create_table_pristines extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/enum/new_column/pgsql/app/migrations_pgsql_db/m200000_000002_create_table_editcolumns.php b/tests/specs/enum/new_column/pgsql/app/migrations_pgsql_db/m200000_000000_create_table_editcolumns.php
similarity index 93%
rename from tests/specs/enum/new_column/pgsql/app/migrations_pgsql_db/m200000_000002_create_table_editcolumns.php
rename to tests/specs/enum/new_column/pgsql/app/migrations_pgsql_db/m200000_000000_create_table_editcolumns.php
index 36bbb3fa..5180bf54 100644
--- a/tests/specs/enum/new_column/pgsql/app/migrations_pgsql_db/m200000_000002_create_table_editcolumns.php
+++ b/tests/specs/enum/new_column/pgsql/app/migrations_pgsql_db/m200000_000000_create_table_editcolumns.php
@@ -3,7 +3,7 @@
 /**
  * Table for Editcolumn
  */
-class m200000_000002_create_table_editcolumns extends \yii\db\Migration
+class m200000_000000_create_table_editcolumns extends \yii\db\Migration
 {
     public function safeUp()
     {
diff --git a/tests/specs/enum/new_column/pgsql/app/migrations_pgsql_db/m200000_000000_create_table_pristines.php b/tests/specs/enum/new_column/pgsql/app/migrations_pgsql_db/m200000_000002_create_table_pristines.php
similarity index 89%
rename from tests/specs/enum/new_column/pgsql/app/migrations_pgsql_db/m200000_000000_create_table_pristines.php
rename to tests/specs/enum/new_column/pgsql/app/migrations_pgsql_db/m200000_000002_create_table_pristines.php
index e336e5e2..45b63115 100644
--- a/tests/specs/enum/new_column/pgsql/app/migrations_pgsql_db/m200000_000000_create_table_pristines.php
+++ b/tests/specs/enum/new_column/pgsql/app/migrations_pgsql_db/m200000_000002_create_table_pristines.php
@@ -3,7 +3,7 @@
 /**
  * Table for Pristine
  */
-class m200000_000000_create_table_pristines extends \yii\db\Migration
+class m200000_000002_create_table_pristines extends \yii\db\Migration
 {
     public function safeUp()
     {

From 9fdc293fdae858633a17dbe67c4e73b19fe4d5b1 Mon Sep 17 00:00:00 2001
From: Sohel Ahmed Mesaniya <sam.wankaner@gmail.com>
Date: Thu, 25 Jul 2024 15:30:54 +0530
Subject: [PATCH 56/71] Revert "Fix another failing tests - 4"

This reverts commit 0dbad7ce4fdae317ed0d5ba06edb64cfc3d873a0.
---
 ...tcolumns.php => m200000_000000_create_table_editcolumns.php} | 2 +-
 ..._pristines.php => m200000_000002_create_table_pristines.php} | 2 +-
 ...tcolumns.php => m200000_000000_create_table_editcolumns.php} | 2 +-
 ..._pristines.php => m200000_000002_create_table_pristines.php} | 2 +-
 ...tcolumns.php => m200000_000000_create_table_editcolumns.php} | 2 +-
 ..._pristines.php => m200000_000002_create_table_pristines.php} | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)
 rename tests/specs/enum/fresh/maria/app/migrations_maria_db/{m200000_000002_create_table_editcolumns.php => m200000_000000_create_table_editcolumns.php} (88%)
 rename tests/specs/enum/fresh/maria/app/migrations_maria_db/{m200000_000000_create_table_pristines.php => m200000_000002_create_table_pristines.php} (84%)
 rename tests/specs/enum/fresh/mysql/app/migrations_mysql_db/{m200000_000002_create_table_editcolumns.php => m200000_000000_create_table_editcolumns.php} (88%)
 rename tests/specs/enum/fresh/mysql/app/migrations_mysql_db/{m200000_000000_create_table_pristines.php => m200000_000002_create_table_pristines.php} (84%)
 rename tests/specs/enum/fresh/pgsql/app/migrations_pgsql_db/{m200000_000002_create_table_editcolumns.php => m200000_000000_create_table_editcolumns.php} (93%)
 rename tests/specs/enum/fresh/pgsql/app/migrations_pgsql_db/{m200000_000000_create_table_pristines.php => m200000_000002_create_table_pristines.php} (89%)

diff --git a/tests/specs/enum/fresh/maria/app/migrations_maria_db/m200000_000002_create_table_editcolumns.php b/tests/specs/enum/fresh/maria/app/migrations_maria_db/m200000_000000_create_table_editcolumns.php
similarity index 88%
rename from tests/specs/enum/fresh/maria/app/migrations_maria_db/m200000_000002_create_table_editcolumns.php
rename to tests/specs/enum/fresh/maria/app/migrations_maria_db/m200000_000000_create_table_editcolumns.php
index d4e6b085..1d2581bf 100644
--- a/tests/specs/enum/fresh/maria/app/migrations_maria_db/m200000_000002_create_table_editcolumns.php
+++ b/tests/specs/enum/fresh/maria/app/migrations_maria_db/m200000_000000_create_table_editcolumns.php
@@ -3,7 +3,7 @@
 /**
  * Table for Editcolumn
  */
-class m200000_000002_create_table_editcolumns extends \yii\db\Migration
+class m200000_000000_create_table_editcolumns extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/enum/fresh/maria/app/migrations_maria_db/m200000_000000_create_table_pristines.php b/tests/specs/enum/fresh/maria/app/migrations_maria_db/m200000_000002_create_table_pristines.php
similarity index 84%
rename from tests/specs/enum/fresh/maria/app/migrations_maria_db/m200000_000000_create_table_pristines.php
rename to tests/specs/enum/fresh/maria/app/migrations_maria_db/m200000_000002_create_table_pristines.php
index 2b602da7..bdd46f98 100644
--- a/tests/specs/enum/fresh/maria/app/migrations_maria_db/m200000_000000_create_table_pristines.php
+++ b/tests/specs/enum/fresh/maria/app/migrations_maria_db/m200000_000002_create_table_pristines.php
@@ -3,7 +3,7 @@
 /**
  * Table for Pristine
  */
-class m200000_000000_create_table_pristines extends \yii\db\Migration
+class m200000_000002_create_table_pristines extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/enum/fresh/mysql/app/migrations_mysql_db/m200000_000002_create_table_editcolumns.php b/tests/specs/enum/fresh/mysql/app/migrations_mysql_db/m200000_000000_create_table_editcolumns.php
similarity index 88%
rename from tests/specs/enum/fresh/mysql/app/migrations_mysql_db/m200000_000002_create_table_editcolumns.php
rename to tests/specs/enum/fresh/mysql/app/migrations_mysql_db/m200000_000000_create_table_editcolumns.php
index 241a5fd7..3aeb5b25 100644
--- a/tests/specs/enum/fresh/mysql/app/migrations_mysql_db/m200000_000002_create_table_editcolumns.php
+++ b/tests/specs/enum/fresh/mysql/app/migrations_mysql_db/m200000_000000_create_table_editcolumns.php
@@ -3,7 +3,7 @@
 /**
  * Table for Editcolumn
  */
-class m200000_000002_create_table_editcolumns extends \yii\db\Migration
+class m200000_000000_create_table_editcolumns extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/enum/fresh/mysql/app/migrations_mysql_db/m200000_000000_create_table_pristines.php b/tests/specs/enum/fresh/mysql/app/migrations_mysql_db/m200000_000002_create_table_pristines.php
similarity index 84%
rename from tests/specs/enum/fresh/mysql/app/migrations_mysql_db/m200000_000000_create_table_pristines.php
rename to tests/specs/enum/fresh/mysql/app/migrations_mysql_db/m200000_000002_create_table_pristines.php
index 2b602da7..bdd46f98 100644
--- a/tests/specs/enum/fresh/mysql/app/migrations_mysql_db/m200000_000000_create_table_pristines.php
+++ b/tests/specs/enum/fresh/mysql/app/migrations_mysql_db/m200000_000002_create_table_pristines.php
@@ -3,7 +3,7 @@
 /**
  * Table for Pristine
  */
-class m200000_000000_create_table_pristines extends \yii\db\Migration
+class m200000_000002_create_table_pristines extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/enum/fresh/pgsql/app/migrations_pgsql_db/m200000_000002_create_table_editcolumns.php b/tests/specs/enum/fresh/pgsql/app/migrations_pgsql_db/m200000_000000_create_table_editcolumns.php
similarity index 93%
rename from tests/specs/enum/fresh/pgsql/app/migrations_pgsql_db/m200000_000002_create_table_editcolumns.php
rename to tests/specs/enum/fresh/pgsql/app/migrations_pgsql_db/m200000_000000_create_table_editcolumns.php
index 36bbb3fa..5180bf54 100644
--- a/tests/specs/enum/fresh/pgsql/app/migrations_pgsql_db/m200000_000002_create_table_editcolumns.php
+++ b/tests/specs/enum/fresh/pgsql/app/migrations_pgsql_db/m200000_000000_create_table_editcolumns.php
@@ -3,7 +3,7 @@
 /**
  * Table for Editcolumn
  */
-class m200000_000002_create_table_editcolumns extends \yii\db\Migration
+class m200000_000000_create_table_editcolumns extends \yii\db\Migration
 {
     public function safeUp()
     {
diff --git a/tests/specs/enum/fresh/pgsql/app/migrations_pgsql_db/m200000_000000_create_table_pristines.php b/tests/specs/enum/fresh/pgsql/app/migrations_pgsql_db/m200000_000002_create_table_pristines.php
similarity index 89%
rename from tests/specs/enum/fresh/pgsql/app/migrations_pgsql_db/m200000_000000_create_table_pristines.php
rename to tests/specs/enum/fresh/pgsql/app/migrations_pgsql_db/m200000_000002_create_table_pristines.php
index e336e5e2..45b63115 100644
--- a/tests/specs/enum/fresh/pgsql/app/migrations_pgsql_db/m200000_000000_create_table_pristines.php
+++ b/tests/specs/enum/fresh/pgsql/app/migrations_pgsql_db/m200000_000002_create_table_pristines.php
@@ -3,7 +3,7 @@
 /**
  * Table for Pristine
  */
-class m200000_000000_create_table_pristines extends \yii\db\Migration
+class m200000_000002_create_table_pristines extends \yii\db\Migration
 {
     public function safeUp()
     {

From 38682f1377a2dc758e80f3e314e1588847456a35 Mon Sep 17 00:00:00 2001
From: Sohel Ahmed Mesaniya <sam.wankaner@gmail.com>
Date: Thu, 25 Jul 2024 15:31:22 +0530
Subject: [PATCH 57/71] Revert "Fix another failing tests - 3"

This reverts commit 51ebfd70991c56ae51a141979a227742f9e69cee.
---
 ...te_table_c123s.php => m200000_000000_create_table_c123s.php} | 2 +-
 ...te_table_b123s.php => m200000_000001_create_table_b123s.php} | 2 +-
 ...te_table_a123s.php => m200000_000002_create_table_a123s.php} | 2 +-
 ...le_accounts.php => m200000_000003_create_table_accounts.php} | 2 +-
 ...te_table_d123s.php => m200000_000004_create_table_d123s.php} | 2 +-
 ...able_domains.php => m200000_000005_create_table_domains.php} | 2 +-
 ...te_table_e123s.php => m200000_000006_create_table_e123s.php} | 2 +-
 ...le_routings.php => m200000_000007_create_table_routings.php} | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)
 rename tests/specs/relations_in_faker/app/migrations_pgsql_db/{m200000_000003_create_table_c123s.php => m200000_000000_create_table_c123s.php} (83%)
 rename tests/specs/relations_in_faker/app/migrations_pgsql_db/{m200000_000004_create_table_b123s.php => m200000_000001_create_table_b123s.php} (89%)
 rename tests/specs/relations_in_faker/app/migrations_pgsql_db/{m200000_000005_create_table_a123s.php => m200000_000002_create_table_a123s.php} (89%)
 rename tests/specs/relations_in_faker/app/migrations_pgsql_db/{m200000_000000_create_table_accounts.php => m200000_000003_create_table_accounts.php} (83%)
 rename tests/specs/relations_in_faker/app/migrations_pgsql_db/{m200000_000002_create_table_d123s.php => m200000_000004_create_table_d123s.php} (83%)
 rename tests/specs/relations_in_faker/app/migrations_pgsql_db/{m200000_000001_create_table_domains.php => m200000_000005_create_table_domains.php} (90%)
 rename tests/specs/relations_in_faker/app/migrations_pgsql_db/{m200000_000007_create_table_e123s.php => m200000_000006_create_table_e123s.php} (89%)
 rename tests/specs/relations_in_faker/app/migrations_pgsql_db/{m200000_000006_create_table_routings.php => m200000_000007_create_table_routings.php} (95%)

diff --git a/tests/specs/relations_in_faker/app/migrations_pgsql_db/m200000_000003_create_table_c123s.php b/tests/specs/relations_in_faker/app/migrations_pgsql_db/m200000_000000_create_table_c123s.php
similarity index 83%
rename from tests/specs/relations_in_faker/app/migrations_pgsql_db/m200000_000003_create_table_c123s.php
rename to tests/specs/relations_in_faker/app/migrations_pgsql_db/m200000_000000_create_table_c123s.php
index f2dcc3ff..0c9c1c80 100644
--- a/tests/specs/relations_in_faker/app/migrations_pgsql_db/m200000_000003_create_table_c123s.php
+++ b/tests/specs/relations_in_faker/app/migrations_pgsql_db/m200000_000000_create_table_c123s.php
@@ -3,7 +3,7 @@
 /**
  * Table for C123
  */
-class m200000_000003_create_table_c123s extends \yii\db\Migration
+class m200000_000000_create_table_c123s extends \yii\db\Migration
 {
     public function safeUp()
     {
diff --git a/tests/specs/relations_in_faker/app/migrations_pgsql_db/m200000_000004_create_table_b123s.php b/tests/specs/relations_in_faker/app/migrations_pgsql_db/m200000_000001_create_table_b123s.php
similarity index 89%
rename from tests/specs/relations_in_faker/app/migrations_pgsql_db/m200000_000004_create_table_b123s.php
rename to tests/specs/relations_in_faker/app/migrations_pgsql_db/m200000_000001_create_table_b123s.php
index 0d719651..908bd998 100644
--- a/tests/specs/relations_in_faker/app/migrations_pgsql_db/m200000_000004_create_table_b123s.php
+++ b/tests/specs/relations_in_faker/app/migrations_pgsql_db/m200000_000001_create_table_b123s.php
@@ -3,7 +3,7 @@
 /**
  * Table for B123
  */
-class m200000_000004_create_table_b123s extends \yii\db\Migration
+class m200000_000001_create_table_b123s extends \yii\db\Migration
 {
     public function safeUp()
     {
diff --git a/tests/specs/relations_in_faker/app/migrations_pgsql_db/m200000_000005_create_table_a123s.php b/tests/specs/relations_in_faker/app/migrations_pgsql_db/m200000_000002_create_table_a123s.php
similarity index 89%
rename from tests/specs/relations_in_faker/app/migrations_pgsql_db/m200000_000005_create_table_a123s.php
rename to tests/specs/relations_in_faker/app/migrations_pgsql_db/m200000_000002_create_table_a123s.php
index 8a9b4737..73c70ae2 100644
--- a/tests/specs/relations_in_faker/app/migrations_pgsql_db/m200000_000005_create_table_a123s.php
+++ b/tests/specs/relations_in_faker/app/migrations_pgsql_db/m200000_000002_create_table_a123s.php
@@ -3,7 +3,7 @@
 /**
  * Table for A123
  */
-class m200000_000005_create_table_a123s extends \yii\db\Migration
+class m200000_000002_create_table_a123s extends \yii\db\Migration
 {
     public function safeUp()
     {
diff --git a/tests/specs/relations_in_faker/app/migrations_pgsql_db/m200000_000000_create_table_accounts.php b/tests/specs/relations_in_faker/app/migrations_pgsql_db/m200000_000003_create_table_accounts.php
similarity index 83%
rename from tests/specs/relations_in_faker/app/migrations_pgsql_db/m200000_000000_create_table_accounts.php
rename to tests/specs/relations_in_faker/app/migrations_pgsql_db/m200000_000003_create_table_accounts.php
index ef607707..8eba95b2 100644
--- a/tests/specs/relations_in_faker/app/migrations_pgsql_db/m200000_000000_create_table_accounts.php
+++ b/tests/specs/relations_in_faker/app/migrations_pgsql_db/m200000_000003_create_table_accounts.php
@@ -3,7 +3,7 @@
 /**
  * Table for Account
  */
-class m200000_000000_create_table_accounts extends \yii\db\Migration
+class m200000_000003_create_table_accounts extends \yii\db\Migration
 {
     public function safeUp()
     {
diff --git a/tests/specs/relations_in_faker/app/migrations_pgsql_db/m200000_000002_create_table_d123s.php b/tests/specs/relations_in_faker/app/migrations_pgsql_db/m200000_000004_create_table_d123s.php
similarity index 83%
rename from tests/specs/relations_in_faker/app/migrations_pgsql_db/m200000_000002_create_table_d123s.php
rename to tests/specs/relations_in_faker/app/migrations_pgsql_db/m200000_000004_create_table_d123s.php
index 5deaa47d..794186a8 100644
--- a/tests/specs/relations_in_faker/app/migrations_pgsql_db/m200000_000002_create_table_d123s.php
+++ b/tests/specs/relations_in_faker/app/migrations_pgsql_db/m200000_000004_create_table_d123s.php
@@ -3,7 +3,7 @@
 /**
  * Table for D123
  */
-class m200000_000002_create_table_d123s extends \yii\db\Migration
+class m200000_000004_create_table_d123s extends \yii\db\Migration
 {
     public function safeUp()
     {
diff --git a/tests/specs/relations_in_faker/app/migrations_pgsql_db/m200000_000001_create_table_domains.php b/tests/specs/relations_in_faker/app/migrations_pgsql_db/m200000_000005_create_table_domains.php
similarity index 90%
rename from tests/specs/relations_in_faker/app/migrations_pgsql_db/m200000_000001_create_table_domains.php
rename to tests/specs/relations_in_faker/app/migrations_pgsql_db/m200000_000005_create_table_domains.php
index 5c2336fe..c830fe7e 100644
--- a/tests/specs/relations_in_faker/app/migrations_pgsql_db/m200000_000001_create_table_domains.php
+++ b/tests/specs/relations_in_faker/app/migrations_pgsql_db/m200000_000005_create_table_domains.php
@@ -3,7 +3,7 @@
 /**
  * Table for Domain
  */
-class m200000_000001_create_table_domains extends \yii\db\Migration
+class m200000_000005_create_table_domains extends \yii\db\Migration
 {
     public function safeUp()
     {
diff --git a/tests/specs/relations_in_faker/app/migrations_pgsql_db/m200000_000007_create_table_e123s.php b/tests/specs/relations_in_faker/app/migrations_pgsql_db/m200000_000006_create_table_e123s.php
similarity index 89%
rename from tests/specs/relations_in_faker/app/migrations_pgsql_db/m200000_000007_create_table_e123s.php
rename to tests/specs/relations_in_faker/app/migrations_pgsql_db/m200000_000006_create_table_e123s.php
index bce7944e..f8d58a41 100644
--- a/tests/specs/relations_in_faker/app/migrations_pgsql_db/m200000_000007_create_table_e123s.php
+++ b/tests/specs/relations_in_faker/app/migrations_pgsql_db/m200000_000006_create_table_e123s.php
@@ -3,7 +3,7 @@
 /**
  * Table for E123
  */
-class m200000_000007_create_table_e123s extends \yii\db\Migration
+class m200000_000006_create_table_e123s extends \yii\db\Migration
 {
     public function safeUp()
     {
diff --git a/tests/specs/relations_in_faker/app/migrations_pgsql_db/m200000_000006_create_table_routings.php b/tests/specs/relations_in_faker/app/migrations_pgsql_db/m200000_000007_create_table_routings.php
similarity index 95%
rename from tests/specs/relations_in_faker/app/migrations_pgsql_db/m200000_000006_create_table_routings.php
rename to tests/specs/relations_in_faker/app/migrations_pgsql_db/m200000_000007_create_table_routings.php
index 5fd62f40..98ac2ad9 100644
--- a/tests/specs/relations_in_faker/app/migrations_pgsql_db/m200000_000006_create_table_routings.php
+++ b/tests/specs/relations_in_faker/app/migrations_pgsql_db/m200000_000007_create_table_routings.php
@@ -3,7 +3,7 @@
 /**
  * Table for Routing
  */
-class m200000_000006_create_table_routings extends \yii\db\Migration
+class m200000_000007_create_table_routings extends \yii\db\Migration
 {
     public function safeUp()
     {

From e19fffbcef49575ab77e6abb966e62ca0f7dcd52 Mon Sep 17 00:00:00 2001
From: Sohel Ahmed Mesaniya <sam.wankaner@gmail.com>
Date: Thu, 25 Jul 2024 15:31:44 +0530
Subject: [PATCH 58/71] Revert "Fix another failing tests - 2"

This reverts commit 7d7dba7adf6c3b767b530a266126dc0b62425fe5.
---
 ...types.php => m200000_000000_create_table_alldbdatatypes.php} | 2 +-
 ...tcolumns.php => m200000_000001_create_table_editcolumns.php} | 2 +-
 ..._pristines.php => m200000_000003_create_table_pristines.php} | 2 +-
 ...types.php => m200000_000000_create_table_alldbdatatypes.php} | 2 +-
 ...tcolumns.php => m200000_000001_create_table_editcolumns.php} | 2 +-
 ..._pristines.php => m200000_000003_create_table_pristines.php} | 2 +-
 ...types.php => m200000_000000_create_table_alldbdatatypes.php} | 2 +-
 ...tcolumns.php => m200000_000001_create_table_editcolumns.php} | 2 +-
 ..._pristines.php => m200000_000003_create_table_pristines.php} | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)
 rename tests/specs/x_db_type/fresh/maria/app/migrations_maria_db/{m200000_000001_create_table_alldbdatatypes.php => m200000_000000_create_table_alldbdatatypes.php} (97%)
 rename tests/specs/x_db_type/fresh/maria/app/migrations_maria_db/{m200000_000003_create_table_editcolumns.php => m200000_000001_create_table_editcolumns.php} (93%)
 rename tests/specs/x_db_type/fresh/maria/app/migrations_maria_db/{m200000_000000_create_table_pristines.php => m200000_000003_create_table_pristines.php} (93%)
 rename tests/specs/x_db_type/fresh/mysql/app/migrations_mysql_db/{m200000_000001_create_table_alldbdatatypes.php => m200000_000000_create_table_alldbdatatypes.php} (97%)
 rename tests/specs/x_db_type/fresh/mysql/app/migrations_mysql_db/{m200000_000003_create_table_editcolumns.php => m200000_000001_create_table_editcolumns.php} (93%)
 rename tests/specs/x_db_type/fresh/mysql/app/migrations_mysql_db/{m200000_000000_create_table_pristines.php => m200000_000003_create_table_pristines.php} (93%)
 rename tests/specs/x_db_type/fresh/pgsql/app/migrations_pgsql_db/{m200000_000001_create_table_alldbdatatypes.php => m200000_000000_create_table_alldbdatatypes.php} (98%)
 rename tests/specs/x_db_type/fresh/pgsql/app/migrations_pgsql_db/{m200000_000003_create_table_editcolumns.php => m200000_000001_create_table_editcolumns.php} (94%)
 rename tests/specs/x_db_type/fresh/pgsql/app/migrations_pgsql_db/{m200000_000000_create_table_pristines.php => m200000_000003_create_table_pristines.php} (93%)

diff --git a/tests/specs/x_db_type/fresh/maria/app/migrations_maria_db/m200000_000001_create_table_alldbdatatypes.php b/tests/specs/x_db_type/fresh/maria/app/migrations_maria_db/m200000_000000_create_table_alldbdatatypes.php
similarity index 97%
rename from tests/specs/x_db_type/fresh/maria/app/migrations_maria_db/m200000_000001_create_table_alldbdatatypes.php
rename to tests/specs/x_db_type/fresh/maria/app/migrations_maria_db/m200000_000000_create_table_alldbdatatypes.php
index 350eedaf..9c002bea 100644
--- a/tests/specs/x_db_type/fresh/maria/app/migrations_maria_db/m200000_000001_create_table_alldbdatatypes.php
+++ b/tests/specs/x_db_type/fresh/maria/app/migrations_maria_db/m200000_000000_create_table_alldbdatatypes.php
@@ -3,7 +3,7 @@
 /**
  * Table for Alldbdatatype
  */
-class m200000_000001_create_table_alldbdatatypes extends \yii\db\Migration
+class m200000_000000_create_table_alldbdatatypes extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/x_db_type/fresh/maria/app/migrations_maria_db/m200000_000003_create_table_editcolumns.php b/tests/specs/x_db_type/fresh/maria/app/migrations_maria_db/m200000_000001_create_table_editcolumns.php
similarity index 93%
rename from tests/specs/x_db_type/fresh/maria/app/migrations_maria_db/m200000_000003_create_table_editcolumns.php
rename to tests/specs/x_db_type/fresh/maria/app/migrations_maria_db/m200000_000001_create_table_editcolumns.php
index 1c4a0331..1de3d8d5 100644
--- a/tests/specs/x_db_type/fresh/maria/app/migrations_maria_db/m200000_000003_create_table_editcolumns.php
+++ b/tests/specs/x_db_type/fresh/maria/app/migrations_maria_db/m200000_000001_create_table_editcolumns.php
@@ -3,7 +3,7 @@
 /**
  * Table for Editcolumn
  */
-class m200000_000003_create_table_editcolumns extends \yii\db\Migration
+class m200000_000001_create_table_editcolumns extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/x_db_type/fresh/maria/app/migrations_maria_db/m200000_000000_create_table_pristines.php b/tests/specs/x_db_type/fresh/maria/app/migrations_maria_db/m200000_000003_create_table_pristines.php
similarity index 93%
rename from tests/specs/x_db_type/fresh/maria/app/migrations_maria_db/m200000_000000_create_table_pristines.php
rename to tests/specs/x_db_type/fresh/maria/app/migrations_maria_db/m200000_000003_create_table_pristines.php
index d1594797..1e27d8d6 100644
--- a/tests/specs/x_db_type/fresh/maria/app/migrations_maria_db/m200000_000000_create_table_pristines.php
+++ b/tests/specs/x_db_type/fresh/maria/app/migrations_maria_db/m200000_000003_create_table_pristines.php
@@ -3,7 +3,7 @@
 /**
  * Table for Pristine
  */
-class m200000_000000_create_table_pristines extends \yii\db\Migration
+class m200000_000003_create_table_pristines extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/x_db_type/fresh/mysql/app/migrations_mysql_db/m200000_000001_create_table_alldbdatatypes.php b/tests/specs/x_db_type/fresh/mysql/app/migrations_mysql_db/m200000_000000_create_table_alldbdatatypes.php
similarity index 97%
rename from tests/specs/x_db_type/fresh/mysql/app/migrations_mysql_db/m200000_000001_create_table_alldbdatatypes.php
rename to tests/specs/x_db_type/fresh/mysql/app/migrations_mysql_db/m200000_000000_create_table_alldbdatatypes.php
index 5f3d90d1..2cda660f 100644
--- a/tests/specs/x_db_type/fresh/mysql/app/migrations_mysql_db/m200000_000001_create_table_alldbdatatypes.php
+++ b/tests/specs/x_db_type/fresh/mysql/app/migrations_mysql_db/m200000_000000_create_table_alldbdatatypes.php
@@ -3,7 +3,7 @@
 /**
  * Table for Alldbdatatype
  */
-class m200000_000001_create_table_alldbdatatypes extends \yii\db\Migration
+class m200000_000000_create_table_alldbdatatypes extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/x_db_type/fresh/mysql/app/migrations_mysql_db/m200000_000003_create_table_editcolumns.php b/tests/specs/x_db_type/fresh/mysql/app/migrations_mysql_db/m200000_000001_create_table_editcolumns.php
similarity index 93%
rename from tests/specs/x_db_type/fresh/mysql/app/migrations_mysql_db/m200000_000003_create_table_editcolumns.php
rename to tests/specs/x_db_type/fresh/mysql/app/migrations_mysql_db/m200000_000001_create_table_editcolumns.php
index 81a1592d..8c84e731 100644
--- a/tests/specs/x_db_type/fresh/mysql/app/migrations_mysql_db/m200000_000003_create_table_editcolumns.php
+++ b/tests/specs/x_db_type/fresh/mysql/app/migrations_mysql_db/m200000_000001_create_table_editcolumns.php
@@ -3,7 +3,7 @@
 /**
  * Table for Editcolumn
  */
-class m200000_000003_create_table_editcolumns extends \yii\db\Migration
+class m200000_000001_create_table_editcolumns extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/x_db_type/fresh/mysql/app/migrations_mysql_db/m200000_000000_create_table_pristines.php b/tests/specs/x_db_type/fresh/mysql/app/migrations_mysql_db/m200000_000003_create_table_pristines.php
similarity index 93%
rename from tests/specs/x_db_type/fresh/mysql/app/migrations_mysql_db/m200000_000000_create_table_pristines.php
rename to tests/specs/x_db_type/fresh/mysql/app/migrations_mysql_db/m200000_000003_create_table_pristines.php
index ab96f730..3e9e8e02 100644
--- a/tests/specs/x_db_type/fresh/mysql/app/migrations_mysql_db/m200000_000000_create_table_pristines.php
+++ b/tests/specs/x_db_type/fresh/mysql/app/migrations_mysql_db/m200000_000003_create_table_pristines.php
@@ -3,7 +3,7 @@
 /**
  * Table for Pristine
  */
-class m200000_000000_create_table_pristines extends \yii\db\Migration
+class m200000_000003_create_table_pristines extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/x_db_type/fresh/pgsql/app/migrations_pgsql_db/m200000_000001_create_table_alldbdatatypes.php b/tests/specs/x_db_type/fresh/pgsql/app/migrations_pgsql_db/m200000_000000_create_table_alldbdatatypes.php
similarity index 98%
rename from tests/specs/x_db_type/fresh/pgsql/app/migrations_pgsql_db/m200000_000001_create_table_alldbdatatypes.php
rename to tests/specs/x_db_type/fresh/pgsql/app/migrations_pgsql_db/m200000_000000_create_table_alldbdatatypes.php
index 7f8403d4..e0cac52a 100644
--- a/tests/specs/x_db_type/fresh/pgsql/app/migrations_pgsql_db/m200000_000001_create_table_alldbdatatypes.php
+++ b/tests/specs/x_db_type/fresh/pgsql/app/migrations_pgsql_db/m200000_000000_create_table_alldbdatatypes.php
@@ -3,7 +3,7 @@
 /**
  * Table for Alldbdatatype
  */
-class m200000_000001_create_table_alldbdatatypes extends \yii\db\Migration
+class m200000_000000_create_table_alldbdatatypes extends \yii\db\Migration
 {
     public function safeUp()
     {
diff --git a/tests/specs/x_db_type/fresh/pgsql/app/migrations_pgsql_db/m200000_000003_create_table_editcolumns.php b/tests/specs/x_db_type/fresh/pgsql/app/migrations_pgsql_db/m200000_000001_create_table_editcolumns.php
similarity index 94%
rename from tests/specs/x_db_type/fresh/pgsql/app/migrations_pgsql_db/m200000_000003_create_table_editcolumns.php
rename to tests/specs/x_db_type/fresh/pgsql/app/migrations_pgsql_db/m200000_000001_create_table_editcolumns.php
index 9679a0b8..b8f286b1 100644
--- a/tests/specs/x_db_type/fresh/pgsql/app/migrations_pgsql_db/m200000_000003_create_table_editcolumns.php
+++ b/tests/specs/x_db_type/fresh/pgsql/app/migrations_pgsql_db/m200000_000001_create_table_editcolumns.php
@@ -3,7 +3,7 @@
 /**
  * Table for Editcolumn
  */
-class m200000_000003_create_table_editcolumns extends \yii\db\Migration
+class m200000_000001_create_table_editcolumns extends \yii\db\Migration
 {
     public function safeUp()
     {
diff --git a/tests/specs/x_db_type/fresh/pgsql/app/migrations_pgsql_db/m200000_000000_create_table_pristines.php b/tests/specs/x_db_type/fresh/pgsql/app/migrations_pgsql_db/m200000_000003_create_table_pristines.php
similarity index 93%
rename from tests/specs/x_db_type/fresh/pgsql/app/migrations_pgsql_db/m200000_000000_create_table_pristines.php
rename to tests/specs/x_db_type/fresh/pgsql/app/migrations_pgsql_db/m200000_000003_create_table_pristines.php
index 93b55396..aab6bb88 100644
--- a/tests/specs/x_db_type/fresh/pgsql/app/migrations_pgsql_db/m200000_000000_create_table_pristines.php
+++ b/tests/specs/x_db_type/fresh/pgsql/app/migrations_pgsql_db/m200000_000003_create_table_pristines.php
@@ -3,7 +3,7 @@
 /**
  * Table for Pristine
  */
-class m200000_000000_create_table_pristines extends \yii\db\Migration
+class m200000_000003_create_table_pristines extends \yii\db\Migration
 {
     public function safeUp()
     {

From 60df77f06068fc79d0a2ba427bb0890273265e82 Mon Sep 17 00:00:00 2001
From: Sohel Ahmed Mesaniya <sam.wankaner@gmail.com>
Date: Thu, 25 Jul 2024 15:32:04 +0530
Subject: [PATCH 59/71] Revert "Fix another failing tests"

This reverts commit fbb2e8c02ac196464644ad06d2f8e4b4f4caaf66.
---
 ...types.php => m200000_000000_create_table_alldbdatatypes.php} | 2 +-
 ...tcolumns.php => m200000_000001_create_table_editcolumns.php} | 2 +-
 ..._pristines.php => m200000_000003_create_table_pristines.php} | 2 +-
 ...types.php => m200000_000000_create_table_alldbdatatypes.php} | 2 +-
 ...tcolumns.php => m200000_000001_create_table_editcolumns.php} | 2 +-
 ..._pristines.php => m200000_000003_create_table_pristines.php} | 2 +-
 ...types.php => m200000_000000_create_table_alldbdatatypes.php} | 2 +-
 ...tcolumns.php => m200000_000001_create_table_editcolumns.php} | 2 +-
 ..._pristines.php => m200000_000003_create_table_pristines.php} | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)
 rename tests/specs/x_db_type/new_column/maria/app/migrations_maria_db/{m200000_000001_create_table_alldbdatatypes.php => m200000_000000_create_table_alldbdatatypes.php} (97%)
 rename tests/specs/x_db_type/new_column/maria/app/migrations_maria_db/{m200000_000003_create_table_editcolumns.php => m200000_000001_create_table_editcolumns.php} (93%)
 rename tests/specs/x_db_type/new_column/maria/app/migrations_maria_db/{m200000_000000_create_table_pristines.php => m200000_000003_create_table_pristines.php} (93%)
 rename tests/specs/x_db_type/new_column/mysql/app/migrations_mysql_db/{m200000_000001_create_table_alldbdatatypes.php => m200000_000000_create_table_alldbdatatypes.php} (97%)
 rename tests/specs/x_db_type/new_column/mysql/app/migrations_mysql_db/{m200000_000003_create_table_editcolumns.php => m200000_000001_create_table_editcolumns.php} (93%)
 rename tests/specs/x_db_type/new_column/mysql/app/migrations_mysql_db/{m200000_000000_create_table_pristines.php => m200000_000003_create_table_pristines.php} (93%)
 rename tests/specs/x_db_type/new_column/pgsql/app/migrations_pgsql_db/{m200000_000001_create_table_alldbdatatypes.php => m200000_000000_create_table_alldbdatatypes.php} (98%)
 rename tests/specs/x_db_type/new_column/pgsql/app/migrations_pgsql_db/{m200000_000003_create_table_editcolumns.php => m200000_000001_create_table_editcolumns.php} (94%)
 rename tests/specs/x_db_type/new_column/pgsql/app/migrations_pgsql_db/{m200000_000000_create_table_pristines.php => m200000_000003_create_table_pristines.php} (93%)

diff --git a/tests/specs/x_db_type/new_column/maria/app/migrations_maria_db/m200000_000001_create_table_alldbdatatypes.php b/tests/specs/x_db_type/new_column/maria/app/migrations_maria_db/m200000_000000_create_table_alldbdatatypes.php
similarity index 97%
rename from tests/specs/x_db_type/new_column/maria/app/migrations_maria_db/m200000_000001_create_table_alldbdatatypes.php
rename to tests/specs/x_db_type/new_column/maria/app/migrations_maria_db/m200000_000000_create_table_alldbdatatypes.php
index 350eedaf..9c002bea 100644
--- a/tests/specs/x_db_type/new_column/maria/app/migrations_maria_db/m200000_000001_create_table_alldbdatatypes.php
+++ b/tests/specs/x_db_type/new_column/maria/app/migrations_maria_db/m200000_000000_create_table_alldbdatatypes.php
@@ -3,7 +3,7 @@
 /**
  * Table for Alldbdatatype
  */
-class m200000_000001_create_table_alldbdatatypes extends \yii\db\Migration
+class m200000_000000_create_table_alldbdatatypes extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/x_db_type/new_column/maria/app/migrations_maria_db/m200000_000003_create_table_editcolumns.php b/tests/specs/x_db_type/new_column/maria/app/migrations_maria_db/m200000_000001_create_table_editcolumns.php
similarity index 93%
rename from tests/specs/x_db_type/new_column/maria/app/migrations_maria_db/m200000_000003_create_table_editcolumns.php
rename to tests/specs/x_db_type/new_column/maria/app/migrations_maria_db/m200000_000001_create_table_editcolumns.php
index 1c4a0331..1de3d8d5 100644
--- a/tests/specs/x_db_type/new_column/maria/app/migrations_maria_db/m200000_000003_create_table_editcolumns.php
+++ b/tests/specs/x_db_type/new_column/maria/app/migrations_maria_db/m200000_000001_create_table_editcolumns.php
@@ -3,7 +3,7 @@
 /**
  * Table for Editcolumn
  */
-class m200000_000003_create_table_editcolumns extends \yii\db\Migration
+class m200000_000001_create_table_editcolumns extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/x_db_type/new_column/maria/app/migrations_maria_db/m200000_000000_create_table_pristines.php b/tests/specs/x_db_type/new_column/maria/app/migrations_maria_db/m200000_000003_create_table_pristines.php
similarity index 93%
rename from tests/specs/x_db_type/new_column/maria/app/migrations_maria_db/m200000_000000_create_table_pristines.php
rename to tests/specs/x_db_type/new_column/maria/app/migrations_maria_db/m200000_000003_create_table_pristines.php
index d1594797..1e27d8d6 100644
--- a/tests/specs/x_db_type/new_column/maria/app/migrations_maria_db/m200000_000000_create_table_pristines.php
+++ b/tests/specs/x_db_type/new_column/maria/app/migrations_maria_db/m200000_000003_create_table_pristines.php
@@ -3,7 +3,7 @@
 /**
  * Table for Pristine
  */
-class m200000_000000_create_table_pristines extends \yii\db\Migration
+class m200000_000003_create_table_pristines extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/x_db_type/new_column/mysql/app/migrations_mysql_db/m200000_000001_create_table_alldbdatatypes.php b/tests/specs/x_db_type/new_column/mysql/app/migrations_mysql_db/m200000_000000_create_table_alldbdatatypes.php
similarity index 97%
rename from tests/specs/x_db_type/new_column/mysql/app/migrations_mysql_db/m200000_000001_create_table_alldbdatatypes.php
rename to tests/specs/x_db_type/new_column/mysql/app/migrations_mysql_db/m200000_000000_create_table_alldbdatatypes.php
index 5f3d90d1..2cda660f 100644
--- a/tests/specs/x_db_type/new_column/mysql/app/migrations_mysql_db/m200000_000001_create_table_alldbdatatypes.php
+++ b/tests/specs/x_db_type/new_column/mysql/app/migrations_mysql_db/m200000_000000_create_table_alldbdatatypes.php
@@ -3,7 +3,7 @@
 /**
  * Table for Alldbdatatype
  */
-class m200000_000001_create_table_alldbdatatypes extends \yii\db\Migration
+class m200000_000000_create_table_alldbdatatypes extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/x_db_type/new_column/mysql/app/migrations_mysql_db/m200000_000003_create_table_editcolumns.php b/tests/specs/x_db_type/new_column/mysql/app/migrations_mysql_db/m200000_000001_create_table_editcolumns.php
similarity index 93%
rename from tests/specs/x_db_type/new_column/mysql/app/migrations_mysql_db/m200000_000003_create_table_editcolumns.php
rename to tests/specs/x_db_type/new_column/mysql/app/migrations_mysql_db/m200000_000001_create_table_editcolumns.php
index 81a1592d..8c84e731 100644
--- a/tests/specs/x_db_type/new_column/mysql/app/migrations_mysql_db/m200000_000003_create_table_editcolumns.php
+++ b/tests/specs/x_db_type/new_column/mysql/app/migrations_mysql_db/m200000_000001_create_table_editcolumns.php
@@ -3,7 +3,7 @@
 /**
  * Table for Editcolumn
  */
-class m200000_000003_create_table_editcolumns extends \yii\db\Migration
+class m200000_000001_create_table_editcolumns extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/x_db_type/new_column/mysql/app/migrations_mysql_db/m200000_000000_create_table_pristines.php b/tests/specs/x_db_type/new_column/mysql/app/migrations_mysql_db/m200000_000003_create_table_pristines.php
similarity index 93%
rename from tests/specs/x_db_type/new_column/mysql/app/migrations_mysql_db/m200000_000000_create_table_pristines.php
rename to tests/specs/x_db_type/new_column/mysql/app/migrations_mysql_db/m200000_000003_create_table_pristines.php
index ab96f730..3e9e8e02 100644
--- a/tests/specs/x_db_type/new_column/mysql/app/migrations_mysql_db/m200000_000000_create_table_pristines.php
+++ b/tests/specs/x_db_type/new_column/mysql/app/migrations_mysql_db/m200000_000003_create_table_pristines.php
@@ -3,7 +3,7 @@
 /**
  * Table for Pristine
  */
-class m200000_000000_create_table_pristines extends \yii\db\Migration
+class m200000_000003_create_table_pristines extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/x_db_type/new_column/pgsql/app/migrations_pgsql_db/m200000_000001_create_table_alldbdatatypes.php b/tests/specs/x_db_type/new_column/pgsql/app/migrations_pgsql_db/m200000_000000_create_table_alldbdatatypes.php
similarity index 98%
rename from tests/specs/x_db_type/new_column/pgsql/app/migrations_pgsql_db/m200000_000001_create_table_alldbdatatypes.php
rename to tests/specs/x_db_type/new_column/pgsql/app/migrations_pgsql_db/m200000_000000_create_table_alldbdatatypes.php
index 7f8403d4..e0cac52a 100644
--- a/tests/specs/x_db_type/new_column/pgsql/app/migrations_pgsql_db/m200000_000001_create_table_alldbdatatypes.php
+++ b/tests/specs/x_db_type/new_column/pgsql/app/migrations_pgsql_db/m200000_000000_create_table_alldbdatatypes.php
@@ -3,7 +3,7 @@
 /**
  * Table for Alldbdatatype
  */
-class m200000_000001_create_table_alldbdatatypes extends \yii\db\Migration
+class m200000_000000_create_table_alldbdatatypes extends \yii\db\Migration
 {
     public function safeUp()
     {
diff --git a/tests/specs/x_db_type/new_column/pgsql/app/migrations_pgsql_db/m200000_000003_create_table_editcolumns.php b/tests/specs/x_db_type/new_column/pgsql/app/migrations_pgsql_db/m200000_000001_create_table_editcolumns.php
similarity index 94%
rename from tests/specs/x_db_type/new_column/pgsql/app/migrations_pgsql_db/m200000_000003_create_table_editcolumns.php
rename to tests/specs/x_db_type/new_column/pgsql/app/migrations_pgsql_db/m200000_000001_create_table_editcolumns.php
index 9679a0b8..b8f286b1 100644
--- a/tests/specs/x_db_type/new_column/pgsql/app/migrations_pgsql_db/m200000_000003_create_table_editcolumns.php
+++ b/tests/specs/x_db_type/new_column/pgsql/app/migrations_pgsql_db/m200000_000001_create_table_editcolumns.php
@@ -3,7 +3,7 @@
 /**
  * Table for Editcolumn
  */
-class m200000_000003_create_table_editcolumns extends \yii\db\Migration
+class m200000_000001_create_table_editcolumns extends \yii\db\Migration
 {
     public function safeUp()
     {
diff --git a/tests/specs/x_db_type/new_column/pgsql/app/migrations_pgsql_db/m200000_000000_create_table_pristines.php b/tests/specs/x_db_type/new_column/pgsql/app/migrations_pgsql_db/m200000_000003_create_table_pristines.php
similarity index 93%
rename from tests/specs/x_db_type/new_column/pgsql/app/migrations_pgsql_db/m200000_000000_create_table_pristines.php
rename to tests/specs/x_db_type/new_column/pgsql/app/migrations_pgsql_db/m200000_000003_create_table_pristines.php
index 93b55396..aab6bb88 100644
--- a/tests/specs/x_db_type/new_column/pgsql/app/migrations_pgsql_db/m200000_000000_create_table_pristines.php
+++ b/tests/specs/x_db_type/new_column/pgsql/app/migrations_pgsql_db/m200000_000003_create_table_pristines.php
@@ -3,7 +3,7 @@
 /**
  * Table for Pristine
  */
-class m200000_000000_create_table_pristines extends \yii\db\Migration
+class m200000_000003_create_table_pristines extends \yii\db\Migration
 {
     public function safeUp()
     {

From 8b1876fe732085ad5dfd45c8c7b9512d6e9ef1f8 Mon Sep 17 00:00:00 2001
From: Sohel Ahmed Mesaniya <sam.wankaner@gmail.com>
Date: Thu, 25 Jul 2024 15:36:20 +0530
Subject: [PATCH 60/71] Revert "Fix issue of migration ordering in drop + fix
 failing tests"

This reverts commit 7cf9aa3ce0c10e867403531b248f6ba1b65ed173.
---
 ...types.php => m200000_000000_create_table_alldbdatatypes.php} | 2 +-
 ...tcolumns.php => m200000_000001_change_table_editcolumns.php} | 2 +-
 ..._pristines.php => m200000_000003_create_table_pristines.php} | 2 +-
 ...types.php => m200000_000000_create_table_alldbdatatypes.php} | 2 +-
 ...tcolumns.php => m200000_000001_change_table_editcolumns.php} | 2 +-
 ..._pristines.php => m200000_000003_create_table_pristines.php} | 2 +-
 ...types.php => m200000_000000_create_table_alldbdatatypes.php} | 2 +-
 ...tcolumns.php => m200000_000001_change_table_editcolumns.php} | 2 +-
 ..._pristines.php => m200000_000003_create_table_pristines.php} | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)
 rename tests/specs/x_db_type/edit_column/maria/app/migrations_maria_db/{m200000_000001_create_table_alldbdatatypes.php => m200000_000000_create_table_alldbdatatypes.php} (97%)
 rename tests/specs/x_db_type/edit_column/maria/app/migrations_maria_db/{m200000_000003_change_table_editcolumns.php => m200000_000001_change_table_editcolumns.php} (97%)
 rename tests/specs/x_db_type/edit_column/maria/app/migrations_maria_db/{m200000_000000_create_table_pristines.php => m200000_000003_create_table_pristines.php} (93%)
 rename tests/specs/x_db_type/edit_column/mysql/app/migrations_mysql_db/{m200000_000001_create_table_alldbdatatypes.php => m200000_000000_create_table_alldbdatatypes.php} (97%)
 rename tests/specs/x_db_type/edit_column/mysql/app/migrations_mysql_db/{m200000_000003_change_table_editcolumns.php => m200000_000001_change_table_editcolumns.php} (97%)
 rename tests/specs/x_db_type/edit_column/mysql/app/migrations_mysql_db/{m200000_000000_create_table_pristines.php => m200000_000003_create_table_pristines.php} (93%)
 rename tests/specs/x_db_type/edit_column/pgsql/app/migrations_pgsql_db/{m200000_000001_create_table_alldbdatatypes.php => m200000_000000_create_table_alldbdatatypes.php} (98%)
 rename tests/specs/x_db_type/edit_column/pgsql/app/migrations_pgsql_db/{m200000_000003_change_table_editcolumns.php => m200000_000001_change_table_editcolumns.php} (98%)
 rename tests/specs/x_db_type/edit_column/pgsql/app/migrations_pgsql_db/{m200000_000000_create_table_pristines.php => m200000_000003_create_table_pristines.php} (93%)

diff --git a/tests/specs/x_db_type/edit_column/maria/app/migrations_maria_db/m200000_000001_create_table_alldbdatatypes.php b/tests/specs/x_db_type/edit_column/maria/app/migrations_maria_db/m200000_000000_create_table_alldbdatatypes.php
similarity index 97%
rename from tests/specs/x_db_type/edit_column/maria/app/migrations_maria_db/m200000_000001_create_table_alldbdatatypes.php
rename to tests/specs/x_db_type/edit_column/maria/app/migrations_maria_db/m200000_000000_create_table_alldbdatatypes.php
index 350eedaf..9c002bea 100644
--- a/tests/specs/x_db_type/edit_column/maria/app/migrations_maria_db/m200000_000001_create_table_alldbdatatypes.php
+++ b/tests/specs/x_db_type/edit_column/maria/app/migrations_maria_db/m200000_000000_create_table_alldbdatatypes.php
@@ -3,7 +3,7 @@
 /**
  * Table for Alldbdatatype
  */
-class m200000_000001_create_table_alldbdatatypes extends \yii\db\Migration
+class m200000_000000_create_table_alldbdatatypes extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/x_db_type/edit_column/maria/app/migrations_maria_db/m200000_000003_change_table_editcolumns.php b/tests/specs/x_db_type/edit_column/maria/app/migrations_maria_db/m200000_000001_change_table_editcolumns.php
similarity index 97%
rename from tests/specs/x_db_type/edit_column/maria/app/migrations_maria_db/m200000_000003_change_table_editcolumns.php
rename to tests/specs/x_db_type/edit_column/maria/app/migrations_maria_db/m200000_000001_change_table_editcolumns.php
index 3b9581c0..239c0a9b 100644
--- a/tests/specs/x_db_type/edit_column/maria/app/migrations_maria_db/m200000_000003_change_table_editcolumns.php
+++ b/tests/specs/x_db_type/edit_column/maria/app/migrations_maria_db/m200000_000001_change_table_editcolumns.php
@@ -3,7 +3,7 @@
 /**
  * Table for Editcolumn
  */
-class m200000_000003_change_table_editcolumns extends \yii\db\Migration
+class m200000_000001_change_table_editcolumns extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/x_db_type/edit_column/maria/app/migrations_maria_db/m200000_000000_create_table_pristines.php b/tests/specs/x_db_type/edit_column/maria/app/migrations_maria_db/m200000_000003_create_table_pristines.php
similarity index 93%
rename from tests/specs/x_db_type/edit_column/maria/app/migrations_maria_db/m200000_000000_create_table_pristines.php
rename to tests/specs/x_db_type/edit_column/maria/app/migrations_maria_db/m200000_000003_create_table_pristines.php
index d1594797..1e27d8d6 100644
--- a/tests/specs/x_db_type/edit_column/maria/app/migrations_maria_db/m200000_000000_create_table_pristines.php
+++ b/tests/specs/x_db_type/edit_column/maria/app/migrations_maria_db/m200000_000003_create_table_pristines.php
@@ -3,7 +3,7 @@
 /**
  * Table for Pristine
  */
-class m200000_000000_create_table_pristines extends \yii\db\Migration
+class m200000_000003_create_table_pristines extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/x_db_type/edit_column/mysql/app/migrations_mysql_db/m200000_000001_create_table_alldbdatatypes.php b/tests/specs/x_db_type/edit_column/mysql/app/migrations_mysql_db/m200000_000000_create_table_alldbdatatypes.php
similarity index 97%
rename from tests/specs/x_db_type/edit_column/mysql/app/migrations_mysql_db/m200000_000001_create_table_alldbdatatypes.php
rename to tests/specs/x_db_type/edit_column/mysql/app/migrations_mysql_db/m200000_000000_create_table_alldbdatatypes.php
index 5f3d90d1..2cda660f 100644
--- a/tests/specs/x_db_type/edit_column/mysql/app/migrations_mysql_db/m200000_000001_create_table_alldbdatatypes.php
+++ b/tests/specs/x_db_type/edit_column/mysql/app/migrations_mysql_db/m200000_000000_create_table_alldbdatatypes.php
@@ -3,7 +3,7 @@
 /**
  * Table for Alldbdatatype
  */
-class m200000_000001_create_table_alldbdatatypes extends \yii\db\Migration
+class m200000_000000_create_table_alldbdatatypes extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/x_db_type/edit_column/mysql/app/migrations_mysql_db/m200000_000003_change_table_editcolumns.php b/tests/specs/x_db_type/edit_column/mysql/app/migrations_mysql_db/m200000_000001_change_table_editcolumns.php
similarity index 97%
rename from tests/specs/x_db_type/edit_column/mysql/app/migrations_mysql_db/m200000_000003_change_table_editcolumns.php
rename to tests/specs/x_db_type/edit_column/mysql/app/migrations_mysql_db/m200000_000001_change_table_editcolumns.php
index 02626d1e..b4d63bd3 100644
--- a/tests/specs/x_db_type/edit_column/mysql/app/migrations_mysql_db/m200000_000003_change_table_editcolumns.php
+++ b/tests/specs/x_db_type/edit_column/mysql/app/migrations_mysql_db/m200000_000001_change_table_editcolumns.php
@@ -3,7 +3,7 @@
 /**
  * Table for Editcolumn
  */
-class m200000_000003_change_table_editcolumns extends \yii\db\Migration
+class m200000_000001_change_table_editcolumns extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/x_db_type/edit_column/mysql/app/migrations_mysql_db/m200000_000000_create_table_pristines.php b/tests/specs/x_db_type/edit_column/mysql/app/migrations_mysql_db/m200000_000003_create_table_pristines.php
similarity index 93%
rename from tests/specs/x_db_type/edit_column/mysql/app/migrations_mysql_db/m200000_000000_create_table_pristines.php
rename to tests/specs/x_db_type/edit_column/mysql/app/migrations_mysql_db/m200000_000003_create_table_pristines.php
index ab96f730..3e9e8e02 100644
--- a/tests/specs/x_db_type/edit_column/mysql/app/migrations_mysql_db/m200000_000000_create_table_pristines.php
+++ b/tests/specs/x_db_type/edit_column/mysql/app/migrations_mysql_db/m200000_000003_create_table_pristines.php
@@ -3,7 +3,7 @@
 /**
  * Table for Pristine
  */
-class m200000_000000_create_table_pristines extends \yii\db\Migration
+class m200000_000003_create_table_pristines extends \yii\db\Migration
 {
     public function up()
     {
diff --git a/tests/specs/x_db_type/edit_column/pgsql/app/migrations_pgsql_db/m200000_000001_create_table_alldbdatatypes.php b/tests/specs/x_db_type/edit_column/pgsql/app/migrations_pgsql_db/m200000_000000_create_table_alldbdatatypes.php
similarity index 98%
rename from tests/specs/x_db_type/edit_column/pgsql/app/migrations_pgsql_db/m200000_000001_create_table_alldbdatatypes.php
rename to tests/specs/x_db_type/edit_column/pgsql/app/migrations_pgsql_db/m200000_000000_create_table_alldbdatatypes.php
index 7f8403d4..e0cac52a 100644
--- a/tests/specs/x_db_type/edit_column/pgsql/app/migrations_pgsql_db/m200000_000001_create_table_alldbdatatypes.php
+++ b/tests/specs/x_db_type/edit_column/pgsql/app/migrations_pgsql_db/m200000_000000_create_table_alldbdatatypes.php
@@ -3,7 +3,7 @@
 /**
  * Table for Alldbdatatype
  */
-class m200000_000001_create_table_alldbdatatypes extends \yii\db\Migration
+class m200000_000000_create_table_alldbdatatypes extends \yii\db\Migration
 {
     public function safeUp()
     {
diff --git a/tests/specs/x_db_type/edit_column/pgsql/app/migrations_pgsql_db/m200000_000003_change_table_editcolumns.php b/tests/specs/x_db_type/edit_column/pgsql/app/migrations_pgsql_db/m200000_000001_change_table_editcolumns.php
similarity index 98%
rename from tests/specs/x_db_type/edit_column/pgsql/app/migrations_pgsql_db/m200000_000003_change_table_editcolumns.php
rename to tests/specs/x_db_type/edit_column/pgsql/app/migrations_pgsql_db/m200000_000001_change_table_editcolumns.php
index da02d58f..5ad21a0a 100644
--- a/tests/specs/x_db_type/edit_column/pgsql/app/migrations_pgsql_db/m200000_000003_change_table_editcolumns.php
+++ b/tests/specs/x_db_type/edit_column/pgsql/app/migrations_pgsql_db/m200000_000001_change_table_editcolumns.php
@@ -3,7 +3,7 @@
 /**
  * Table for Editcolumn
  */
-class m200000_000003_change_table_editcolumns extends \yii\db\Migration
+class m200000_000001_change_table_editcolumns extends \yii\db\Migration
 {
     public function safeUp()
     {
diff --git a/tests/specs/x_db_type/edit_column/pgsql/app/migrations_pgsql_db/m200000_000000_create_table_pristines.php b/tests/specs/x_db_type/edit_column/pgsql/app/migrations_pgsql_db/m200000_000003_create_table_pristines.php
similarity index 93%
rename from tests/specs/x_db_type/edit_column/pgsql/app/migrations_pgsql_db/m200000_000000_create_table_pristines.php
rename to tests/specs/x_db_type/edit_column/pgsql/app/migrations_pgsql_db/m200000_000003_create_table_pristines.php
index 93b55396..aab6bb88 100644
--- a/tests/specs/x_db_type/edit_column/pgsql/app/migrations_pgsql_db/m200000_000000_create_table_pristines.php
+++ b/tests/specs/x_db_type/edit_column/pgsql/app/migrations_pgsql_db/m200000_000003_create_table_pristines.php
@@ -3,7 +3,7 @@
 /**
  * Table for Pristine
  */
-class m200000_000000_create_table_pristines extends \yii\db\Migration
+class m200000_000003_create_table_pristines extends \yii\db\Migration
 {
     public function safeUp()
     {

From 1c86e8ec93d89cd0c0ff75013c1d0134faea1043 Mon Sep 17 00:00:00 2001
From: Sohel Ahmed Mesaniya <sam.wankaner@gmail.com>
Date: Thu, 25 Jul 2024 15:47:04 +0530
Subject: [PATCH 61/71] Fix failing tests

---
 .../m200000_000002_delete_table_ubigpks.php   |  6 ---
 .../mysql/models/base/Ubigpk.php              | 22 +--------
 tests/unit/IssueFixTest.php                   | 46 +++++++++----------
 3 files changed, 23 insertions(+), 51 deletions(-)

diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/case_independent_tables_drop_sort/mysql/migrations_mysql_db/m200000_000002_delete_table_ubigpks.php b/tests/specs/issue_fix/132_create_migration_for_drop_table/case_independent_tables_drop_sort/mysql/migrations_mysql_db/m200000_000002_delete_table_ubigpks.php
index 574610ed..b21388c7 100644
--- a/tests/specs/issue_fix/132_create_migration_for_drop_table/case_independent_tables_drop_sort/mysql/migrations_mysql_db/m200000_000002_delete_table_ubigpks.php
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/case_independent_tables_drop_sort/mysql/migrations_mysql_db/m200000_000002_delete_table_ubigpks.php
@@ -15,12 +15,6 @@ public function down()
         $this->createTable('{{%ubigpks}}', [
             'id' => $this->bigPrimaryKey()->unsigned(),
             'name' => $this->string(150)->null()->defaultValue(null),
-            'size' => 'enum("x-small", "small", "medium", "large", "x-large") NOT NULL DEFAULT \'x-small\'',
-            'd' => 'smallint(5) unsigned zerofill NULL DEFAULT NULL',
-            'e' => 'mediumint(8) unsigned zerofill NULL DEFAULT NULL',
-            'f' => 'decimal(12,4) NULL DEFAULT NULL',
-            'dp' => $this->double()->null()->defaultValue(null),
-            'dp2' => 'double(10,4) NULL DEFAULT NULL',
         ]);
     }
 }
diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/case_independent_tables_drop_sort/mysql/models/base/Ubigpk.php b/tests/specs/issue_fix/132_create_migration_for_drop_table/case_independent_tables_drop_sort/mysql/models/base/Ubigpk.php
index 3ffa6a51..5d1a93be 100644
--- a/tests/specs/issue_fix/132_create_migration_for_drop_table/case_independent_tables_drop_sort/mysql/models/base/Ubigpk.php
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/case_independent_tables_drop_sort/mysql/models/base/Ubigpk.php
@@ -7,12 +7,6 @@
  *
  * @property string $id
  * @property string $name
- * @property string $size
- * @property integer $d
- * @property integer $e
- * @property string $f
- * @property double $dp
- * @property double $dp2
  *
  */
 abstract class Ubigpk extends \yii\db\ActiveRecord
@@ -25,22 +19,8 @@ public static function tableName()
     public function rules()
     {
         return [
-            'trim' => [['name', 'f'], 'trim'],
+            'trim' => [['name'], 'trim'],
             'name_string' => [['name'], 'string', 'max' => 150],
-            'size_string' => [['size'], 'string'],
-            'size_in' => [['size'], 'in', 'range' => [
-                'x-small',
-                'small',
-                'medium',
-                'large',
-                'x-large',
-            ]],
-            'size_default' => [['size'], 'default', 'value' => 'x-small'],
-            'd_integer' => [['d'], 'integer'],
-            'e_integer' => [['e'], 'integer'],
-            'f_string' => [['f'], 'string', 'max' => 12],
-            'dp_double' => [['dp'], 'double'],
-            'dp2_double' => [['dp2'], 'double'],
         ];
     }
 }
diff --git a/tests/unit/IssueFixTest.php b/tests/unit/IssueFixTest.php
index 757e26c8..e0971dd0 100644
--- a/tests/unit/IssueFixTest.php
+++ b/tests/unit/IssueFixTest.php
@@ -239,25 +239,38 @@ public function testNullableFalseInRequired()
         $this->checkFiles($actualFiles, $expectedFiles);
     }
 
-    // Create migration for drop table if a entire schema is deleted from OpenAPI spec #132
-    // https://github.com/cebe/yii2-openapi/issues/132
     // https://github.com/php-openapi/yii2-openapi/pull/4#discussion_r1688225258
     public function testCreateMigrationForDropTable132IndependentTablesDropSort()
     {
         $testFile = Yii::getAlias("@specs/issue_fix/132_create_migration_for_drop_table/case_independent_tables_drop_sort/index.php");
-        $this->createTablesForCreateMigrationForDropTable132();
+
+        Yii::$app->db->createCommand()->createTable('{{%upks}}', [
+            'id' => 'upk',
+            'name' => 'string(150)',
+        ])->execute();
+        Yii::$app->db->createCommand()->createTable('{{%bigpks}}', [
+            'id' => 'bigpk',
+            'name' => 'string(150)',
+        ])->execute();
+        Yii::$app->db->createCommand()->createTable('{{%ubigpks}}', [
+            'id' => 'ubigpk',
+            'name' => 'string(150)',
+        ])->execute();
+
         $this->runGenerator($testFile);
         $this->runActualMigrations('mysql', 4);
 
         $actualFiles = FileHelper::findFiles(Yii::getAlias('@app'), [
-           'recursive' => true,
+            'recursive' => true,
         ]);
         $expectedFiles = FileHelper::findFiles(Yii::getAlias("@specs/issue_fix/132_create_migration_for_drop_table/case_independent_tables_drop_sort/mysql"), [
-           'recursive' => true,
+            'recursive' => true,
         ]);
         $this->checkFiles($actualFiles, $expectedFiles);
 
-        $this->deleteTablesForCreateMigrationForDropTable132();
+        Yii::$app->db->createCommand('DROP TABLE IF EXISTS {{%ubigpks}}')->execute();
+        Yii::$app->db->createCommand('DROP TABLE IF EXISTS {{%bigpks}}')->execute();
+        Yii::$app->db->createCommand('DROP TABLE IF EXISTS {{%upks}}')->execute();
     }
 
     // Create migration for drop table if a entire schema is deleted from OpenAPI spec #132
@@ -265,22 +278,9 @@ public function testCreateMigrationForDropTable132IndependentTablesDropSort()
     public function testCreateMigrationForDropTable132()
     {
         $testFile = Yii::getAlias("@specs/issue_fix/132_create_migration_for_drop_table/132_create_migration_for_drop_table.php");
-
-        Yii::$app->db->createCommand()->createTable('{{%upks}}', [
-            'id' => 'upk',
-            'name' => 'string(150)',
-        ])->execute();
-        Yii::$app->db->createCommand()->createTable('{{%bigpks}}', [
-            'id' => 'bigpk',
-            'name' => 'string(150)',
-        ])->execute();
-        Yii::$app->db->createCommand()->createTable('{{%ubigpks}}', [
-            'id' => 'ubigpk',
-            'name' => 'string(150)',
-        ])->execute();
-
+        $this->createTablesForCreateMigrationForDropTable132();
         $this->runGenerator($testFile);
-        $this->runActualMigrations('mysql', 3);
+        $this->runActualMigrations('mysql', 8);
 
         $actualFiles = FileHelper::findFiles(Yii::getAlias('@app'), [
            'recursive' => true,
@@ -290,9 +290,7 @@ public function testCreateMigrationForDropTable132()
         ]);
         $this->checkFiles($actualFiles, $expectedFiles);
 
-        Yii::$app->db->createCommand('DROP TABLE IF EXISTS {{%bigpks}}')->execute();
-        Yii::$app->db->createCommand('DROP TABLE IF EXISTS {{%bigpks}}')->execute();
-        Yii::$app->db->createCommand('DROP TABLE IF EXISTS {{%bigpks}}')->execute();
+        $this->deleteTablesForCreateMigrationForDropTable132();
     }
 
     private function createTablesForCreateMigrationForDropTable132()

From 25063ca31866aa1cd01c95eea1814c05d9af0656 Mon Sep 17 00:00:00 2001
From: Sohel Ahmed Mesaniya <sam.wankaner@gmail.com>
Date: Wed, 13 Nov 2024 18:21:22 +0530
Subject: [PATCH 62/71] Fix errors and failing tests

---
 composer.json                 | 4 ++--
 src/lib/AttributeResolver.php | 4 ++--
 src/lib/SchemaToDatabase.php  | 1 -
 src/lib/items/Attribute.php   | 2 ++
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/composer.json b/composer.json
index c8994ba8..115ef883 100644
--- a/composer.json
+++ b/composer.json
@@ -23,11 +23,11 @@
 		"yiisoft/yii2": "~2.0.48",
 		"yiisoft/yii2-gii": "~2.0.0 | ~2.1.0 | ~2.2.0| ~2.3.0",
 		"laminas/laminas-code": ">=3.4 <=4.13",
-		"php-openapi/yii2-fractal": "^1.0.0",
+		"php-openapi/yii2-fractal": "^1.4",
 		"fakerphp/faker": "^1.9",
 		"sam-it/yii2-mariadb": "^2.0",
 		"symfony/var-exporter": "^5.4",
-		"symfony/polyfill-php80": "^1.30"
+		"symfony/polyfill-php80": "^1.31"
 	},
 	"require-dev": {
 		"cebe/indent": "*",
diff --git a/src/lib/AttributeResolver.php b/src/lib/AttributeResolver.php
index 3914a1a9..92014c6e 100644
--- a/src/lib/AttributeResolver.php
+++ b/src/lib/AttributeResolver.php
@@ -140,7 +140,7 @@ protected function resolveJunctionTableProperty(PropertySchema $property, bool $
                 ->setPhpType($junkAttribute['phpType'])
                 ->setDbType($junkAttribute['dbType'])
                 ->setForeignKeyColumnName($property->fkColName)
-                ->setTableName($this->schema->resolveTableName($this->schemaName));
+                ->setTableName($this->componentSchema->resolveTableName($this->schemaName));
             $relation = Yii::createObject(AttributeRelation::class, [
                 $property->getName(),
                 $junkAttribute['relatedTableName'],
@@ -229,7 +229,7 @@ protected function resolveProperty(
                   ->setIsPrimary($property->isPrimaryKey())
                   ->setForeignKeyColumnName($property->fkColName)
                   ->setFakerStub($this->guessFakerStub($attribute, $property))
-                  ->setTableName($this->schema->resolveTableName($this->schemaName));
+                  ->setTableName($this->componentSchema->resolveTableName($this->schemaName));
         if ($property->isReference()) {
             if ($property->isVirtual()) {
                 throw new InvalidDefinitionException('References not supported for virtual attributes');
diff --git a/src/lib/SchemaToDatabase.php b/src/lib/SchemaToDatabase.php
index 6d8284ed..221a8cec 100644
--- a/src/lib/SchemaToDatabase.php
+++ b/src/lib/SchemaToDatabase.php
@@ -13,7 +13,6 @@
 use cebe\yii2openapi\generator\ApiGenerator;
 use cebe\yii2openapi\lib\exceptions\InvalidDefinitionException;
 use cebe\yii2openapi\lib\items\Attribute;
-use cebe\yii2openapi\lib\exceptions\InvalidDefinitionException;
 use cebe\yii2openapi\lib\items\AttributeRelation;
 use cebe\yii2openapi\lib\items\DbModel;
 use cebe\yii2openapi\lib\items\JunctionSchemas;
diff --git a/src/lib/items/Attribute.php b/src/lib/items/Attribute.php
index 0a841f60..8b0306c9 100644
--- a/src/lib/items/Attribute.php
+++ b/src/lib/items/Attribute.php
@@ -8,9 +8,11 @@
 namespace cebe\yii2openapi\lib\items;
 
 use cebe\yii2openapi\db\ColumnSchema;
+use cebe\yii2openapi\generator\ApiGenerator;
 use cebe\yii2openapi\lib\exceptions\InvalidDefinitionException;
 use cebe\yii2openapi\lib\helpers\FormatHelper;
 use cebe\yii2openapi\lib\openapi\PropertySchema;
+use Yii;
 use yii\base\BaseObject;
 use yii\base\InvalidConfigException;
 use yii\base\NotSupportedException;

From 353f61eabc45662c1017e746bfd9969bf3626f95 Mon Sep 17 00:00:00 2001
From: Sohel Ahmed Mesaniya <sam.wankaner@gmail.com>
Date: Wed, 13 Nov 2024 19:18:17 +0530
Subject: [PATCH 63/71] Fix failing test:
 IssueFixTest::testCreateMigrationForDropTable132

---
 .../mysql/models/base/Animal.php              |  6 +++++-
 .../mysql/models/base/Bigpk.php               |  6 +++++-
 .../mysql/models/base/Foo.php                 |  4 ++++
 .../mysql/models/base/Fruit.php               |  6 +++++-
 .../mysql/models/base/Mango.php               |  6 +++++-
 .../mysql/models/base/Pristine.php            |  6 +++++-
 .../mysql/models/base/Ubigpk.php              |  6 +++++-
 .../mysql/models/base/Upk.php                 |  6 +++++-
 tests/unit/IssueFixTest.php                   | 20 ++++++++++++++++---
 9 files changed, 56 insertions(+), 10 deletions(-)

diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/base/Animal.php b/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/base/Animal.php
index 607ec9ae..1e131508 100644
--- a/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/base/Animal.php
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/base/Animal.php
@@ -1,9 +1,13 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\models\base;
 
 /**
- *
+ * This is the model class for table "the_animal_table_name".
  *
  * @property integer $id
  * @property string $name
diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/base/Bigpk.php b/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/base/Bigpk.php
index 2bf05933..3c96ce51 100644
--- a/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/base/Bigpk.php
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/base/Bigpk.php
@@ -1,9 +1,13 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\models\base;
 
 /**
- *
+ * This is the model class for table "bigpks".
  *
  * @property integer $id
  * @property string $name
diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/base/Foo.php b/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/base/Foo.php
index 49c10419..73f0bfba 100644
--- a/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/base/Foo.php
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/base/Foo.php
@@ -1,5 +1,9 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\models\base;
 
 /**
diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/base/Fruit.php b/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/base/Fruit.php
index 274eacd5..4e52a2c6 100644
--- a/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/base/Fruit.php
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/base/Fruit.php
@@ -1,9 +1,13 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\models\base;
 
 /**
- *
+ * This is the model class for table "fruits".
  *
  * @property integer $id
  * @property string $name
diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/base/Mango.php b/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/base/Mango.php
index cf8d111f..14637e36 100644
--- a/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/base/Mango.php
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/base/Mango.php
@@ -1,9 +1,13 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\models\base;
 
 /**
- *
+ * This is the model class for table "the_mango_table_name".
  *
  * @property integer $id
  * @property string $name
diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/base/Pristine.php b/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/base/Pristine.php
index c8021ca6..4d6bee59 100644
--- a/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/base/Pristine.php
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/base/Pristine.php
@@ -1,9 +1,13 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\models\base;
 
 /**
- *
+ * This is the model class for table "pristines".
  *
  * @property integer $id
  * @property string $name
diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/base/Ubigpk.php b/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/base/Ubigpk.php
index 3ffa6a51..5f8cbf5f 100644
--- a/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/base/Ubigpk.php
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/base/Ubigpk.php
@@ -1,9 +1,13 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\models\base;
 
 /**
- *
+ * This is the model class for table "ubigpks".
  *
  * @property string $id
  * @property string $name
diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/base/Upk.php b/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/base/Upk.php
index 644bc0d1..a8be1725 100644
--- a/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/base/Upk.php
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/mysql/models/base/Upk.php
@@ -1,9 +1,13 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\models\base;
 
 /**
- *
+ * This is the model class for table "upks".
  *
  * @property integer $id
  * @property string $name
diff --git a/tests/unit/IssueFixTest.php b/tests/unit/IssueFixTest.php
index db187a90..ea84ae69 100644
--- a/tests/unit/IssueFixTest.php
+++ b/tests/unit/IssueFixTest.php
@@ -278,6 +278,7 @@ public function testCreateMigrationForDropTable132IndependentTablesDropSort()
     public function testCreateMigrationForDropTable132()
     {
         $testFile = Yii::getAlias("@specs/issue_fix/132_create_migration_for_drop_table/132_create_migration_for_drop_table.php");
+        $this->deleteTablesForCreateMigrationForDropTable132();
         $this->createTablesForCreateMigrationForDropTable132();
         $this->runGenerator($testFile);
         $this->runActualMigrations('mysql', 8);
@@ -343,16 +344,29 @@ private function createTablesForCreateMigrationForDropTable132()
 
     private function deleteTablesForCreateMigrationForDropTable132()
     {
-        Yii::$app->db->createCommand()->dropForeignKey('name', '{{%pristines}}')->execute();
+        $tableSchema = Yii::$app->db->schema->getTableSchema('{{%pristines}}');
+        if ($tableSchema && array_key_exists('name', $tableSchema->foreignKeys)) {
+            Yii::$app->db->createCommand()->dropForeignKey('name', '{{%pristines}}')->execute();
+        }
+
         Yii::$app->db->createCommand('DROP TABLE IF EXISTS {{%pristines}}')->execute();
-        Yii::$app->db->createCommand()->dropForeignKey('name2', '{{%fruits}}')->execute();
+
+        $tableSchema = Yii::$app->db->schema->getTableSchema('{{%fruits}}');
+        if ($tableSchema && array_key_exists('name2', $tableSchema->foreignKeys)) {
+            Yii::$app->db->createCommand()->dropForeignKey('name2', '{{%fruits}}')->execute();
+        }
+
         Yii::$app->db->createCommand('DROP TABLE IF EXISTS {{%fruits}}')->execute();
 
         Yii::$app->db->createCommand('DROP TABLE IF EXISTS {{%upks}}')->execute();
         Yii::$app->db->createCommand('DROP TABLE IF EXISTS {{%bigpks}}')->execute();
         Yii::$app->db->createCommand('DROP TABLE IF EXISTS {{%ubigpks}}')->execute();
 
-        Yii::$app->db->createCommand()->dropForeignKey('animal_fruit_fk', '{{%the_mango_table_name}}')->execute();
+        $tableSchema = Yii::$app->db->schema->getTableSchema('{{%the_mango_table_name}}');
+        if ($tableSchema && array_key_exists('animal_fruit_fk', $tableSchema->foreignKeys)) {
+            Yii::$app->db->createCommand()->dropForeignKey('animal_fruit_fk', '{{%the_mango_table_name}}')->execute();
+        }
+
         Yii::$app->db->createCommand('DROP TABLE IF EXISTS {{%the_mango_table_name}}')->execute();
         Yii::$app->db->createCommand('DROP TABLE IF EXISTS {{%the_animal_table_name}}')->execute();
     }

From 4faa9372a1e585777020735a8b4474ea23f395d1 Mon Sep 17 00:00:00 2001
From: Sohel Ahmed Mesaniya <sam.wankaner@gmail.com>
Date: Wed, 13 Nov 2024 19:22:48 +0530
Subject: [PATCH 64/71] Refactor test

---
 tests/DbTestCase.php        |  8 ++++++++
 tests/unit/IssueFixTest.php | 18 +++---------------
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/tests/DbTestCase.php b/tests/DbTestCase.php
index f36137e2..3c02fa95 100644
--- a/tests/DbTestCase.php
+++ b/tests/DbTestCase.php
@@ -184,4 +184,12 @@ protected function runDownMigrations(string $db = 'mysql', int $number = 2): voi
         $this->assertSame($downExitCode, 0);
         $this->assertSame($downOutput[$lastThird], $number.' '.(($number === 1) ? 'migration was' : 'migrations were').' reverted.');
     }
+
+    protected function dropFkIfExists(string $table, string $fk): void
+    {
+        $tableSchema = Yii::$app->db->schema->getTableSchema($table);
+        if ($tableSchema && array_key_exists($fk, $tableSchema->foreignKeys)) {
+            Yii::$app->db->createCommand()->dropForeignKey($fk, $table)->execute();
+        }
+    }
 }
diff --git a/tests/unit/IssueFixTest.php b/tests/unit/IssueFixTest.php
index ea84ae69..f2a4f87f 100644
--- a/tests/unit/IssueFixTest.php
+++ b/tests/unit/IssueFixTest.php
@@ -344,29 +344,17 @@ private function createTablesForCreateMigrationForDropTable132()
 
     private function deleteTablesForCreateMigrationForDropTable132()
     {
-        $tableSchema = Yii::$app->db->schema->getTableSchema('{{%pristines}}');
-        if ($tableSchema && array_key_exists('name', $tableSchema->foreignKeys)) {
-            Yii::$app->db->createCommand()->dropForeignKey('name', '{{%pristines}}')->execute();
-        }
-
+        $this->dropFkIfExists('{{%pristines}}', 'name');
         Yii::$app->db->createCommand('DROP TABLE IF EXISTS {{%pristines}}')->execute();
 
-        $tableSchema = Yii::$app->db->schema->getTableSchema('{{%fruits}}');
-        if ($tableSchema && array_key_exists('name2', $tableSchema->foreignKeys)) {
-            Yii::$app->db->createCommand()->dropForeignKey('name2', '{{%fruits}}')->execute();
-        }
-
+        $this->dropFkIfExists('{{%fruits}}', 'name2');
         Yii::$app->db->createCommand('DROP TABLE IF EXISTS {{%fruits}}')->execute();
 
         Yii::$app->db->createCommand('DROP TABLE IF EXISTS {{%upks}}')->execute();
         Yii::$app->db->createCommand('DROP TABLE IF EXISTS {{%bigpks}}')->execute();
         Yii::$app->db->createCommand('DROP TABLE IF EXISTS {{%ubigpks}}')->execute();
 
-        $tableSchema = Yii::$app->db->schema->getTableSchema('{{%the_mango_table_name}}');
-        if ($tableSchema && array_key_exists('animal_fruit_fk', $tableSchema->foreignKeys)) {
-            Yii::$app->db->createCommand()->dropForeignKey('animal_fruit_fk', '{{%the_mango_table_name}}')->execute();
-        }
-
+        $this->dropFkIfExists('{{%the_mango_table_name}}', 'animal_fruit_fk');
         Yii::$app->db->createCommand('DROP TABLE IF EXISTS {{%the_mango_table_name}}')->execute();
         Yii::$app->db->createCommand('DROP TABLE IF EXISTS {{%the_animal_table_name}}')->execute();
     }

From c47deb82e26844b9089222909f54e0f66cd22f75 Mon Sep 17 00:00:00 2001
From: Sohel Ahmed Mesaniya <sam.wankaner@gmail.com>
Date: Wed, 13 Nov 2024 19:28:51 +0530
Subject: [PATCH 65/71] Fix failing test:
 IssueFixTest::testCreateMigrationForDropTable132ForPgsql

---
 .../pgsql/models/base/Animal.php                     |  6 +++++-
 .../pgsql/models/base/Bigpk.php                      |  6 +++++-
 .../pgsql/models/base/Foo.php                        |  4 ++++
 .../pgsql/models/base/Fruit.php                      |  6 +++++-
 .../pgsql/models/base/Mango.php                      |  6 +++++-
 .../pgsql/models/base/Pristine.php                   |  6 +++++-
 .../pgsql/models/base/Ubigpk.php                     |  6 +++++-
 .../pgsql/models/base/Upk.php                        |  6 +++++-
 tests/unit/IssueFixTest.php                          | 12 +++++++-----
 9 files changed, 46 insertions(+), 12 deletions(-)

diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/models/base/Animal.php b/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/models/base/Animal.php
index 607ec9ae..1e131508 100644
--- a/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/models/base/Animal.php
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/models/base/Animal.php
@@ -1,9 +1,13 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\models\base;
 
 /**
- *
+ * This is the model class for table "the_animal_table_name".
  *
  * @property integer $id
  * @property string $name
diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/models/base/Bigpk.php b/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/models/base/Bigpk.php
index 2bf05933..3c96ce51 100644
--- a/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/models/base/Bigpk.php
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/models/base/Bigpk.php
@@ -1,9 +1,13 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\models\base;
 
 /**
- *
+ * This is the model class for table "bigpks".
  *
  * @property integer $id
  * @property string $name
diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/models/base/Foo.php b/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/models/base/Foo.php
index 49c10419..73f0bfba 100644
--- a/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/models/base/Foo.php
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/models/base/Foo.php
@@ -1,5 +1,9 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\models\base;
 
 /**
diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/models/base/Fruit.php b/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/models/base/Fruit.php
index 274eacd5..4e52a2c6 100644
--- a/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/models/base/Fruit.php
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/models/base/Fruit.php
@@ -1,9 +1,13 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\models\base;
 
 /**
- *
+ * This is the model class for table "fruits".
  *
  * @property integer $id
  * @property string $name
diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/models/base/Mango.php b/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/models/base/Mango.php
index cf8d111f..14637e36 100644
--- a/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/models/base/Mango.php
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/models/base/Mango.php
@@ -1,9 +1,13 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\models\base;
 
 /**
- *
+ * This is the model class for table "the_mango_table_name".
  *
  * @property integer $id
  * @property string $name
diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/models/base/Pristine.php b/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/models/base/Pristine.php
index c8021ca6..4d6bee59 100644
--- a/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/models/base/Pristine.php
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/models/base/Pristine.php
@@ -1,9 +1,13 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\models\base;
 
 /**
- *
+ * This is the model class for table "pristines".
  *
  * @property integer $id
  * @property string $name
diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/models/base/Ubigpk.php b/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/models/base/Ubigpk.php
index 8ea477cd..40750069 100644
--- a/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/models/base/Ubigpk.php
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/models/base/Ubigpk.php
@@ -1,9 +1,13 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\models\base;
 
 /**
- *
+ * This is the model class for table "ubigpks".
  *
  * @property integer $id
  * @property string $name
diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/models/base/Upk.php b/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/models/base/Upk.php
index 91e7cc76..fb18da8f 100644
--- a/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/models/base/Upk.php
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/pgsql/models/base/Upk.php
@@ -1,9 +1,13 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\models\base;
 
 /**
- *
+ * This is the model class for table "upks".
  *
  * @property integer $id
  * @property string $name
diff --git a/tests/unit/IssueFixTest.php b/tests/unit/IssueFixTest.php
index f2a4f87f..9009f32e 100644
--- a/tests/unit/IssueFixTest.php
+++ b/tests/unit/IssueFixTest.php
@@ -366,6 +366,7 @@ public function testCreateMigrationForDropTable132ForPgsql()
    {
        $this->changeDbToPgsql();
        $testFile = Yii::getAlias("@specs/issue_fix/132_create_migration_for_drop_table/132_create_migration_for_drop_table.php");
+       $this->deleteTablesForCreateMigrationForDropTable132ForPgsql();
        $this->createTablesForCreateMigrationForDropTable132ForPgsql();
        $this->runGenerator($testFile, 'pgsql');
        $this->runActualMigrations('pgsql', 8);
@@ -435,18 +436,19 @@ private function createTablesForCreateMigrationForDropTable132ForPgsql()
 
     private function deleteTablesForCreateMigrationForDropTable132ForPgsql()
     {
-        Yii::$app->db->createCommand()->dropForeignKey('name', '{{%pristines}}')->execute();
+        $this->dropFkIfExists('{{%pristines}}', 'name');
         Yii::$app->db->createCommand('DROP TABLE IF EXISTS {{%pristines}}')->execute();
-        Yii::$app->db->createCommand()->dropForeignKey('name2', '{{%fruits}}')->execute();
+
+        $this->dropFkIfExists('{{%fruits}}', 'name2');
         Yii::$app->db->createCommand('DROP TABLE IF EXISTS {{%fruits}}')->execute();
 
         Yii::$app->db->createCommand('DROP TABLE IF EXISTS {{%upks}}')->execute();
-        Yii::$app->db->createCommand('DROP TYPE mood')->execute();
-        Yii::$app->db->createCommand('DROP TYPE enum_itt_upks_e2')->execute();
+        Yii::$app->db->createCommand('DROP TYPE IF EXISTS mood')->execute();
+        Yii::$app->db->createCommand('DROP TYPE IF EXISTS enum_itt_upks_e2')->execute();
         Yii::$app->db->createCommand('DROP TABLE IF EXISTS {{%bigpks}}')->execute();
         Yii::$app->db->createCommand('DROP TABLE IF EXISTS {{%ubigpks}}')->execute();
 
-        Yii::$app->db->createCommand()->dropForeignKey('animal_fruit_fk', '{{%the_mango_table_name}}')->execute();
+        $this->dropFkIfExists('{{%the_mango_table_name}}', 'animal_fruit_fk');
         Yii::$app->db->createCommand('DROP TABLE IF EXISTS {{%the_mango_table_name}}')->execute();
         Yii::$app->db->createCommand('DROP TABLE IF EXISTS {{%the_animal_table_name}}')->execute();
     }

From 3715ff28beb31707689822b2a96e138c55f74316 Mon Sep 17 00:00:00 2001
From: Sohel Ahmed Mesaniya <sam.wankaner@gmail.com>
Date: Wed, 13 Nov 2024 19:34:19 +0530
Subject: [PATCH 66/71] Fix failing test:
 testCreateMigrationForDropTable132IndependentTablesDropSort

---
 .../mysql/models/base/Bigpk.php                        |  6 +++++-
 .../mysql/models/base/Foo.php                          |  4 ++++
 .../mysql/models/base/Ubigpk.php                       |  6 +++++-
 .../mysql/models/base/Upk.php                          |  6 +++++-
 tests/unit/IssueFixTest.php                            | 10 +++++++---
 5 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/case_independent_tables_drop_sort/mysql/models/base/Bigpk.php b/tests/specs/issue_fix/132_create_migration_for_drop_table/case_independent_tables_drop_sort/mysql/models/base/Bigpk.php
index 2bf05933..3c96ce51 100644
--- a/tests/specs/issue_fix/132_create_migration_for_drop_table/case_independent_tables_drop_sort/mysql/models/base/Bigpk.php
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/case_independent_tables_drop_sort/mysql/models/base/Bigpk.php
@@ -1,9 +1,13 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\models\base;
 
 /**
- *
+ * This is the model class for table "bigpks".
  *
  * @property integer $id
  * @property string $name
diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/case_independent_tables_drop_sort/mysql/models/base/Foo.php b/tests/specs/issue_fix/132_create_migration_for_drop_table/case_independent_tables_drop_sort/mysql/models/base/Foo.php
index 49c10419..73f0bfba 100644
--- a/tests/specs/issue_fix/132_create_migration_for_drop_table/case_independent_tables_drop_sort/mysql/models/base/Foo.php
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/case_independent_tables_drop_sort/mysql/models/base/Foo.php
@@ -1,5 +1,9 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\models\base;
 
 /**
diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/case_independent_tables_drop_sort/mysql/models/base/Ubigpk.php b/tests/specs/issue_fix/132_create_migration_for_drop_table/case_independent_tables_drop_sort/mysql/models/base/Ubigpk.php
index 5d1a93be..c3520fd4 100644
--- a/tests/specs/issue_fix/132_create_migration_for_drop_table/case_independent_tables_drop_sort/mysql/models/base/Ubigpk.php
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/case_independent_tables_drop_sort/mysql/models/base/Ubigpk.php
@@ -1,9 +1,13 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\models\base;
 
 /**
- *
+ * This is the model class for table "ubigpks".
  *
  * @property string $id
  * @property string $name
diff --git a/tests/specs/issue_fix/132_create_migration_for_drop_table/case_independent_tables_drop_sort/mysql/models/base/Upk.php b/tests/specs/issue_fix/132_create_migration_for_drop_table/case_independent_tables_drop_sort/mysql/models/base/Upk.php
index 644bc0d1..a8be1725 100644
--- a/tests/specs/issue_fix/132_create_migration_for_drop_table/case_independent_tables_drop_sort/mysql/models/base/Upk.php
+++ b/tests/specs/issue_fix/132_create_migration_for_drop_table/case_independent_tables_drop_sort/mysql/models/base/Upk.php
@@ -1,9 +1,13 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\models\base;
 
 /**
- *
+ * This is the model class for table "upks".
  *
  * @property integer $id
  * @property string $name
diff --git a/tests/unit/IssueFixTest.php b/tests/unit/IssueFixTest.php
index 9009f32e..a2409053 100644
--- a/tests/unit/IssueFixTest.php
+++ b/tests/unit/IssueFixTest.php
@@ -243,7 +243,13 @@ public function testNullableFalseInRequired()
     public function testCreateMigrationForDropTable132IndependentTablesDropSort()
     {
         $testFile = Yii::getAlias("@specs/issue_fix/132_create_migration_for_drop_table/case_independent_tables_drop_sort/index.php");
+        $dropTables = function () {
+            Yii::$app->db->createCommand('DROP TABLE IF EXISTS {{%ubigpks}}')->execute();
+            Yii::$app->db->createCommand('DROP TABLE IF EXISTS {{%bigpks}}')->execute();
+            Yii::$app->db->createCommand('DROP TABLE IF EXISTS {{%upks}}')->execute();
+        };
 
+        $dropTables();
         Yii::$app->db->createCommand()->createTable('{{%upks}}', [
             'id' => 'upk',
             'name' => 'string(150)',
@@ -268,9 +274,7 @@ public function testCreateMigrationForDropTable132IndependentTablesDropSort()
         ]);
         $this->checkFiles($actualFiles, $expectedFiles);
 
-        Yii::$app->db->createCommand('DROP TABLE IF EXISTS {{%ubigpks}}')->execute();
-        Yii::$app->db->createCommand('DROP TABLE IF EXISTS {{%bigpks}}')->execute();
-        Yii::$app->db->createCommand('DROP TABLE IF EXISTS {{%upks}}')->execute();
+        $dropTables();
     }
 
     // Create migration for drop table if a entire schema is deleted from OpenAPI spec #132

From 165ea0c7077617325c0d60f7a2393cbf9506f827 Mon Sep 17 00:00:00 2001
From: Sohel Ahmed Mesaniya <sam.wankaner@gmail.com>
Date: Wed, 13 Nov 2024 20:17:46 +0530
Subject: [PATCH 67/71] Fix more tests

---
 .../mysql/models/base/Fruit.php               |  6 +-
 .../mysql/models/base/Pet.php                 | 10 +++-
 .../mysql/models/base/User.php                |  6 +-
 .../mysql/models/base/Post.php                |  6 +-
 .../mysql/models/base/User.php                | 11 +++-
 .../mysql/models/base/User.php                |  6 +-
 .../mysql/models/base/Animal.php              |  5 ++
 .../mysql/models/base/Fruit.php               |  5 ++
 .../mysql/models/base/Invoice.php             | 22 ++++++--
 .../mysql/models/base/User.php                | 10 ++++
 tests/unit/IssueFixTest.php                   | 56 +++++++++----------
 11 files changed, 101 insertions(+), 42 deletions(-)

diff --git a/tests/specs/issue_fix/20_consider_openapi_spec_examples_in_faker_code_generation/mysql/models/base/Fruit.php b/tests/specs/issue_fix/20_consider_openapi_spec_examples_in_faker_code_generation/mysql/models/base/Fruit.php
index 2106e69d..ccdbe894 100644
--- a/tests/specs/issue_fix/20_consider_openapi_spec_examples_in_faker_code_generation/mysql/models/base/Fruit.php
+++ b/tests/specs/issue_fix/20_consider_openapi_spec_examples_in_faker_code_generation/mysql/models/base/Fruit.php
@@ -1,9 +1,13 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\models\base;
 
 /**
- *
+ * This is the model class for table "fruits".
  *
  * @property int $id
  * @property string $name
diff --git a/tests/specs/issue_fix/20_consider_openapi_spec_examples_in_faker_code_generation/mysql/models/base/Pet.php b/tests/specs/issue_fix/20_consider_openapi_spec_examples_in_faker_code_generation/mysql/models/base/Pet.php
index 73f57ea7..c0621fd6 100644
--- a/tests/specs/issue_fix/20_consider_openapi_spec_examples_in_faker_code_generation/mysql/models/base/Pet.php
+++ b/tests/specs/issue_fix/20_consider_openapi_spec_examples_in_faker_code_generation/mysql/models/base/Pet.php
@@ -1,9 +1,13 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\models\base;
 
 /**
- *
+ * This is the model class for table "pets".
  *
  * @property int $id
  * @property string $name
@@ -47,11 +51,11 @@ public function rules()
 
     public function getUserRefObjArrNormal()
     {
-        return $this->hasMany(\app\models\User::class, ['pet_id' => 'id']);
+        return $this->hasMany(\app\models\User::class, ['pet_id' => 'id'])->inverseOf('pet');
     }
 
     public function getUserRefObjArr()
     {
-        return $this->hasMany(\app\models\User::class, ['pet_id' => 'id']);
+        return $this->hasMany(\app\models\User::class, ['pet_id' => 'id'])->inverseOf('pet');
     }
 }
diff --git a/tests/specs/issue_fix/20_consider_openapi_spec_examples_in_faker_code_generation/mysql/models/base/User.php b/tests/specs/issue_fix/20_consider_openapi_spec_examples_in_faker_code_generation/mysql/models/base/User.php
index 08e59880..bce4e105 100644
--- a/tests/specs/issue_fix/20_consider_openapi_spec_examples_in_faker_code_generation/mysql/models/base/User.php
+++ b/tests/specs/issue_fix/20_consider_openapi_spec_examples_in_faker_code_generation/mysql/models/base/User.php
@@ -1,9 +1,13 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\models\base;
 
 /**
- *
+ * This is the model class for table "users".
  *
  * @property int $id
  * @property string $name
diff --git a/tests/specs/issue_fix/29_extension_fk_column_name_cause_error_in_case_of_column_name_without_underscore/mysql/models/base/Post.php b/tests/specs/issue_fix/29_extension_fk_column_name_cause_error_in_case_of_column_name_without_underscore/mysql/models/base/Post.php
index c8ba9f96..3cc065c0 100644
--- a/tests/specs/issue_fix/29_extension_fk_column_name_cause_error_in_case_of_column_name_without_underscore/mysql/models/base/Post.php
+++ b/tests/specs/issue_fix/29_extension_fk_column_name_cause_error_in_case_of_column_name_without_underscore/mysql/models/base/Post.php
@@ -1,9 +1,13 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\models\base;
 
 /**
- *
+ * This is the model class for table "posts".
  *
  * @property int $id
  * @property string $content
diff --git a/tests/specs/issue_fix/29_extension_fk_column_name_cause_error_in_case_of_column_name_without_underscore/mysql/models/base/User.php b/tests/specs/issue_fix/29_extension_fk_column_name_cause_error_in_case_of_column_name_without_underscore/mysql/models/base/User.php
index 08e59880..390d8bdb 100644
--- a/tests/specs/issue_fix/29_extension_fk_column_name_cause_error_in_case_of_column_name_without_underscore/mysql/models/base/User.php
+++ b/tests/specs/issue_fix/29_extension_fk_column_name_cause_error_in_case_of_column_name_without_underscore/mysql/models/base/User.php
@@ -1,9 +1,13 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\models\base;
 
 /**
- *
+ * This is the model class for table "users".
  *
  * @property int $id
  * @property string $name
@@ -23,4 +27,9 @@ public function rules()
             'name_string' => [['name'], 'string'],
         ];
     }
+
+    public function getPost()
+    {
+        return $this->hasOne(\app\models\Post::class, ['user' => 'id'])->inverseOf('user');
+    }
 }
diff --git a/tests/specs/issue_fix/30_add_validation_rules_by_attribute_name_or_pattern/mysql/models/base/User.php b/tests/specs/issue_fix/30_add_validation_rules_by_attribute_name_or_pattern/mysql/models/base/User.php
index 87027cf9..eed2ea63 100644
--- a/tests/specs/issue_fix/30_add_validation_rules_by_attribute_name_or_pattern/mysql/models/base/User.php
+++ b/tests/specs/issue_fix/30_add_validation_rules_by_attribute_name_or_pattern/mysql/models/base/User.php
@@ -1,9 +1,13 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\models\base;
 
 /**
- *
+ * This is the model class for table "users".
  *
  * @property int $id
  * @property string $name name
diff --git a/tests/specs/issue_fix/52_bug_dependenton_allof_with_x_faker_false/mysql/models/base/Animal.php b/tests/specs/issue_fix/52_bug_dependenton_allof_with_x_faker_false/mysql/models/base/Animal.php
index a99b34da..81e157ac 100644
--- a/tests/specs/issue_fix/52_bug_dependenton_allof_with_x_faker_false/mysql/models/base/Animal.php
+++ b/tests/specs/issue_fix/52_bug_dependenton_allof_with_x_faker_false/mysql/models/base/Animal.php
@@ -27,4 +27,9 @@ public function rules()
             'name_string' => [['name'], 'string'],
         ];
     }
+
+    public function getInvoice()
+    {
+        return $this->hasOne(\app\models\Invoice::class, ['animal_id' => 'id'])->inverseOf('animal');
+    }
 }
diff --git a/tests/specs/issue_fix/52_bug_dependenton_allof_with_x_faker_false/mysql/models/base/Fruit.php b/tests/specs/issue_fix/52_bug_dependenton_allof_with_x_faker_false/mysql/models/base/Fruit.php
index ccdbe894..d56f106c 100644
--- a/tests/specs/issue_fix/52_bug_dependenton_allof_with_x_faker_false/mysql/models/base/Fruit.php
+++ b/tests/specs/issue_fix/52_bug_dependenton_allof_with_x_faker_false/mysql/models/base/Fruit.php
@@ -27,4 +27,9 @@ public function rules()
             'name_string' => [['name'], 'string'],
         ];
     }
+
+    public function getInvoice()
+    {
+        return $this->hasOne(\app\models\Invoice::class, ['fruit_id' => 'id'])->inverseOf('fruit');
+    }
 }
diff --git a/tests/specs/issue_fix/52_bug_dependenton_allof_with_x_faker_false/mysql/models/base/Invoice.php b/tests/specs/issue_fix/52_bug_dependenton_allof_with_x_faker_false/mysql/models/base/Invoice.php
index 1495d16b..73190e01 100644
--- a/tests/specs/issue_fix/52_bug_dependenton_allof_with_x_faker_false/mysql/models/base/Invoice.php
+++ b/tests/specs/issue_fix/52_bug_dependenton_allof_with_x_faker_false/mysql/models/base/Invoice.php
@@ -35,17 +35,17 @@ public function rules()
     {
         return [
             'reference_invoice_id_integer' => [['reference_invoice_id'], 'integer'],
-            'reference_invoice_id_exist' => [['reference_invoice_id'], 'exist', 'targetRelation' => 'ReferenceInvoice'],
+            'reference_invoice_id_exist' => [['reference_invoice_id'], 'exist', 'targetRelation' => 'referenceInvoice'],
             'reference_invoice_2_id_integer' => [['reference_invoice_2_id'], 'integer'],
-            'reference_invoice_2_id_exist' => [['reference_invoice_2_id'], 'exist', 'targetRelation' => 'ReferenceInvoice2'],
+            'reference_invoice_2_id_exist' => [['reference_invoice_2_id'], 'exist', 'targetRelation' => 'referenceInvoice2'],
             'user_id_integer' => [['user_id'], 'integer'],
-            'user_id_exist' => [['user_id'], 'exist', 'targetRelation' => 'User'],
+            'user_id_exist' => [['user_id'], 'exist', 'targetRelation' => 'user'],
             'user_2_id_integer' => [['user_2_id'], 'integer'],
-            'user_2_id_exist' => [['user_2_id'], 'exist', 'targetRelation' => 'User2'],
+            'user_2_id_exist' => [['user_2_id'], 'exist', 'targetRelation' => 'user2'],
             'fruit_id_integer' => [['fruit_id'], 'integer'],
-            'fruit_id_exist' => [['fruit_id'], 'exist', 'targetRelation' => 'Fruit'],
+            'fruit_id_exist' => [['fruit_id'], 'exist', 'targetRelation' => 'fruit'],
             'animal_id_integer' => [['animal_id'], 'integer'],
-            'animal_id_exist' => [['animal_id'], 'exist', 'targetRelation' => 'Animal'],
+            'animal_id_exist' => [['animal_id'], 'exist', 'targetRelation' => 'animal'],
         ];
     }
 
@@ -78,4 +78,14 @@ public function getAnimal()
     {
         return $this->hasOne(\app\models\Animal::class, ['id' => 'animal_id']);
     }
+
+    public function getInvoice()
+    {
+        return $this->hasOne(\app\models\Invoice::class, ['reference_invoice_id' => 'id'])->inverseOf('reference_invoice');
+    }
+
+    public function getInvoice2()
+    {
+        return $this->hasOne(\app\models\Invoice::class, ['reference_invoice_2_id' => 'id'])->inverseOf('reference_invoice_2');
+    }
 }
diff --git a/tests/specs/issue_fix/52_bug_dependenton_allof_with_x_faker_false/mysql/models/base/User.php b/tests/specs/issue_fix/52_bug_dependenton_allof_with_x_faker_false/mysql/models/base/User.php
index bce4e105..a6ce6e79 100644
--- a/tests/specs/issue_fix/52_bug_dependenton_allof_with_x_faker_false/mysql/models/base/User.php
+++ b/tests/specs/issue_fix/52_bug_dependenton_allof_with_x_faker_false/mysql/models/base/User.php
@@ -27,4 +27,14 @@ public function rules()
             'name_string' => [['name'], 'string'],
         ];
     }
+
+    public function getInvoice()
+    {
+        return $this->hasOne(\app\models\Invoice::class, ['user_id' => 'id'])->inverseOf('user');
+    }
+
+    public function getInvoice2()
+    {
+        return $this->hasOne(\app\models\Invoice::class, ['user_2_id' => 'id'])->inverseOf('user_2');
+    }
 }
diff --git a/tests/unit/IssueFixTest.php b/tests/unit/IssueFixTest.php
index a2409053..9739f3ec 100644
--- a/tests/unit/IssueFixTest.php
+++ b/tests/unit/IssueFixTest.php
@@ -288,10 +288,10 @@ public function testCreateMigrationForDropTable132()
         $this->runActualMigrations('mysql', 8);
 
         $actualFiles = FileHelper::findFiles(Yii::getAlias('@app'), [
-           'recursive' => true,
+            'recursive' => true,
         ]);
         $expectedFiles = FileHelper::findFiles(Yii::getAlias("@specs/issue_fix/132_create_migration_for_drop_table/mysql"), [
-           'recursive' => true,
+            'recursive' => true,
         ]);
         $this->checkFiles($actualFiles, $expectedFiles);
 
@@ -366,25 +366,25 @@ private function deleteTablesForCreateMigrationForDropTable132()
     // Create migration for drop table if a entire schema is deleted from OpenAPI spec #132
     // https://github.com/cebe/yii2-openapi/issues/132
     // For PgSQL
-   public function testCreateMigrationForDropTable132ForPgsql()
-   {
-       $this->changeDbToPgsql();
-       $testFile = Yii::getAlias("@specs/issue_fix/132_create_migration_for_drop_table/132_create_migration_for_drop_table.php");
-       $this->deleteTablesForCreateMigrationForDropTable132ForPgsql();
-       $this->createTablesForCreateMigrationForDropTable132ForPgsql();
-       $this->runGenerator($testFile, 'pgsql');
-       $this->runActualMigrations('pgsql', 8);
-
-       $actualFiles = FileHelper::findFiles(Yii::getAlias('@app'), [
-           'recursive' => true,
-       ]);
-       $expectedFiles = FileHelper::findFiles(Yii::getAlias("@specs/issue_fix/132_create_migration_for_drop_table/pgsql"), [
-           'recursive' => true,
-       ]);
-       $this->checkFiles($actualFiles, $expectedFiles);
-
-       $this->deleteTablesForCreateMigrationForDropTable132ForPgsql();
-   }
+    public function testCreateMigrationForDropTable132ForPgsql()
+    {
+        $this->changeDbToPgsql();
+        $testFile = Yii::getAlias("@specs/issue_fix/132_create_migration_for_drop_table/132_create_migration_for_drop_table.php");
+        $this->deleteTablesForCreateMigrationForDropTable132ForPgsql();
+        $this->createTablesForCreateMigrationForDropTable132ForPgsql();
+        $this->runGenerator($testFile, 'pgsql');
+        $this->runActualMigrations('pgsql', 8);
+
+        $actualFiles = FileHelper::findFiles(Yii::getAlias('@app'), [
+            'recursive' => true,
+        ]);
+        $expectedFiles = FileHelper::findFiles(Yii::getAlias("@specs/issue_fix/132_create_migration_for_drop_table/pgsql"), [
+            'recursive' => true,
+        ]);
+        $this->checkFiles($actualFiles, $expectedFiles);
+
+        $this->deleteTablesForCreateMigrationForDropTable132ForPgsql();
+    }
 
     private function createTablesForCreateMigrationForDropTable132ForPgsql()
     {
@@ -549,13 +549,13 @@ public function test29ExtensionFkColumnNameCauseErrorInCaseOfColumnNameWithoutUn
     {
         $testFile = Yii::getAlias("@specs/issue_fix/29_extension_fk_column_name_cause_error_in_case_of_column_name_without_underscore/index.php");
         $this->runGenerator($testFile);
-         $actualFiles = FileHelper::findFiles(Yii::getAlias('@app'), [
-             'recursive' => true,
-         ]);
-         $expectedFiles = FileHelper::findFiles(Yii::getAlias("@specs/issue_fix/29_extension_fk_column_name_cause_error_in_case_of_column_name_without_underscore/mysql"), [
-             'recursive' => true,
-         ]);
-         $this->checkFiles($actualFiles, $expectedFiles);
+        $actualFiles = FileHelper::findFiles(Yii::getAlias('@app'), [
+            'recursive' => true,
+        ]);
+        $expectedFiles = FileHelper::findFiles(Yii::getAlias("@specs/issue_fix/29_extension_fk_column_name_cause_error_in_case_of_column_name_without_underscore/mysql"), [
+            'recursive' => true,
+        ]);
+        $this->checkFiles($actualFiles, $expectedFiles);
     }
 
     // https://github.com/php-openapi/yii2-openapi/issues/30

From ae229f4ce8d3ab280e9102e5733d5bedf03c09a0 Mon Sep 17 00:00:00 2001
From: Sohel Ahmed Mesaniya <sam.wankaner@gmail.com>
Date: Wed, 13 Nov 2024 20:20:41 +0530
Subject: [PATCH 68/71] Fix more failing tests

---
 .../mysql/models/MenuFaker.php                     |  1 -
 .../mysql/models/base/Account.php                  | 14 +++++++++-----
 .../mysql/models/base/Menu.php                     |  8 ++++++--
 .../mysql/models/base/User.php                     |  6 +++++-
 4 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/tests/specs/issue_fix/25_generate_inverse_relations/mysql/models/MenuFaker.php b/tests/specs/issue_fix/25_generate_inverse_relations/mysql/models/MenuFaker.php
index 76ede6b7..13448252 100644
--- a/tests/specs/issue_fix/25_generate_inverse_relations/mysql/models/MenuFaker.php
+++ b/tests/specs/issue_fix/25_generate_inverse_relations/mysql/models/MenuFaker.php
@@ -44,7 +44,6 @@ public static function dependentOn()
     {
         return [
             // just model class names
-            'Menu',
 
         ];
     }
diff --git a/tests/specs/issue_fix/25_generate_inverse_relations/mysql/models/base/Account.php b/tests/specs/issue_fix/25_generate_inverse_relations/mysql/models/base/Account.php
index d0f43293..d3846586 100644
--- a/tests/specs/issue_fix/25_generate_inverse_relations/mysql/models/base/Account.php
+++ b/tests/specs/issue_fix/25_generate_inverse_relations/mysql/models/base/Account.php
@@ -1,5 +1,9 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\models\base;
 
 /**
@@ -14,7 +18,7 @@
  *
  * @property \app\models\User $user
  * @property \app\models\User $user2
- * @property \app\models\User $user3
+ * @property \app\models\User $user3Rel
  */
 abstract class Account extends \yii\db\ActiveRecord
 {
@@ -29,11 +33,11 @@ public function rules()
             'trim' => [['name', 'paymentMethodName'], 'trim'],
             'required' => [['name'], 'required'],
             'user_id_integer' => [['user_id'], 'integer'],
-            'user_id_exist' => [['user_id'], 'exist', 'targetRelation' => 'User'],
+            'user_id_exist' => [['user_id'], 'exist', 'targetRelation' => 'user'],
             'user2_id_integer' => [['user2_id'], 'integer'],
-            'user2_id_exist' => [['user2_id'], 'exist', 'targetRelation' => 'User2'],
+            'user2_id_exist' => [['user2_id'], 'exist', 'targetRelation' => 'user2'],
             'user3_integer' => [['user3'], 'integer'],
-            'user3_exist' => [['user3'], 'exist', 'targetRelation' => 'User3'],
+            'user3_exist' => [['user3'], 'exist', 'targetRelation' => 'user3Rel'],
             'name_string' => [['name'], 'string', 'max' => 128],
             'paymentMethodName_string' => [['paymentMethodName'], 'string'],
         ];
@@ -49,7 +53,7 @@ public function getUser2()
         return $this->hasOne(\app\models\User::class, ['id' => 'user2_id']);
     }
 
-    public function getUser3()
+    public function getUser3Rel()
     {
         return $this->hasOne(\app\models\User::class, ['id' => 'user3']);
     }
diff --git a/tests/specs/issue_fix/25_generate_inverse_relations/mysql/models/base/Menu.php b/tests/specs/issue_fix/25_generate_inverse_relations/mysql/models/base/Menu.php
index ec3d0957..7f2eb9aa 100644
--- a/tests/specs/issue_fix/25_generate_inverse_relations/mysql/models/base/Menu.php
+++ b/tests/specs/issue_fix/25_generate_inverse_relations/mysql/models/base/Menu.php
@@ -1,9 +1,13 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\models\base;
 
 /**
- *
+ * This is the model class for table "menus".
  *
  * @property int $id
  * @property string $name
@@ -25,7 +29,7 @@ public function rules()
             'trim' => [['name'], 'trim'],
             'required' => [['name'], 'required'],
             'parent_id_integer' => [['parent_id'], 'integer'],
-            'parent_id_exist' => [['parent_id'], 'exist', 'targetRelation' => 'Parent'],
+            'parent_id_exist' => [['parent_id'], 'exist', 'targetRelation' => 'parent'],
             'name_string' => [['name'], 'string', 'min' => 3, 'max' => 100],
         ];
     }
diff --git a/tests/specs/issue_fix/25_generate_inverse_relations/mysql/models/base/User.php b/tests/specs/issue_fix/25_generate_inverse_relations/mysql/models/base/User.php
index 5f70ce96..7e26bb25 100644
--- a/tests/specs/issue_fix/25_generate_inverse_relations/mysql/models/base/User.php
+++ b/tests/specs/issue_fix/25_generate_inverse_relations/mysql/models/base/User.php
@@ -1,9 +1,13 @@
 <?php
 
+/**
+ * This file is generated by Gii, do not change manually!
+ */
+
 namespace app\models\base;
 
 /**
- *
+ * This is the model class for table "users".
  *
  * @property int $id
  * @property string $name

From 6100d21fb9edf4c74ab2e6ebedacad77aed6eec3 Mon Sep 17 00:00:00 2001
From: Sohel Ahmed Mesaniya <sam.wankaner@gmail.com>
Date: Wed, 13 Nov 2024 20:27:28 +0530
Subject: [PATCH 69/71] Refactor

---
 src/lib/SchemaToDatabase.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lib/SchemaToDatabase.php b/src/lib/SchemaToDatabase.php
index 221a8cec..ccb230a3 100644
--- a/src/lib/SchemaToDatabase.php
+++ b/src/lib/SchemaToDatabase.php
@@ -289,14 +289,14 @@ public static function dbModelsForDropTable(array $schemasToDrop): array
 
             $table = Yii::$app->db->schema->getTableSchema("{{%$tableName}}", true);
             if ($table) {
-                $dbModelHere = new DbModel([
+                $localDbModel = new DbModel([
                     'pkName' => $table->primaryKey[0],
                     'name' => $schemaName,
                     'tableName' => $tableName,
                     'attributes' => static::attributesFromColumnSchemas(static::enhanceColumnSchemas($table->columns)),
                     'drop' => true
                 ]);
-                $dbModelsToDrop[$key] = $dbModelHere;
+                $dbModelsToDrop[$key] = $localDbModel;
             }
         }
         return $dbModelsToDrop;

From db08939d89e050df48f2793e217a618c968e83b2 Mon Sep 17 00:00:00 2001
From: Sohel Ahmed Mesaniya <sam.wankaner@gmail.com>
Date: Thu, 14 Nov 2024 16:51:42 +0530
Subject: [PATCH 70/71] Attempt to fix failing tests in Github Action

---
 src/lib/AttributeResolver.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/lib/AttributeResolver.php b/src/lib/AttributeResolver.php
index 92014c6e..7c93c932 100644
--- a/src/lib/AttributeResolver.php
+++ b/src/lib/AttributeResolver.php
@@ -140,7 +140,8 @@ protected function resolveJunctionTableProperty(PropertySchema $property, bool $
                 ->setPhpType($junkAttribute['phpType'])
                 ->setDbType($junkAttribute['dbType'])
                 ->setForeignKeyColumnName($property->fkColName)
-                ->setTableName($this->componentSchema->resolveTableName($this->schemaName));
+//                ->setTableName($this->componentSchema->resolveTableName($this->schemaName))
+                ;
             $relation = Yii::createObject(AttributeRelation::class, [
                 $property->getName(),
                 $junkAttribute['relatedTableName'],
@@ -229,7 +230,8 @@ protected function resolveProperty(
                   ->setIsPrimary($property->isPrimaryKey())
                   ->setForeignKeyColumnName($property->fkColName)
                   ->setFakerStub($this->guessFakerStub($attribute, $property))
-                  ->setTableName($this->componentSchema->resolveTableName($this->schemaName));
+//                  ->setTableName($this->componentSchema->resolveTableName($this->schemaName))
+                  ;
         if ($property->isReference()) {
             if ($property->isVirtual()) {
                 throw new InvalidDefinitionException('References not supported for virtual attributes');

From e4bcd7649a23da6093792539a9d6e299e4748dcd Mon Sep 17 00:00:00 2001
From: Sohel Ahmed Mesaniya <sam.wankaner@gmail.com>
Date: Thu, 14 Nov 2024 17:31:48 +0530
Subject: [PATCH 71/71] Attempt to fix failing tests: memory exhaust (in
 `phpunit --repeat 3`) issue

---
 src/lib/AttributeResolver.php | 6 ++----
 tests/bootstrap.php           | 1 +
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/lib/AttributeResolver.php b/src/lib/AttributeResolver.php
index 7c93c932..92014c6e 100644
--- a/src/lib/AttributeResolver.php
+++ b/src/lib/AttributeResolver.php
@@ -140,8 +140,7 @@ protected function resolveJunctionTableProperty(PropertySchema $property, bool $
                 ->setPhpType($junkAttribute['phpType'])
                 ->setDbType($junkAttribute['dbType'])
                 ->setForeignKeyColumnName($property->fkColName)
-//                ->setTableName($this->componentSchema->resolveTableName($this->schemaName))
-                ;
+                ->setTableName($this->componentSchema->resolveTableName($this->schemaName));
             $relation = Yii::createObject(AttributeRelation::class, [
                 $property->getName(),
                 $junkAttribute['relatedTableName'],
@@ -230,8 +229,7 @@ protected function resolveProperty(
                   ->setIsPrimary($property->isPrimaryKey())
                   ->setForeignKeyColumnName($property->fkColName)
                   ->setFakerStub($this->guessFakerStub($attribute, $property))
-//                  ->setTableName($this->componentSchema->resolveTableName($this->schemaName))
-                  ;
+                  ->setTableName($this->componentSchema->resolveTableName($this->schemaName));
         if ($property->isReference()) {
             if ($property->isVirtual()) {
                 throw new InvalidDefinitionException('References not supported for virtual attributes');
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 61f13cfc..d3e05290 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -3,6 +3,7 @@
 error_reporting(-1);
 ini_set('display_errors', '1');
 ini_set('display_startup_errors', '1');
+ini_set('memory_limit', '150M');
 
 defined('YII_DEBUG') or define('YII_DEBUG', true);
 defined('YII_ENV') or define('YII_ENV', 'test');