# HG changeset patch # User Matthew Wild # Date 1436364864 -3600 # Node ID e961ac4efbb3f1bee106ac690064e3416289ed78 # Parent ea43a5af31ca9a8d3cb94a3181b8e65133414347 util.sql: Make set_encoding() return failure of SET NAMES diff -r ea43a5af31ca -r e961ac4efbb3 util/sql.lua --- a/util/sql.lua Wed Jul 08 15:10:25 2015 +0100 +++ b/util/sql.lua Wed Jul 08 15:14:24 2015 +0100 @@ -279,7 +279,13 @@ set_names_query = set_names_query:gsub(";$", (" COLLATE '%s';"):format(charset.."_bin")); end self.charset = charset; - return self:transaction(function() return self:execute(set_names_query:format(charset)); end); + log("debug", "Using encoding '%s' for database connection", charset); + local ok, err = self:transaction(function() return self:execute(set_names_query:format(charset)); end); + if not ok then + return ok, err; + end + + return true; end local engine_mt = { __index = engine };