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

mod_storage_sql2: Fix iteration over users and stores

Browse source
This commit is contained in:
Kim Alvefur 2013-07-10 12:08:44 +02:00
parent 01de781b7b
commit 06561ae513
1 changed files with 16 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

18
plugins/mod_storage_sql2.lua
View file

@ -2,6 +2,16 @@
local json = require "util.json"; local json = require "util.json";
local resolve_relative_path = require "core.configmanager".resolve_relative_path; local resolve_relative_path = require "core.configmanager".resolve_relative_path;
local unpack = unpack
local function iterator(result)
return function(result)
local row = result();
if row ~= nil then
return unpack(row);
end
end, result, nil;
end
local mod_sql = module:require("sql"); local mod_sql = module:require("sql");
local params = module:get_option("sql"); local params = module:get_option("sql");
@ -200,9 +210,11 @@ function keyval_store:set(username, data)
end); end);
end end
function keyval_store:users() function keyval_store:users()
return engine:transaction(function() local ok, result = engine:transaction(function()
return engine:select("SELECT DISTINCT `user` FROM `prosody` WHERE `host`=? AND `store`=?", host, self.store); return engine:select("SELECT DISTINCT `user` FROM `prosody` WHERE `host`=? AND `store`=?", host, self.store);
end); end);
if not ok then return ok, result end
return iterator(result);
end end
local driver = {}; local driver = {};
@ -220,9 +232,11 @@ function driver:stores(username)
if username == true or not username then if username == true or not username then
username = ""; username = "";
end end
return engine:transaction(function() local ok, result = engine:transaction(function()
return engine:select(sql, host, username); return engine:select(sql, host, username);
end); end);
if not ok then return ok, result end
return iterator(result);
end end
function driver:purge(username) function driver:purge(username)