aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-11-07 09:29:04 +0100
committerKim Alvefur <zash@zash.se>2017-11-07 09:29:04 +0100
commitb65f1ed9c128529d27ebe05912cfd9a95ad25fc8 (patch)
treec5324b65d949a7b05c6acc45c22fa0e40085dbb5
parent30bb916e5656f1860d6d2c7808ade37c84c75c63 (diff)
parenteb07e55b143ffada5d2bf2b697996ee0bab4d2b5 (diff)
downloadprosody-b65f1ed9c128529d27ebe05912cfd9a95ad25fc8.tar.gz
prosody-b65f1ed9c128529d27ebe05912cfd9a95ad25fc8.zip
Merge 0.10->trunk
-rw-r--r--util/sql.lua3
1 files changed, 2 insertions, 1 deletions
diff --git a/util/sql.lua b/util/sql.lua
index 71158d4c..d964025e 100644
--- a/util/sql.lua
+++ b/util/sql.lua
@@ -236,7 +236,8 @@ function engine:_transaction(func, ...)
if success then
log("debug", "SQL transaction success [%s]", tostring(func));
local ok, err = self.conn:commit();
- if not ok then return ok, err; end -- commit failed
+ -- LuaDBI doesn't actually return an error message here, just a boolean
+ if not ok then return ok, err or "commit failed"; end
return success, a, b, c;
else
log("debug", "SQL transaction failure [%s]: %s", tostring(func), a.err);