diff options
| author | Kim Alvefur <zash@zash.se> | 2017-11-07 09:29:04 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2017-11-07 09:29:04 +0100 |
| commit | d9535fcf4fc359d3003e4a1c49b2a437d9dda1af (patch) | |
| tree | c5324b65d949a7b05c6acc45c22fa0e40085dbb5 | |
| parent | cb98c5a29371257b5049f08c35dfdbe5b7ba950d (diff) | |
| parent | d2b548562ff5ed2d39874aa460cc573241c5fe35 (diff) | |
| download | prosody-d9535fcf4fc359d3003e4a1c49b2a437d9dda1af.tar.gz prosody-d9535fcf4fc359d3003e4a1c49b2a437d9dda1af.zip | |
Merge 0.10->trunk
| -rw-r--r-- | util/sql.lua | 3 |
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); |