diff options
| author | Matthew Wild <mwild1@gmail.com> | 2016-05-22 02:16:57 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2016-05-22 02:16:57 +0100 |
| commit | f66e61803bb5b49d2e13b2b93c5b5e4b05d2233b (patch) | |
| tree | 53931683faf71081483998cb1589b8c0ac77d063 | |
| parent | 04d0a3f94cd9d6d544bf064cc47f85f45cf1d415 (diff) | |
| parent | 8a32b7f2c3787e5fa3c235bc5681930f7873f508 (diff) | |
| download | prosody-f66e61803bb5b49d2e13b2b93c5b5e4b05d2233b.tar.gz prosody-f66e61803bb5b49d2e13b2b93c5b5e4b05d2233b.zip | |
Merge 0.10->trunk
| -rw-r--r-- | util/sql.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/util/sql.lua b/util/sql.lua index acdf9c63..843e7dda 100644 --- a/util/sql.lua +++ b/util/sql.lua @@ -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"); |