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

Merge 0.10->trunk

Browse source
This commit is contained in:
Kim Alvefur 2017-02-20 01:46:54 +01:00
commit 50992abb10
3 changed files with 22 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
plugins/mod_storage_sql.lua
View file

@ -187,7 +187,7 @@ function archive_store:append(username, key, value, when, with)
when, with, value = value, when, with;
end
local user,store = username,self.store;
return engine:transaction(function()
local ok, key = engine:transaction(function()
if key then
engine:delete("DELETE FROM `prosodyarchive` WHERE `host`=? AND `user`=? AND `store`=? AND `key`=?", host, user or "", store, key);
else
@ -197,6 +197,8 @@ function archive_store:append(username, key, value, when, with)
engine:insert("INSERT INTO `prosodyarchive` (`host`, `user`, `store`, `when`, `with`, `key`, `type`, `value`) VALUES (?,?,?,?,?,?,?,?)", host, user or "", store, when, with, key, t, value);
return key;
end);
if not ok then return ok, key; end
return key;
end
-- Helpers for building the WHERE clause