mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-04 21:57:45 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

mod_storage_sql: Pass variables as arguments instead of upvalues

Browse source 
Probably a workaround for the lack of argument passing when using xpcall
in Lua 5.1, no longer relevant.
This commit is contained in:
Kim Alvefur 2023-07-22 15:22:54 +02:00
parent 6aa08d7c58
commit 0df158712d
1 changed files with 5 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

15
plugins/mod_storage_sql.lua
View file

@ -61,9 +61,8 @@ local function deserialize(t, value)
end
local host = module.host;
local user, store;
local function keyval_store_get()
local function keyval_store_get(user, store)
local haveany;
local result = {};
local select_sql = [[
@ -88,7 +87,7 @@ local function keyval_store_get()
return result;
end
end
local function keyval_store_set(data)
local function keyval_store_set(data, user, store)
local delete_sql = [[
DELETE FROM "prosody"
WHERE "host"=? AND "user"=? AND "store"=?
@ -123,19 +122,15 @@ end
local keyval_store = {};
keyval_store.__index = keyval_store;
function keyval_store:get(username)
user, store = username, self.store;
local ok, result = engine:transaction(keyval_store_get);
local ok, result = engine:transaction(keyval_store_get, username, self.store);
if not ok then
module:log("error", "Unable to read from database %s store for %s: %s", store, username or "<host>", result);
module:log("error", "Unable to read from database %s store for %s: %s", self.store, username or "<host>", result);
return nil, result;
end
return result;
end
function keyval_store:set(username, data)
user,store = username,self.store;
return engine:transaction(function()
return keyval_store_set(data);
end);
return engine:transaction(keyval_store_set, data, username, self.store);
end
function keyval_store:users()
local ok, result = engine:transaction(function()