Skip to content

lua consistency #7

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

Merged
zoephix merged 2 commits into from
Feb 14, 2021
Merged

lua consistency #7

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2d1c281
lua consistency
TovarischPootis Feb 14, 2021
b85c570
Update sv_database.lua
zoephix Feb 14, 2021
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
12 changes: 5 additions & 7 deletions gamemode/core/libs/sv_database.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,10 +76,8 @@ modules.tmysql4 = {

local queryStatus, queryError, affected, lastID, time, data = result.status, result.error, result.affected, result.lastid, result.time, result.data

if (queryStatus and queryStatus == true) then
if (callback) then
callback(data, lastID)
end
if (queryStatus and queryStatus == true and callback) then
callback(data, lastID)
end
else
file.Write("nut_queryerror.txt", query)
Expand Down Expand Up @@ -189,7 +187,7 @@ modules.mysqloo = {

for k, db in pairs(nut.db.pool) do
local queueSize = db:queueSize()
if (!lowest || queueSize < lowestCount) then
if (!lowest or queueSize < lowestCount) then
lowest = db
lowestCount = queueSize
lowestIndex = k
Expand All @@ -207,7 +205,7 @@ modules.mysqloo = {
return setNetVar("dbError", system.IsWindows() and "Server is missing VC++ redistributables!" or "Server is missing binaries for mysqloo!")
end

if (mysqloo.VERSION != "9" || !mysqloo.MINOR_VERSION || tonumber(mysqloo.MINOR_VERSION) < 1) then
if (mysqloo.VERSION != "9" or !mysqloo.MINOR_VERSION or tonumber(mysqloo.MINOR_VERSION) < 1) then
MsgC(Color(255, 0, 0), "You are using an outdated mysqloo version\n")
MsgC(Color(255, 0, 0), "Download the latest mysqloo9 from here\n")
MsgC(Color(86, 156, 214), "https://github.com/syl0r/MySQLOO/releases")
Expand Down Expand Up @@ -251,7 +249,7 @@ modules.mysqloo = {
if (callback) then
callback()
end

hook.Run("OnMySQLOOConnected")
end
end
Expand Down