Implement for many test cases

Author: SOHELAHMED7

src/db/ColumnSchema.php

@@ -29,7 +29,16 @@ class ColumnSchema extends \yii\db\ColumnSchema
     /**
      * TODO
      * Used only for MySQL/MariaDB
-     * @var string|null
+     * @var array|null
+     * [
+     *      index => int
+     *      after => ?string
+     *      before => ?string
+     * ]
+     * If `before` is null then column is last
      */
-    public ?string $position = null;
+    public ?array $fromPosition = null;
+    public ?array $toPosition = null;
+
+    public bool $isPositionReallyChanged = false;
 }

src/lib/migrations/BaseMigrationBuilder.php

@@ -171,6 +171,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->setPositions();
         $wantNames = array_keys($this->newColumns);
         $haveNames = $this->tableSchema->columnNames;
         $columnsForCreate = array_map(

src/lib/migrations/MysqlMigrationBuilder.php

@@ -84,10 +84,10 @@ protected function compareColumns(ColumnSchema $current, ColumnSchema $desired):
             }
         }
 
-        $positionCurrent = $this->findPosition($desired, true);
-        $positionDesired = $this->findPosition($desired);
-
-        if ($positionCurrent !== $positionDesired) {
+//        $positionCurrent = $this->findPosition($desired, true);
+//        $positionDesired = $this->findPosition($desired);
+//        if ($positionCurrent !== $positionDesired) {
+        if ($desired->isPositionReallyChanged) {
             $changedAttributes[] = 'position';
         }
 
@@ -245,4 +245,69 @@ public function handleColumnsPositionsChanges(array $haveNames, array $wantNames
         }
 //        $this->migration->addUpCode($this->recordBuilder->dropTable($this->model->getTableAlias()));
     }
+
+    public function setPositions()
+    {
+        $i = 0;
+        $haveColumns = $this->tableSchema->columns;
+        $onlyColumnNames = array_keys($this->newColumns);
+        foreach ($this->newColumns as $columnName => $column) {
+            /** @var \cebe\yii2openapi\db\ColumnSchema $column */
+            $column->toPosition = [
+                'index' => $i + 1,
+                'after' => $i === 0 ? null : $onlyColumnNames[$i - 1],
+                'before' => $i === (count($onlyColumnNames) - 1) ? null : $onlyColumnNames[$i + 1],
+            ];
+
+            $haveNamesOnlyColNames = array_keys($haveColumns);
+            if (isset($haveColumns[$columnName])) {
+                $index = array_search($columnName, $haveNamesOnlyColNames) + 1;
+                $column->fromPosition = [
+                    'index' => $index,
+                    'after' => $haveNamesOnlyColNames[$index - 2] ?? null,
+                    'before' => $haveNamesOnlyColNames[$index] ?? null,
+                ];
+            }
+
+            $i++;
+        }
+
+        $takenIndices = [];
+        foreach ($this->newColumns as $columnName => $column) {
+            /** @var \cebe\yii2openapi\db\ColumnSchema $column */
+            if (!$column->fromPosition || !$column->toPosition) {
+                continue;
+            }
+            if (
+                is_int(array_search([$column->toPosition['index'], $column->fromPosition['index']], $takenIndices))
+            ) {
+                continue;
+            }
+            if ($column->fromPosition === $column->toPosition) {
+                continue;
+            }
+
+            if ($column->fromPosition['after'] === $column->toPosition['after']) {
+                continue;
+            }
+
+            if ($column->fromPosition['before'] === $column->toPosition['before']) {
+                continue;
+            }
+//            if (!in_array($column->fromPosition['after'], $onlyColumnNames)) {
+//                continue;
+//            }
+//            if (!in_array($column->fromPosition['before'], $onlyColumnNames)) {
+//                continue;
+//            }
+
+            if (!in_array($column->fromPosition['after'], $onlyColumnNames) && !in_array($column->fromPosition['before'], $onlyColumnNames)) {
+                continue;
+            }
+
+
+            $column->isPositionReallyChanged = true;
+            $takenIndices[] = [$column->fromPosition['index'], $column->toPosition['index']];
+        }
+    }
 }

src/lib/migrations/PostgresMigrationBuilder.php

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