mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-03 21:27:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

util.sql: Don't break out of result retreival loops

Browse source
This commit is contained in:
Kim Alvefur 2016-03-13 18:31:53 +01:00
parent 144597d16b
commit 2b1ff306c3
1 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

20
util/sql.lua
View file

@ -299,19 +299,21 @@ function engine:set_encoding() -- to UTF-8
local driver = self.params.driver;
if driver == "SQLite3" then
return self:transaction(function()
if self:select"PRAGMA encoding;"()[1] == "UTF-8" then
self.charset = "utf8";
for encoding in self:select"PRAGMA encoding;" do
if encoding[1] == "UTF-8" then
self.charset = "utf8";
end
end
end);
end
local set_names_query = "SET NAMES '%s';"
local charset = "utf8";
if driver == "MySQL" then
local ok, charsets = self:transaction(function()
return self:select"SELECT `CHARACTER_SET_NAME` FROM `information_schema`.`CHARACTER_SETS` WHERE `CHARACTER_SET_NAME` LIKE 'utf8%' ORDER BY MAXLEN DESC LIMIT 1;";
self:transaction(function()
for row in self:select"SELECT `CHARACTER_SET_NAME` FROM `information_schema`.`CHARACTER_SETS` WHERE `CHARACTER_SET_NAME` LIKE 'utf8%' ORDER BY MAXLEN DESC LIMIT 1;" do
charset = row and row[1] or charset;
end
end);
local row = ok and charsets();
charset = row and row[1] or charset;
set_names_query = set_names_query:gsub(";$", (" COLLATE '%s';"):format(charset.."_bin"));
end
self.charset = charset;
@ -325,12 +327,16 @@ function engine:set_encoding() -- to UTF-8
local ok, actual_charset = self:transaction(function ()
return self:select"SHOW SESSION VARIABLES LIKE 'character_set_client'";
end);
local charset_ok;
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";
charset_ok = false;
end
end
if not charset_ok then
return false, "Failed to set connection encoding";
end
end
return true;