aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/mod_storage_sql.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-02-20 01:26:03 +0100
committerKim Alvefur <zash@zash.se>2017-02-20 01:26:03 +0100
commit45295a38d8ff09e522b50e476256e1ff2b6dd101 (patch)
tree9b9151186b29d307c03b845e459bcf7b40942fde /plugins/mod_storage_sql.lua
parent6f66f499f60b6a2d8a16b76bf41c8d75aba32c5d (diff)
downloadprosody-45295a38d8ff09e522b50e476256e1ff2b6dd101.tar.gz
prosody-45295a38d8ff09e522b50e476256e1ff2b6dd101.zip
mod_storage_sql: Make archive:append() to return the id (or key) as first return value
Diffstat (limited to 'plugins/mod_storage_sql.lua')
-rw-r--r--plugins/mod_storage_sql.lua4
1 files changed, 3 insertions, 1 deletions
diff --git a/plugins/mod_storage_sql.lua b/plugins/mod_storage_sql.lua
index 07ff4c27..3fa3230b 100644
--- a/plugins/mod_storage_sql.lua
+++ b/plugins/mod_storage_sql.lua
@@ -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