mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-03 21:27:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

util.sql: Preserve 3rd and 4th return values from transaction (fixes #1434) (thanks mrdoctorwho)

Browse source
This commit is contained in:
Kim Alvefur 2019-09-28 18:24:28 +02:00
parent 067ae06b1a
commit 272944f4df
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
util/sql.lua
View file

@ -218,14 +218,14 @@ function engine:_transaction(func, ...)
end
end
function engine:transaction(...)
local ok, ret = self:_transaction(...);
local ok, ret, b, c = self:_transaction(...);
if not ok then
local conn = self.conn;
if not conn or not conn:ping() then
log("debug", "Database connection was closed. Will reconnect and retry.");
self.conn = nil;
log("debug", "Retrying SQL transaction [%s]", (...));
ok, ret = self:_transaction(...);
ok, ret, b, c = self:_transaction(...);
log("debug", "SQL transaction retry %s", ok and "succeeded" or "failed");
else
log("debug", "SQL connection is up, so not retrying");
@ -234,7 +234,7 @@ function engine:transaction(...)
log("error", "Error in SQL transaction: %s", ret);
end
end
return ok, ret;
return ok, ret, b, c;
end
function engine:_create_index(index)
local sql = "CREATE INDEX \""..index.name.."\" ON \""..index.table.."\" (";