From 2478021f17963b3cae0d554358d6641fed6598a4 Mon Sep 17 00:00:00 2001
From: ElPumpo <samo_kol@hotmail.com>
Date: Mon, 24 Sep 2018 16:58:53 +0200
Subject: [PATCH] mysql-async v3.0.1 support

---
 __resource.lua                  |  4 +--
 server/classes/addonaccount.lua | 45 +++++++++++++--------------------
 server/main.lua                 | 13 +---------
 3 files changed, 20 insertions(+), 42 deletions(-)

diff --git a/__resource.lua b/__resource.lua
index 4b545468..b403a312 100644
--- a/__resource.lua
+++ b/__resource.lua
@@ -1,8 +1,8 @@
 resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937'
 
-description 'ESX AddonAccount'
+description 'ESX Addon Account'
 
-version '1.0.0'
+version '1.0.1'
 
 server_scripts {
 	'@mysql-async/lib/MySQL.lua',
diff --git a/server/classes/addonaccount.lua b/server/classes/addonaccount.lua
index 3c790712..cd9552ee 100644
--- a/server/classes/addonaccount.lua
+++ b/server/classes/addonaccount.lua
@@ -1,5 +1,4 @@
 function CreateAddonAccount(name, owner, money)
-
 	local self = {}
 
 	self.name  = name
@@ -7,55 +6,45 @@ function CreateAddonAccount(name, owner, money)
 	self.money = money
 
 	self.addMoney = function(m)
-
 		self.money = self.money + m
 
 		self.save()
 
-		TriggerClientEvent('esx_addonaccount:setMoney', -1,  self.name, self.money)
+		TriggerClientEvent('esx_addonaccount:setMoney', -1, self.name, self.money)
 	end
 
 	self.removeMoney = function(m)
-		
 		self.money = self.money - m
-		
+
 		self.save()
-		
-		TriggerClientEvent('esx_addonaccount:setMoney', -1,  self.name, self.money)
+
+		TriggerClientEvent('esx_addonaccount:setMoney', -1, self.name, self.money)
 	end
 
 	self.setMoney = function(m)
-
 		self.money = m
 
 		self.save()
-		
-		TriggerClientEvent('esx_addonaccount:setMoney', -1,  self.name, self.money)
+
+		TriggerClientEvent('esx_addonaccount:setMoney', -1, self.name, self.money)
 	end
 
 	self.save = function()
-
 		if self.owner == nil then
-			MySQL.Async.execute(
-				'UPDATE addon_account_data SET money = @money WHERE account_name = @account_name',
-				{
-					['@account_name'] = self.name,
-					['@money']        = self.money
-				}
-			)
+			MySQL.Async.execute('UPDATE addon_account_data SET money = @money WHERE account_name = @account_name',
+			{
+				['@account_name'] = self.name,
+				['@money']        = self.money
+			})
 		else
-			MySQL.Async.execute(
-				'UPDATE addon_account_data SET money = @money WHERE account_name = @account_name AND owner = @owner',
-				{
-					['@account_name'] = self.name,
-					['@money']        = self.money,
-					['@owner']        = self.owner
-				}
-			)
+			MySQL.Async.execute('UPDATE addon_account_data SET money = @money WHERE account_name = @account_name AND owner = @owner',
+			{
+				['@account_name'] = self.name,
+				['@money']        = self.money,
+				['@owner']        = self.owner
+			})
 		end
-
 	end
 
 	return self
-
 end
\ No newline at end of file
diff --git a/server/main.lua b/server/main.lua
index 37614381..5f47d6fc 100644
--- a/server/main.lua
+++ b/server/main.lua
@@ -5,12 +5,10 @@ local SharedAccounts = {}
 
 TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end)
 
-AddEventHandler('onMySQLReady', function ()
-
+MySQL.ready(function()
 	local result = MySQL.Sync.fetchAll('SELECT * FROM addon_account')
 
 	for i=1, #result, 1 do
-
 		local name   = result[i].name
 		local label  = result[i].label
 		local shared = result[i].shared
@@ -22,7 +20,6 @@ AddEventHandler('onMySQLReady', function ()
 		if shared == 0 then
 
 			table.insert(AccountsIndex, name)
-
 			Accounts[name] = {}
 
 			for j=1, #result2, 1 do
@@ -35,7 +32,6 @@ AddEventHandler('onMySQLReady', function ()
 			local money = nil
 
 			if #result2 == 0 then
-
 				MySQL.Sync.execute('INSERT INTO addon_account_data (account_name, money, owner) VALUES (@account_name, @money, NULL)',
 				{
 					['@account_name'] = name,
@@ -43,7 +39,6 @@ AddEventHandler('onMySQLReady', function ()
 				})
 
 				money = 0
-
 			else
 				money = result2[1].money
 			end
@@ -52,9 +47,7 @@ AddEventHandler('onMySQLReady', function ()
 			SharedAccounts[name] = addonAccount
 
 		end
-
 	end
-
 end)
 
 function GetAccount(name, owner)
@@ -83,12 +76,10 @@ AddEventHandler('esx:playerLoaded', function(source)
 	local addonAccounts = {}
 
 	for i=1, #AccountsIndex, 1 do
-
 		local name    = AccountsIndex[i]
 		local account = GetAccount(name, xPlayer.identifier)
 
 		if account == nil then
-
 			MySQL.Async.execute('INSERT INTO addon_account_data (account_name, money, owner) VALUES (@account_name, @money, @owner)',
 			{
 				['@account_name'] = name,
@@ -101,9 +92,7 @@ AddEventHandler('esx:playerLoaded', function(source)
 		end
 
 		table.insert(addonAccounts, account)
-
 	end
 
 	xPlayer.set('addonAccounts', addonAccounts)
-
 end)