starred/esx_core-esx-framework
1
0
Fork 0
mirror of https://github.com/esx-framework/esx_core.git synced 2026-09-04 16:23:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(server): connection string parser

Browse Source
This commit is contained in:
Linden
2021-12-02 01:48:22 +11:00
parent 150ec165fc
commit 874eeef86c
2 changed files with 19 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fxmanifest.lua
+1 -1
View File
@@ -1,7 +1,7 @@
fx_version 'cerulean' fx_version 'cerulean'
game 'gta5' game 'gta5'
description 'https://github.com/thelindat/esx_multicharacter' description 'https://github.com/thelindat/esx_multicharacter'
version '1.4.1' version '1.4.2'
lua54 'yes' lua54 'yes'
dependencies { dependencies {
server/main.lua
+18 -22
View File
@@ -1,28 +1,24 @@
local function DATABASE()
local connectionString = GetConvar('mysql_connection_string', '');
if connectionString == '' then
error(connectionString..'\n^1Unable to start Multicharacter - unable to determine database from mysql_connection_string^0', 0)
elseif connectionString:find('mysql://') then
if connectionString:find('?*$') then
return connectionString:match('[^/][%w]*[?$]'):sub(0, -2)
else
return connectionString:match('[^/][%w]*$')
end
else
connectionString = {string.strsplit(';', connectionString)}
for i=1, #connectionString do
local v = connectionString[i]
if v:match('database') then
return v:sub(10, #v)
end
end
end
end
if not ESX then if not ESX then
error('\n^1Unable to start Multicharacter - you must be using ESX Legacy^0') error('\n^1Unable to start Multicharacter - you must be using ESX Legacy^0')
elseif ESX.GetConfig().Multichar == true then elseif ESX.GetConfig().Multichar == true then
DATABASE = DATABASE() local DATABASE do
local connectionString = GetConvar('mysql_connection_string', '');
if connectionString == '' then
error(connectionString..'\n^1Unable to start Multicharacter - unable to determine database from mysql_connection_string^0', 0)
elseif connectionString:find('mysql://') then
connectionString = connectionString:sub(9, -1)
DATABASE = connectionString:sub(connectionString:find('/')+1, -1):gsub('[%?]+[%w%p]*$', '')
else
connectionString = {string.strsplit(';', connectionString)}
for i=1, #connectionString do
local v = connectionString[i]
if v:match('database') then
DATABASE = v:sub(10, #v)
end
end
end
end
local DB_TABLES = {} local DB_TABLES = {}
local FETCH = nil local FETCH = nil
local SLOTS = Config.Slots or 4 local SLOTS = Config.Slots or 4