Make sure migrations run in order

Notifiarr · Oct 6, 2024 · 772a6d7 · 772a6d7
1 parent a50c8a9
commit 772a6d7
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 /root/app/www/public/logs/*
 /root/app/www/public/api/container-alias.json
+/.vscode/*
diff --git a/root/app/www/public/classes/Database.php b/root/app/www/public/classes/Database.php
@@ -125,37 +125,48 @@ public function migrations()
             require MIGRATIONS_PATH . '001_initial_setup.php';
             logger(MIGRATION_LOG, 'migration 001 <-');
 
+            $neededMigrations = [];
             $dir = opendir(MIGRATIONS_PATH);
             while ($migration = readdir($dir)) {
                 if (substr($migration, 0, 3) > $this->getSetting('migration') && str_contains($migration, '.php')) {
-                    logger(MIGRATION_LOG, 'migration ' . substr($migration, 0, 3) . ' ->');
-                    $q = [];
-                    require MIGRATIONS_PATH . $migration;
-                    logger(MIGRATION_LOG, 'migration ' . substr($migration, 0, 3) . ' <-');
+                    $neededMigrations[substr($migration, 0, 3)] = $migration;
                 }
             }
             closedir($dir);
+
+            if ($neededMigrations) {
+                ksort($neededMigrations);
+
+                foreach ($neededMigrations as $migrationNumber => $neededMigration) {
+                    logger(MIGRATION_LOG, 'migration ' . $migrationNumber . ' ->');
+                    $q = [];
+                    require MIGRATIONS_PATH . $neededMigration;
+                    logger(MIGRATION_LOG, 'migration ' . $migrationNumber . ' <-');
+                }
+            }
         } else { //-- GET CURRENT MIGRATION & CHECK FOR NEEDED MIGRATIONS
             $neededMigrations = [];
             $dir = opendir(MIGRATIONS_PATH);
             while ($migration = readdir($dir)) {
                 if (substr($migration, 0, 3) > $this->getSetting('migration') && str_contains($migration, '.php')) {
-                    $neededMigrations[] = $migration;
+                    $neededMigrations[substr($migration, 0, 3)] = $migration;
                 }
             }
             closedir($dir);
 
             if ($neededMigrations) {
-                logger(SYSTEM_LOG, 'Applying migrations: ' . implode(', ', $neededMigrations));
+                ksort($neededMigrations);
+
+                logger(SYSTEM_LOG, 'Applying migrations: ' . implode(', ', array_keys($neededMigrations)));
                 logger(MIGRATION_LOG, '====================|');
                 logger(MIGRATION_LOG, '====================| migrations');
                 logger(MIGRATION_LOG, '====================|');
 
-                foreach ($neededMigrations as $neededMigration) {
-                    logger(MIGRATION_LOG, 'migration ' . substr($neededMigration, 0, 3) . ' ->');
+                foreach ($neededMigrations as $migrationNumber => $neededMigration) {
+                    logger(MIGRATION_LOG, 'migration ' . $migrationNumber . ' ->');
                     $q = [];
                     require MIGRATIONS_PATH . $neededMigration;
-                    logger(MIGRATION_LOG, 'migration ' . substr($neededMigration, 0, 3) . ' <-');
+                    logger(MIGRATION_LOG, 'migration ' . $migrationNumber . ' <-');
                 }
             }
         }