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

Merge 0.9->trunk

Browse source
This commit is contained in:
Matthew Wild 2012-09-19 12:14:08 +01:00
commit a868b41b58
6 changed files with 78 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

17
plugins/mod_storage_sql.lua
View file

@ -374,10 +374,9 @@ function driver:open(store, typ)
return nil, "unsupported-store";
end
function driver:list_stores(username) -- Not to be confused with the list store type
local sql = (username == true
and "SELECT DISTINCT `store` FROM `prosody` WHERE `host`=? AND `user`!=?"
or "SELECT DISTINCT `store` FROM `prosody` WHERE `host`=? AND `user`=?");
function driver:stores(username)
local sql = "SELECT DISTINCT `store` FROM `prosody` WHERE `host`=? AND `user`" ..
(username == true and "!=?" or "=?");
if username == true or not username then
username = "";
end
@ -385,11 +384,11 @@ function driver:list_stores(username) -- Not to be confused with the list store
if not stmt then
return rollback(nil, err);
end
local stores = {};
for row in stmt:rows() do
stores[#stores+1] = row[1];
end
return commit(stores);
local next = stmt:rows();
return commit(function()
local row = next();
return row and row[1];
end);
end
function driver:purge(username)