Fix bugs + fix failing tests

Author: SOHELAHMED7

src/lib/migrations/BaseMigrationBuilder.php

@@ -554,5 +554,5 @@ abstract public function handleColumnsPositionsChanges(array $haveNames, array $
      * 'FIRST' if column is added at first position
      * 'AFTER <columnName>' if column is added in between e.g. if 'email' is added after 'username' then 'AFTER username'
      */
-    abstract public function findPosition(ColumnSchema $column, bool $forDrop = false): ?string;
+    abstract public function findPosition(ColumnSchema $column, bool $forDrop = false, bool $forAlter = false): ?string;
 }

src/lib/migrations/MysqlMigrationBuilder.php

@@ -25,8 +25,8 @@ protected function buildColumnChanges(ColumnSchema $current, ColumnSchema $desir
     {
         $positionCurrent = $positionDesired = null;
         if (in_array('position', $changed, true)) {
-            $positionCurrent = $this->findPosition($current, true);
-            $positionDesired = $this->findPosition($desired);
+            $positionDesired = $this->findPosition($desired, false, true);
+            $positionCurrent = $this->findPosition($desired, true, true);
             $key = array_search('position', $changed, true);
             if ($key !== false) {
                 unset($changed[$key]);
@@ -195,8 +195,13 @@ public function checkOrder()
     /**
      * {@inheritDoc}
      */
-    public function findPosition(ColumnSchema $column, bool $forDrop = false): ?string
+    public function findPosition(ColumnSchema $column, bool $forDrop = false, bool $forAlter = false): ?string
     {
+//        if ($column instanceof \cebe\yii2openapi\db\ColumnSchema) {
+//            if (!$column->isPositionReallyChanged) {
+//                return null;
+//            }
+//        }
 //        if (!$forDrop) {
 //            $columnNames = array_keys($this->newColumns);
 //            $key = array_search($column->name, $columnNames);
@@ -233,17 +238,24 @@ public function findPosition(ColumnSchema $column, bool $forDrop = false): ?stri
 //            }
 //        }
 //        return null;
+
         $columnNames = array_keys($forDrop ? $this->tableSchema->columns : $this->newColumns);
 
         $key = array_search($column->name, $columnNames);
         if ($key > 0) {
             $prevColName = $columnNames[$key - 1];
-
-            if (!$forDrop && !isset($columnNames[$key + 1])) { // if new col is added at last then no need to add 'AFTER' SQL part. This is checked as if next column is present or not
+            if (($key === count($columnNames) - 1) && !$forAlter) {
                 return null;
             }
 
-            if (array_key_exists($prevColName, $this->newColumns)) {
+//            if (!$forDrop && !isset($columnNames[$key + 1])) { // if new col is added at last then no need to add 'AFTER' SQL part. This is checked as if next column is present or not
+//                return null;
+//            }
+
+            if (array_key_exists($prevColName, $forDrop ? $this->tableSchema->columns : $this->newColumns)) {
+                if (($prevColName === $columnNames[count($columnNames) - 1]) && !$forAlter) {
+                    return null;
+                }
                 return self::POS_AFTER . ' ' . $prevColName;
             }
             return null;

src/lib/migrations/PostgresMigrationBuilder.php

@@ -259,7 +259,7 @@ public function handleColumnsPositionsChanges(array $haveNames, array $wantNames
     /**
      * {@inheritDoc}
      */
-    public function findPosition(ColumnSchema $column, bool $forDrop = false): ?string
+    public function findPosition(ColumnSchema $column, bool $forDrop = false, bool $forAlter = false): ?string
     {
         return null;
     }

tests/unit/IssueFixTest.php

@@ -483,7 +483,7 @@ public function up()
 
     public function down()
     {
-        $this->addColumn('{{%fruits}}', 'size', $this->text()->notNull()->after('colour'));
+        $this->addColumn('{{%fruits}}', 'size', $this->text()->notNull());
     }
 }
 
@@ -646,7 +646,7 @@ public function up()
     public function down()
     {
         $this->addColumn('{{%fruits}}', 'description', $this->text()->notNull()->after('name'));
-        $this->addColumn('{{%fruits}}', 'colour', $this->text()->notNull());
+        $this->addColumn('{{%fruits}}', 'colour', $this->text()->notNull()->after('description'));
     }
 }
 
@@ -1225,7 +1225,7 @@ public function down()
         $this->alterColumn('{{%fruits}}', 'description', $this->text()->null()->after('name'));
         $this->alterColumn('{{%fruits}}', 'name', $this->text()->null()->after('id'));
         $this->alterColumn('{{%fruits}}', 'colour', $this->text()->null()->after('description'));
-        $this->addColumn('{{%fruits}}', 'size', $this->text()->null()->after('colour'));
+        $this->addColumn('{{%fruits}}', 'size', $this->text()->null());
         $this->dropColumn('{{%fruits}}', 'col_6');
     }
 }