mod_storage_sql2: Split up setting of encoding and table upgrade code

[prosody.git] / plugins / mod_storage_sql2.lua

diff --git a/plugins/mod_storage_sql2.lua b/plugins/mod_storage_sql2.lua
index 174bad78dd36ebc887402dee8e077003fa303433..7e4de79b76d5b4b4ef618828c78c8eda82b55e2f 100644 (file)
--- a/plugins/mod_storage_sql2.lua
+++ b/plugins/mod_storage_sql2.lua
@@ -108,8 +108,9 @@ local function set_encoding()
        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 @@ do -- process options to get a db connection
 
        -- Encoding mess
        set_encoding();
+       upgrade_table();
 
        -- Automatically create table, ignore failure (table probably already exists)
        create_table();