From a4370a9db89edafd2bbe54e59644f36db49ce07d Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Tue, 24 Jan 2017 19:26:40 +0100 Subject: mod_storage_sql: Fix to use correct order for return values from transaction (thanks postblue) --- plugins/mod_storage_sql.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'plugins') 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 = { -- cgit v1.2.3