aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/mod_storage_sql.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-01-24 19:26:40 +0100
committerKim Alvefur <zash@zash.se>2017-01-24 19:26:40 +0100
commit1d99ff3da67567f998e7e1e3fefd9699d76ff84c (patch)
treee9ac24608601e57c365de8cc0f7090caf347c333 /plugins/mod_storage_sql.lua
parentb54ba7235144f22208ce22ca31da705a62531935 (diff)
downloadprosody-1d99ff3da67567f998e7e1e3fefd9699d76ff84c.tar.gz
prosody-1d99ff3da67567f998e7e1e3fefd9699d76ff84c.zip
mod_storage_sql: Fix to use correct order for return values from transaction (thanks postblue)
Diffstat (limited to 'plugins/mod_storage_sql.lua')
-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 a79f30fc..07ff4c27 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 = {