Software / code / prosody
Changeset
5881:12d12bda4b8c
mod_storage_sql2: Split up setting of encoding and table upgrade code
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Mon, 28 Oct 2013 21:34:55 +0100 |
| parents | 5874:3321a4b3e6c4 |
| children | 5882:fbba2997aabb |
| files | plugins/mod_storage_sql2.lua |
| diffstat | 1 files changed, 3 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/mod_storage_sql2.lua Tue Oct 15 10:47:34 2013 +0200 +++ b/plugins/mod_storage_sql2.lua Mon Oct 28 21:34:55 2013 +0100 @@ -108,8 +108,9 @@ local success,err = engine:transaction(function() return engine:execute(set_names_query); end); if not success then module:log("error", "Failed to set database connection encoding to UTF8: %s", err); - return; end +end +local function upgrade_table() if params.driver == "MySQL" then -- COMPAT w/pre-0.9: Upgrade tables to UTF-8 if not already local check_encoding_query = "SELECT `COLUMN_NAME`,`COLUMN_TYPE` FROM `information_schema`.`columns` WHERE `TABLE_NAME`='prosody' AND ( `CHARACTER_SET_NAME`!='utf8' OR `COLLATION_NAME`!='utf8_bin' );"; @@ -149,6 +150,7 @@ -- Encoding mess set_encoding(); + upgrade_table(); -- Automatically create table, ignore failure (table probably already exists) create_table();
