From 965473b9a691232914d00db09b251c47667700a2 Mon Sep 17 00:00:00 2001 From: FPtje Date: Sat, 8 Dec 2012 12:14:49 +0100 Subject: [PATCH] Fixed some SQLite errors --- lua/FPP_MySQLCore.lua | 4 ++-- lua/autorun/server/FPP_Settings.lua | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lua/FPP_MySQLCore.lua b/lua/FPP_MySQLCore.lua index 6cd35679b..a4c973681 100644 --- a/lua/FPP_MySQLCore.lua +++ b/lua/FPP_MySQLCore.lua @@ -43,10 +43,9 @@ function FPPDB.Query(query, callback) query:start() return end - sql.Begin() + local Result = sql.Query(query) - sql.Commit() -- Otherwise it won't save, don't ask me why if callback then callback(Result) end return Result end @@ -73,6 +72,7 @@ function FPPDB.QueryValue(query, callback) query:start() return end + local val = sql.QueryValue(query) if callback then callback(val) end diff --git a/lua/autorun/server/FPP_Settings.lua b/lua/autorun/server/FPP_Settings.lua index 2c52900c3..2f4cb2992 100644 --- a/lua/autorun/server/FPP_Settings.lua +++ b/lua/autorun/server/FPP_Settings.lua @@ -279,7 +279,7 @@ local function RetrieveBlocked() for k,v in pairs(FPP.Blocked) do for a,b in pairs(v) do count = count + 1 - FPPDB.Query("INSERT INTO FPP_BLOCKED1 VALUES(".. count ..", " .. sql.SQLStr(k) .. ", " .. sql.SQLStr(b) .. ");") + FPPDB.Query("REPLACE INTO FPP_BLOCKED1 VALUES(".. count ..", " .. sql.SQLStr(k) .. ", " .. sql.SQLStr(b) .. ");") end end FPPDB.Commit() @@ -353,7 +353,7 @@ end local function RetrieveGroups() FPPDB.Query("SELECT * FROM FPP_GROUPS3;", function(data) if type(data) ~= "table" then - FPPDB.Query("INSERT INTO FPP_GROUPS3 VALUES('default', 1);") + FPPDB.Query("REPLACE INTO FPP_GROUPS3 VALUES('default', 1);") FPP.Groups['default'] = {} FPP.Groups['default'].tools = {} FPP.Groups['default'].allowdefault = true