Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(esx_multicharacter/server/modules/database): improve database name extraction #1515

Closed
wants to merge 1 commit into from
+4 −10
Closed

fix(esx_multicharacter/server/modules/database): improve database name extraction #1515

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 4 additions & 10 deletions [core]/esx_multicharacter/server/modules/database.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,11 @@ function Database:GetConnection()

self.name = connectionString:sub(connectionString:find("/") + 1, -1):gsub("[%?]+[%w%p]*$", "")
self.found = true
elseif connectionString:find("database=") then
self.name = connectionString:match("database=([^;?]+)"):gsub("[%?]+[%w%p]*$", "")
self.found = true
else
local connectionExtracted = { string.strsplit(";", connectionString) }

for i = 1, #connectionExtracted do
local v = connectionExtracted[i]
if v:match("database") then
self.name = connectionString:sub(connectionString:find("/") + 1, -1):gsub("[%?]+[%w%p]*$", "")
self.found = true
break
end
end
error(connectionString .. "\n^1Unable to start Multicharacter - unable to get database name from mysql_connection_string^0", 0)
end
end

Expand Down
Loading