aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-01-24 19:27:17 +0100
committerKim Alvefur <zash@zash.se>2017-01-24 19:27:17 +0100
commitd020c4eab4880ae5989839ede92ff847d65dd5a8 (patch)
tree2421f921894940e72b7ce82614ed89c20fd9edf3
parent468d3db1a1eb87026d20303eeda6ff46d459df80 (diff)
parent1d99ff3da67567f998e7e1e3fefd9699d76ff84c (diff)
downloadprosody-d020c4eab4880ae5989839ede92ff847d65dd5a8.tar.gz
prosody-d020c4eab4880ae5989839ede92ff847d65dd5a8.zip
Merge 0.10->trunk
-rw-r--r--plugins/mod_storage_sql.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/mod_storage_sql.lua b/plugins/mod_storage_sql.lua
index 7bbae40c..dcb00dd6 100644
--- a/plugins/mod_storage_sql.lua
+++ b/plugins/mod_storage_sql.lua
@@ -287,7 +287,7 @@ end
function archive_store:delete(username, query)
query = query or {};
local user,store = username,self.store;
- local stmt, err = engine:transaction(function()
+ local ok, stmt = engine:transaction(function()
local sql_query = "DELETE FROM `prosodyarchive` WHERE %s;";
local args = { host, user or "", store, };
local where = { "`host` = ?", "`user` = ?", "`store` = ?", };
@@ -300,7 +300,7 @@ function archive_store:delete(username, query)
sql_query = sql_query:format(t_concat(where, " AND "));
return engine:delete(sql_query, unpack(args));
end);
- return stmt and stmt:affected() or nil, err;
+ return ok and stmt:affected(), stmt;
end
local stores = {