Software / code / prosody
Changeset
7429:713d6f8e84d0
Merge 0.10->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sun, 22 May 2016 02:16:57 +0100 |
| parents | 7427:bf43a08e5a74 (current diff) 7428:f791651ee334 (diff) |
| children | 7434:3b16f2802ef0 |
| files | |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/util/sql.lua Sun May 15 16:55:19 2016 +0200 +++ b/util/sql.lua Sun May 22 02:16:57 2016 +0100 @@ -2,7 +2,7 @@ local setmetatable, getmetatable = setmetatable, getmetatable; local ipairs, unpack, select = ipairs, table.unpack or unpack, select; --luacheck: ignore 113 local tonumber, tostring = tonumber, tostring; -local assert, xpcall, debug_traceback = assert, xpcall, debug.traceback; +local assert, pcall, xpcall, debug_traceback = assert, pcall, xpcall, debug.traceback; local t_concat = table.concat; local s_char = string.char; local log = require "util.logger".init("sql");
