Handle case of custom column name

Author: SOHELAHMED7

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))

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);

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

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,27 +304,47 @@ 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',
             '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 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()