Revert redundant updates

Author: Valentin V / vvval

src/Atomizer/Renderer.php

@@ -119,90 +119,6 @@ public function dropTable(Source $source, AbstractTable $table): void
         );
     }
 
-    /**
-     * @param Source         $source
-     * @param AbstractColumn $column
-     * @param AbstractColumn $original
-     */
-    protected function alterColumn(
-        Source $source,
-        AbstractColumn $column,
-        AbstractColumn $original
-    ): void {
-        if ($column->getName() !== $original->getName()) {
-            $name = $original->getName();
-        } else {
-            $name = $column->getName();
-        }
-
-        $this->render(
-            $source,
-            '    ->alterColumn(%s, %s, %s)',
-            $name,
-            $column->getDeclaredType() ?? $column->getAbstractType(),
-            $column
-        );
-
-        if ($column->getName() !== $original->getName()) {
-            $this->render(
-                $source,
-                '    ->renameColumn(%s, %s)',
-                $name,
-                $column->getName()
-            );
-        }
-    }
-
-    /**
-     * Render values and options into source.
-     *
-     * @param Source $source
-     * @param string $format
-     * @param array  ...$values
-     */
-    protected function render(Source $source, string $format, ...$values): void
-    {
-        $serializer = $this->getSerializer();
-
-        $rendered = [];
-        foreach ($values as $value) {
-            if ($value instanceof AbstractTable) {
-                $rendered[] = $serializer->serialize(
-                    substr($value->getName(), strlen($value->getPrefix()))
-                );
-                continue;
-            }
-
-            if ($value instanceof AbstractColumn) {
-                $rendered[] = $this->columnOptions($serializer, $value);
-                continue;
-            }
-
-            if ($value instanceof AbstractIndex) {
-                $rendered[] = $this->indexOptions($serializer, $value);
-                continue;
-            }
-
-            if ($value instanceof AbstractForeignKey) {
-                $rendered[] = $this->foreignKeyOptions($serializer, $value);
-                continue;
-            }
-
-            // numeric array
-            if (is_array($value) && count($value) > 0 && is_numeric(array_keys($value)[0])) {
-                $rendered[] = '["' . implode('", "', $value) . '"]';
-                continue;
-            }
-
-            $rendered[] = $serializer->serialize($value);
-        }
-
-        $lines = sprintf($format, ...$rendered);
-        foreach (explode("\n", $lines) as $line) {
-            $source->addLine($line);
-        }
-    }
-
     /**
      * @param Source     $source
      * @param Comparator $comparator
@@ -415,6 +331,90 @@ private function revertForeignKeys(Source $source, Comparator $comparator, strin
         }
     }
 
+    /**
+     * @param Source         $source
+     * @param AbstractColumn $column
+     * @param AbstractColumn $original
+     */
+    protected function alterColumn(
+        Source $source,
+        AbstractColumn $column,
+        AbstractColumn $original
+    ): void {
+        if ($column->getName() !== $original->getName()) {
+            $name = $original->getName();
+        } else {
+            $name = $column->getName();
+        }
+
+        $this->render(
+            $source,
+            '    ->alterColumn(%s, %s, %s)',
+            $name,
+            $column->getDeclaredType() ?? $column->getAbstractType(),
+            $column
+        );
+
+        if ($column->getName() !== $original->getName()) {
+            $this->render(
+                $source,
+                '    ->renameColumn(%s, %s)',
+                $name,
+                $column->getName()
+            );
+        }
+    }
+
+    /**
+     * Render values and options into source.
+     *
+     * @param Source $source
+     * @param string $format
+     * @param array  ...$values
+     */
+    protected function render(Source $source, string $format, ...$values): void
+    {
+        $serializer = $this->getSerializer();
+
+        $rendered = [];
+        foreach ($values as $value) {
+            if ($value instanceof AbstractTable) {
+                $rendered[] = $serializer->serialize(
+                    substr($value->getName(), strlen($value->getPrefix()))
+                );
+                continue;
+            }
+
+            if ($value instanceof AbstractColumn) {
+                $rendered[] = $this->columnOptions($serializer, $value);
+                continue;
+            }
+
+            if ($value instanceof AbstractIndex) {
+                $rendered[] = $this->indexOptions($serializer, $value);
+                continue;
+            }
+
+            if ($value instanceof AbstractForeignKey) {
+                $rendered[] = $this->foreignKeyOptions($serializer, $value);
+                continue;
+            }
+
+            // numeric array
+            if (is_array($value) && count($value) > 0 && is_numeric(array_keys($value)[0])) {
+                $rendered[] = '["' . implode('", "', $value) . '"]';
+                continue;
+            }
+
+            $rendered[] = $serializer->serialize($value);
+        }
+
+        $lines = sprintf($format, ...$rendered);
+        foreach (explode("\n", $lines) as $line) {
+            $source->addLine($line);
+        }
+    }
+
     /**
      * @param Serializer     $serializer
      * @param AbstractColumn $column

tests/docker-compose.yml

@@ -28,4 +28,4 @@ services:
     environment:
       POSTGRES_DB: "spiral"
       POSTGRES_USER: "postgres"
-      POSTGRES_PASSWORD: "postgres"
+      POSTGRES_PASSWORD: "postgres"

tests/install-sqlsrv.sh

@@ -4,4 +4,4 @@ curl https://packages.microsoft.com/keys/microsoft.asc | sudo apt-key add -
 curl https://packages.microsoft.com/config/ubuntu/18.04/prod.list | sudo tee /etc/apt/sources.list.d/mssql-release.list
 sudo apt-get update
 
-sudo ACCEPT_EULA=Y apt-get install -qy msodbcsql17 mssql-tools
+sudo ACCEPT_EULA=Y apt-get install -qy msodbcsql17 mssql-tools