From 8eac8cf9fcc69e67e01018990fc343f8a455d856 Mon Sep 17 00:00:00 2001 From: Kenshin13 <63159154+Kenshiin13@users.noreply.github.com> Date: Sun, 24 Aug 2025 17:39:16 +0200 Subject: [PATCH] Revert "refactor: only store migrations if not ran" This reverts commit 45308f5d490a37e262c88529e78d900d6842dae1. --- [core]/es_extended/server/migration/main.lua | 20 ++++++++++--------- .../server/migration/v1.13.3/ssn/main.lua | 10 ++-------- 2 files changed, 13 insertions(+), 17 deletions(-) diff --git a/[core]/es_extended/server/migration/main.lua b/[core]/es_extended/server/migration/main.lua index 2f19ce8c..304590eb 100644 --- a/[core]/es_extended/server/migration/main.lua +++ b/[core]/es_extended/server/migration/main.lua @@ -16,18 +16,20 @@ for esxVersion, migrations in pairs(Core.Migrations or {}) do ---@cast esxVersion string ---@cast migrations table - print(("^4[INFO]^7 Running migrations for ESX version %s"):format(esxVersion)) + if GetResourceKvpInt(("esx_migration:%s"):format(esxVersion)) ~= 1 then + print(("^4[INFO]^7 Running migrations for ESX version %s"):format(esxVersion)) - for migrationName, migration in pairs(migrations) do - local success, err = pcall(migration) - if not success then - error(("^1[ERROR]^7 Failed migration ^4['%s.%s']^7: %s"):format(esxVersion, migrationName, err)) + for migrationName, migration in pairs(migrations) do + local success, err = pcall(migration) + if not success then + error(("^1[ERROR]^7 Failed migration ^4['%s.%s']^7: %s"):format(esxVersion, migrationName, err)) + end end - end - SetResourceKvpInt(("esx_migration:%s"):format(esxVersion), 1) - print(("^2[SUCCESS]^7 Successfully completed migrations for ESX version %s"):format(esxVersion)) - migrationsRan += 1 + SetResourceKvpInt(("esx_migration:%s"):format(esxVersion), 1) + print(("^2[SUCCESS]^7 Successfully completed migrations for ESX version %s"):format(esxVersion)) + migrationsRan += 1 + end end if migrationsRan > 0 then diff --git a/[core]/es_extended/server/migration/v1.13.3/ssn/main.lua b/[core]/es_extended/server/migration/v1.13.3/ssn/main.lua index 24462ce1..8b6d6ead 100644 --- a/[core]/es_extended/server/migration/v1.13.3/ssn/main.lua +++ b/[core]/es_extended/server/migration/v1.13.3/ssn/main.lua @@ -1,13 +1,7 @@ -local esxVersion = "v1.13.3" - -if GetResourceKvpInt(("esx_migration:%s"):format(esxVersion)) == 1 then - return -end - Core.Migrations = Core.Migrations or {} -Core.Migrations[esxVersion] = Core.Migrations[esxVersion] or {} +Core.Migrations["v1.13.3"] = Core.Migrations["v1.13.3"] or {} -Core.Migrations[esxVersion].ssn = function() +Core.Migrations["v1.13.3"].ssn = function() print("^4[esx_migration:v.1.13.3:ssn]^7 Adding SSN column to users table.") local col = MySQL.scalar.await([[ SELECT COUNT(*)