feat: update order of schema execution to avoid removing changed columns

Author: mychidarko

src/Schema.php

@@ -135,6 +135,38 @@ public static function migrate(string $fileToMigrate): bool
                         }
                     }
 
+                    if ($rememberToken !== ($lastMigration['remember_token'] ?? false)) {
+                        if ($rememberToken && !static::$connection::schema()->hasColumn($tableName, 'remember_token')) {
+                            $table->rememberToken();
+                        } else if (!$rememberToken && static::$connection::schema()->hasColumn($tableName, 'remember_token')) {
+                            $table->dropRememberToken();
+                        }
+                    }
+
+                    if ($softDeletes !== ($lastMigration['softDeletes'] ?? false)) {
+                        if ($softDeletes && !static::$connection::schema()->hasColumn($tableName, 'deleted_at')) {
+                            $table->softDeletes();
+                        } else if (!$softDeletes && static::$connection::schema()->hasColumn($tableName, 'deleted_at')) {
+                            $table->dropSoftDeletes();
+                        }
+                    }
+
+                    if ($timestamps !== ($lastMigration['timestamps'] ?? true)) {
+                        if ($timestamps && !static::$connection::schema()->hasColumn($tableName, 'created_at')) {
+                            $table->timestamps();
+                        } else if (!$timestamps && static::$connection::schema()->hasColumn($tableName, 'created_at')) {
+                            $table->dropTimestamps();
+                        }
+                    }
+
+                    if (count($removedColumns) > 0) {
+                        foreach ($removedColumns as $removedColumn) {
+                            if (static::$connection::schema()->hasColumn($tableName, $removedColumn)) {
+                                $table->dropColumn($removedColumn);
+                            }
+                        }
+                    }
+
                     $newColumns = array_diff(array_keys($columns), $staticColumns);
 
                     if (count($newColumns) > 0) {
@@ -245,38 +277,6 @@ public static function migrate(string $fileToMigrate): bool
                             $newCol->change();
                         }
                     }
-
-                    if (count($removedColumns) > 0) {
-                        foreach ($removedColumns as $removedColumn) {
-                            if (static::$connection::schema()->hasColumn($tableName, $removedColumn)) {
-                                $table->dropColumn($removedColumn);
-                            }
-                        }
-                    }
-
-                    if ($rememberToken !== ($lastMigration['remember_token'] ?? false)) {
-                        if ($rememberToken && !static::$connection::schema()->hasColumn($tableName, 'remember_token')) {
-                            $table->rememberToken();
-                        } else if (!$rememberToken && static::$connection::schema()->hasColumn($tableName, 'remember_token')) {
-                            $table->dropRememberToken();
-                        }
-                    }
-
-                    if ($softDeletes !== ($lastMigration['softDeletes'] ?? false)) {
-                        if ($softDeletes && !static::$connection::schema()->hasColumn($tableName, 'deleted_at')) {
-                            $table->softDeletes();
-                        } else if (!$softDeletes && static::$connection::schema()->hasColumn($tableName, 'deleted_at')) {
-                            $table->dropSoftDeletes();
-                        }
-                    }
-
-                    if ($timestamps !== ($lastMigration['timestamps'] ?? true)) {
-                        if ($timestamps && !static::$connection::schema()->hasColumn($tableName, 'created_at')) {
-                            $table->timestamps();
-                        } else if (!$timestamps && static::$connection::schema()->hasColumn($tableName, 'created_at')) {
-                            $table->dropTimestamps();
-                        }
-                    }
                 });
             }