From 3ef71f7d353c30cf47cf5b9647d81cb874760aad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= <jeremie.ngadi@gmail.com>
Date: Mon, 11 May 2020 22:41:56 +0200
Subject: [PATCH] ensure migration order

---
 modules/addonaccount/server/events.lua   |  4 ----
 modules/addoninventory/server/events.lua |  4 ----
 modules/datastore/server/events.lua      |  4 ----
 modules/job_police/server/events.lua     |  4 ----
 modules/society/client/events.lua        |  4 ----
 server/functions.lua                     |  4 ++--
 server/main.lua                          | 23 +++++++++++++++++------
 7 files changed, 19 insertions(+), 28 deletions(-)

diff --git a/modules/addonaccount/server/events.lua b/modules/addonaccount/server/events.lua
index ae22e53a..a7a1506b 100644
--- a/modules/addonaccount/server/events.lua
+++ b/modules/addonaccount/server/events.lua
@@ -1,9 +1,5 @@
 local self = ESX.Modules['addonaccount']
 
-AddEventHandler('esx:migrations:ensure', function(register)
-  register('addonaccount')
-end)
-
 AddEventHandler('esx_addonaccount:getAccount', function(name, owner, cb)
 
   Citizen.CreateThread(function()
diff --git a/modules/addoninventory/server/events.lua b/modules/addoninventory/server/events.lua
index 482c49b5..388ca276 100644
--- a/modules/addoninventory/server/events.lua
+++ b/modules/addoninventory/server/events.lua
@@ -1,9 +1,5 @@
 local self = ESX.Modules['addoninventory']
 
-AddEventHandler('esx:migrations:ensure', function(register)
-  register('addoninventory')
-end)
-
 AddEventHandler('esx_addoninventory:getInventory', function(name, owner, cb)
 
   Citizen.CreateThread(function()
diff --git a/modules/datastore/server/events.lua b/modules/datastore/server/events.lua
index b74f246a..248010ef 100644
--- a/modules/datastore/server/events.lua
+++ b/modules/datastore/server/events.lua
@@ -1,9 +1,5 @@
 local self = ESX.Modules['datastore']
 
-AddEventHandler('esx:migrations:ensure', function(register)
-  register('datastore')
-end)
-
 AddEventHandler('esx_datastore:getDataStore', function(name, owner, cb)
 
   Citizen.CreateThread(function()
diff --git a/modules/job_police/server/events.lua b/modules/job_police/server/events.lua
index 4a5f42b7..4b2d0d87 100644
--- a/modules/job_police/server/events.lua
+++ b/modules/job_police/server/events.lua
@@ -1,9 +1,5 @@
 local self = ESX.Modules['job_police']
 
-AddEventHandler('esx:migrations:ensure', function(register)
-  register('job_police')
-end)
-
 RegisterNetEvent('esx_policejob:confiscatePlayerItem')
 AddEventHandler('esx_policejob:confiscatePlayerItem', function(target, itemType, itemName, amount)
 	local _source = source
diff --git a/modules/society/client/events.lua b/modules/society/client/events.lua
index 0e0b581e..3c111638 100644
--- a/modules/society/client/events.lua
+++ b/modules/society/client/events.lua
@@ -1,9 +1,5 @@
 local self = ESX.Modules['society']
 
-AddEventHandler('esx:migrations:ensure', function(register)
-  register('society')
-end)
-
 RegisterNetEvent('esx_addonaccount:setMoney')
 AddEventHandler('esx_addonaccount:setMoney', function(society, money)
 	if ESX.PlayerData.job and ESX.PlayerData.job.grade_name == 'boss' and 'society_' .. ESX.PlayerData.job.name == society then
diff --git a/server/functions.lua b/server/functions.lua
index 0edbd6f0..b4515a50 100644
--- a/server/functions.lua
+++ b/server/functions.lua
@@ -1,6 +1,6 @@
 ESX.EnsureMigrations = function(module)
 
-  print('[esx] migrate => ' .. module)
+  print('[esx] ensure migrations => ' .. module)
 
   local dir
 
@@ -47,7 +47,7 @@ ESX.EnsureMigrations = function(module)
   until sql == nil
 
   if not hasmigrated then
-    print('[esx] [' .. module .. '] => no pending migration')
+    -- print('[esx] [' .. module .. '] => no pending migration')
   end
 
 end
diff --git a/server/main.lua b/server/main.lua
index 8314cb3d..e7aa1a02 100644
--- a/server/main.lua
+++ b/server/main.lua
@@ -2,14 +2,25 @@ MySQL.ready(function()
 
   print('[esx] ensuring migrations')
 
-  TriggerEvent('esx:migrations:ensure', function(module)
-    ESX.EnsureMigrations(module)
-  end)
+  local index   = 0
+  local results = {}
+  local start
+  local manifest = LoadResourceFile(GetCurrentResourceName(), 'fxmanifest.lua')
 
-end)
+  repeat
+
+    start, index = manifest:find("esxmodule '.-'", index)
+
+    if start then
+
+      local module = manifest:sub(start, index):sub(12):sub(0, -2)
+
+      ESX.EnsureMigrations(module)
+
+    end
+
+  until not start
 
-AddEventHandler('esx:migrations:ensure', function(register)
-  register('base')
 end)
 
 RegisterNetEvent('esx:onPlayerJoined')