# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1485282437 -3600
# Node ID 9eb13c14eaabb53239b47efcb977b0f14b4b9906
# Parent  db48b1697234f8bf72e64c2f720e536ee887b08a# Parent  14fe60a65c69468b363bcad9abcbd0dded2a7f28
Merge 0.10->trunk

diff -r db48b1697234 -r 9eb13c14eaab plugins/mod_storage_sql.lua
--- a/plugins/mod_storage_sql.lua	Mon Jan 23 19:34:14 2017 +0100
+++ b/plugins/mod_storage_sql.lua	Tue Jan 24 19:27:17 2017 +0100
@@ -287,7 +287,7 @@
 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 @@
 		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 = {