From c38e034cf497a13f5f813b7d5217102ffb3677d9 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Wed, 8 Jul 2015 15:25:42 +0100 Subject: util.sql: Add safety check to ensure our chosen connection charset is actually being used (MySQL) --- util/sql.lua | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/util/sql.lua b/util/sql.lua index 693b67d9..f934bbdf 100644 --- a/util/sql.lua +++ b/util/sql.lua @@ -286,6 +286,18 @@ function engine:set_encoding() -- to UTF-8 return ok, err; end + if driver == "MySQL" then + local ok, actual_charset = self:transaction(function () + return self:select"SHOW SESSION VARIABLES LIKE 'character_set_client'"; + end); + for row in actual_charset do + if row[2] ~= charset then + log("error", "MySQL %s is actually %q (expected %q)", row[1], row[2], charset); + return false, "Failed to set connection encoding"; + end + end + end + return true; end local engine_mt = { __index = engine }; -- cgit v1.2.3