diff options
| author | Matthew Wild <mwild1@gmail.com> | 2015-07-08 15:06:20 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2015-07-08 15:06:20 +0100 |
| commit | 0c0e1786bf64f7b58e1aa020749784a8e4080a0e (patch) | |
| tree | 4cbab166ddd32722595f72045d2fc2de9b409fb1 | |
| parent | 7d98c3be73c23f8da72b500ebd7f6933a52591cb (diff) | |
| download | prosody-0c0e1786bf64f7b58e1aa020749784a8e4080a0e.tar.gz prosody-0c0e1786bf64f7b58e1aa020749784a8e4080a0e.zip | |
util.sql: Use appropriate collation for the chosen character set - fixes MySQL silently ignoring our SET NAMES command when we use utf8mb4
| -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 562ac709..fc1191f9 100644 --- a/util/sql.lua +++ b/util/sql.lua @@ -268,12 +268,12 @@ function engine:set_encoding() -- to UTF-8 local set_names_query = "SET NAMES '%s';" local charset = "utf8"; if driver == "MySQL" then - set_names_query = set_names_query:gsub(";$", " COLLATE 'utf8_bin';"); 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;"; 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; return self:transaction(function() return self:execute(set_names_query:format(charset)); end); |