util.sql: Make set_encoding() return failure of SET NAMES

diff --git a/util/sql.lua b/util/sql.lua
index d0da930279fcf7ef1a17029d12c373100a98d0b6..6622ad56ad7c81782e4850ccccf8031c4e2429ad 100644 (file)
--- a/util/sql.lua
+++ b/util/sql.lua
@@ -279,7 +279,13 @@ function engine:set_encoding() -- to UTF-8
                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 };