Refactor

Author: SOHELAHMED7

src/lib/migrations/BaseMigrationBuilder.php

@@ -222,8 +222,6 @@ function (string $unknownColumn) {
             $this->buildRelations();
         }
 
-//        $this->handleColumnsPositionsChanges($haveNames, $wantNames);
-
         return $this->migration;
     }
 

src/lib/migrations/MigrationRecordBuilder.php

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

src/lib/migrations/MysqlMigrationBuilder.php

@@ -31,14 +31,6 @@ protected function buildColumnChanges(ColumnSchema $current, ColumnSchema $desir
             unset($changed[$key]);
         }
         $newColumn = clone $current;
-//        $positionCurrent = $this->findPosition($desired, true);
-//        $positionDesired = $this->findPosition($desired);
-//        if ($positionCurrent === $positionDesired) {
-//            $positionCurrent = $positionDesired = null;
-//        } # else {
-//            $position = $positionDesired;
-//            $newColumn->position = $position;
-//        }
         foreach ($changed as $attr) {
             $newColumn->$attr = $desired->$attr;
         }
@@ -82,10 +74,7 @@ protected function compareColumns(ColumnSchema $current, ColumnSchema $desired):
             }
         }
 
-//        $positionCurrent = $this->findPosition($desired, true);
-//        $positionDesired = $this->findPosition($desired);
-//        if ($positionCurrent !== $positionDesired) {
-        if ($desired->isPositionChanged) {
+        if (property_exists($desired, 'isPositionChanged') && $desired->isPositionChanged) {
             $changedAttributes[] = 'position';
         }
 
@@ -226,6 +215,8 @@ public function setColumnsPositions()
         $haveColumns = $this->tableSchema->columns;
         $wantNames = array_keys($this->newColumns);
         $haveNames = array_keys($haveColumns);
+
+        // Part 1/2 compute from and to position
         foreach ($this->newColumns as $name => $column) {
             /** @var \cebe\yii2openapi\db\ColumnSchema $column */
             $column->toPosition = [
@@ -246,31 +237,32 @@ public function setColumnsPositions()
             $i++;
         }
 
+        // Part 2/2 compute is position is really changed
+
+        // check if only new columns are added without any explicit position change
+        $namesForCreate = array_diff($wantNames, $haveNames);
+        $wantNamesWoNewCols = array_values(array_diff($wantNames, $namesForCreate));
+        if ($namesForCreate && $haveNames === $wantNamesWoNewCols) {
+            return;
+        }
+        // check if only existing columns are deleted without any explicit position change
+        $namesForDrop = array_diff($haveNames, $wantNames);
+        $haveNamesWoDropCols = array_values(array_diff($haveNames, $namesForDrop));
+        if ($namesForDrop && $wantNames === $haveNamesWoDropCols) {
+            return;
+        }
+        // check both above simultaneously
+        if ($namesForCreate && $namesForDrop && ($wantNamesWoNewCols === $haveNamesWoDropCols)) {
+            return;
+        }
+
         $takenIndices = [];
         foreach ($this->newColumns as $column) {
             /** @var \cebe\yii2openapi\db\ColumnSchema $column */
 
             if (!$column->fromPosition || !$column->toPosition) {
                 continue;
             }
-
-            // check if only new columns are added without any explicit position change
-            $namesForCreate = array_diff($wantNames, $haveNames);
-            $wantNamesWoNewCols = array_values(array_diff($wantNames, $namesForCreate));
-            if ($namesForCreate && $haveNames === $wantNamesWoNewCols) {
-                continue;
-            }
-            // check if only existing columns are deleted without any explicit position change
-            $namesForDrop = array_diff($haveNames, $wantNames);
-            $haveNamesWoDropCols = array_values(array_diff($haveNames, $namesForDrop));
-            if ($namesForDrop && $wantNames === $haveNamesWoDropCols) {
-                continue;
-            }
-            // check both above simultaneously
-            if ($namesForCreate && $namesForDrop && ($wantNamesWoNewCols === $haveNamesWoDropCols)) {
-                continue;
-            }
-
             if (is_int(array_search([$column->toPosition['index'], $column->fromPosition['index']], $takenIndices))) {
                 continue;
             }
@@ -285,42 +277,4 @@ public function setColumnsPositions()
             $takenIndices[] = [$column->fromPosition['index'], $column->toPosition['index']];
         }
     }
-
-    public function checkAfterPosition($column)
-    {
-        if ($column->fromPosition['after'] === $column->toPosition['after']
-        ) {
-            $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']
-        ) {
-            $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;
-    }
 }