Software / code / prosody
Changeset
8379:2a0915aa6131
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 07 Nov 2017 09:29:04 +0100 |
| parents | 8377:58cdbbe3b86a (current diff) 8378:6a098961bc00 (diff) |
| children | 8380:a597ff326758 |
| files | |
| diffstat | 1 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/util/sql.lua Tue Nov 07 02:32:45 2017 +0100 +++ b/util/sql.lua Tue Nov 07 09:29:04 2017 +0100 @@ -236,7 +236,8 @@ 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);
