Fix bugs + fix failing tests + add more tests

Author: SOHELAHMED7

src/lib/migrations/MigrationRecordBuilder.php

@@ -135,8 +135,7 @@ public function alterColumnType(
         ColumnSchema $column,
         bool $addUsing = false,
         ?string $position = null
-    ):string
-    {
+    ):string {
         if (property_exists($column, 'xDbType') && is_string($column->xDbType) && !empty($column->xDbType)) {
             $converter = $this->columnToCode($tableAlias, $column, false, false, true, true, $position);
             return sprintf(

src/lib/migrations/MysqlMigrationBuilder.php

@@ -278,6 +278,7 @@ public function setPositions()
             if (!$column->fromPosition || !$column->toPosition) {
                 continue;
             }
+
             if (
                 is_int(array_search([$column->toPosition['index'], $column->fromPosition['index']], $takenIndices))
             ) {
@@ -287,19 +288,69 @@ public function setPositions()
                 continue;
             }
 
-            if ($column->fromPosition['after'] === $column->toPosition['after']) {
+            if (!in_array($column->fromPosition['after'], $onlyColumnNames) && !in_array($column->fromPosition['before'], $onlyColumnNames)) { // deleted column
                 continue;
             }
 
-            if ($column->fromPosition['before'] === $column->toPosition['before']) {
+            if ($column->fromPosition['index'] === $column->toPosition['index']) {
                 continue;
             }
 
-            if (!in_array($column->fromPosition['after'], $onlyColumnNames) && !in_array($column->fromPosition['before'], $onlyColumnNames)) {
+            if ($this->checkAfterPosition($column)) {
+                continue;
+            }
+            if ($this->checkBeforePosition($column)) {
                 continue;
             }
+
+//            if ($column->fromPosition['before'] === $column->toPosition['before']
+            ////                && $column->fromPosition['index'] !== $column->toPosition['index']
+//            ) {
+//                continue;
+//            }
+
             $column->isPositionReallyChanged = true;
             $takenIndices[] = [$column->fromPosition['index'], $column->toPosition['index']];
         }
     }
+
+    public function checkAfterPosition($column)
+    {
+        if ($column->fromPosition['after'] === $column->toPosition['after']
+//                && $column->fromPosition['index'] !== $column->toPosition['index']
+        ) {
+            $afterColName = $column->toPosition['after'];
+            $afterCol = $this->newColumns[$afterColName] ?? null;
+            if ($afterCol) {
+                if ($this->checkAfterPosition($afterCol)) {
+                    return true;
+                } else {
+                    return false;
+                }
+            } else {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public function checkBeforePosition($column)
+    {
+        if ($column->fromPosition['before'] === $column->toPosition['before']
+//                && $column->fromPosition['index'] !== $column->toPosition['index']
+        ) {
+            $beforeColName = $column->toPosition['before'];
+            $beforeCol = $this->newColumns[$beforeColName] ?? null;
+            if ($beforeCol) {
+                if ($this->checkBeforePosition($beforeCol)) {
+                    return true;
+                } else {
+                    return false;
+                }
+            } else {
+                return true;
+            }
+        }
+        return false;
+    }
 }

tests/unit/IssueFixTest.php

@@ -400,7 +400,7 @@ private function for58($schema, $expected, $columns = [
         'description' => 'text not null',
         'colour' => 'text not null',
         'size' => 'text not null',
-    ])
+    ],                                         $dbs = ['Mysql', 'Mariadb'])
     {
         $deleteTable = function () {
             Yii::$app->db->createCommand('DROP TABLE IF EXISTS {{%fruits}}')->execute();
@@ -420,7 +420,7 @@ private function for58($schema, $expected, $columns = [
         $tmpConfigFile = Yii::getAlias("@runtime") . "/tmp-config.php";
         file_put_contents($tmpConfigFile, '<?php return ' . var_export($config, true) . ';');
 
-        foreach (['Mysql', 'Mariadb'] as $db) {
+        foreach ($dbs as $db) {
             $this->{"changeDbTo$db"}();
             $deleteTable();
             $createTable();
@@ -1040,10 +1040,10 @@ public function test58MoveColumns()
             'description' => 'text null',
             'colour' => 'text null',
             'size' => 'text null',
-            'col_6' => 'text null',
-            'col_7' => 'text null',
-            'col_8' => 'text null',
-            'col_9' => 'text null',
+//            'col_6' => 'text null',
+//            'col_7' => 'text null',
+//            'col_8' => 'text null',
+//            'col_9' => 'text null',
 
         ];
 
@@ -1060,22 +1060,13 @@ public function test58MoveColumns()
         id:
           type: integer
         colour:
-          type: string
+          type: string          
         size:
           type: string
         name:
           type: string
         description:
-          type: string
-        col_6:
-          type: string
-        col_7:
-          type: string
-        col_8:
-          type: string
-        col_9:
-          type: string
-        
+          type: string        
 paths:
   '/':
     get:
@@ -1094,19 +1085,19 @@ class m200000_000000_change_table_fruits extends \yii\db\Migration
 {
     public function up()
     {
-        $this->alterColumn('{{%fruits}}', 'colour', $this->text()->notNull()->after('id'));
-        $this->alterColumn('{{%fruits}}', 'size', $this->text()->notNull()->after('colour'));
+        $this->alterColumn('{{%fruits}}', 'colour', $this->text()->null()->after('id'));
+        $this->alterColumn('{{%fruits}}', 'size', $this->text()->null()->after('colour'));
     }
 
     public function down()
     {
-        $this->alterColumn('{{%fruits}}', 'size', $this->text()->notNull()->after('colour'));
-        $this->alterColumn('{{%fruits}}', 'colour', $this->text()->notNull()->after('description'));
+        $this->alterColumn('{{%fruits}}', 'size', $this->text()->null()->after('colour'));
+        $this->alterColumn('{{%fruits}}', 'colour', $this->text()->null()->after('description'));
     }
 }
 
 PHP;
 
-        $this->for58($schema, $expected, $columns);
+        $this->for58($schema, $expected, $columns, ['Mysql']);
     }
 }