mod_storage_sql: Log error when failing to update MySQL schema

[prosody.git] / plugins / mod_storage_sql.lua

diff --git a/plugins/mod_storage_sql.lua b/plugins/mod_storage_sql.lua
index 07735cb21a6f8e0b64daf639e34a4b58fb6c8bc6..57331ac0a7c40895bd63990c5b07f1754b963bf7 100644 (file)
--- a/plugins/mod_storage_sql.lua
+++ b/plugins/mod_storage_sql.lua
@@ -64,23 +64,12 @@ local function connect()
        end
 end
 
-do -- process options to get a db connection
-       DBI = require "DBI";
-
-       params = params or { driver = "SQLite3" };
-       
-       if params.driver == "SQLite3" then
-               params.database = resolve_relative_path(prosody.paths.data or ".", params.database or "prosody.sqlite");
-       end
-       
-       assert(params.driver and params.database, "Both the SQL driver and the database need to be specified");
-       
-       assert(connect());
-       
-       -- Automatically create table, ignore failure (table probably already exists)
+local function create_table()
        local create_sql = "CREATE TABLE `prosody` (`host` TEXT, `user` TEXT, `store` TEXT, `key` TEXT, `type` TEXT, `value` TEXT);";
        if params.driver == "PostgreSQL" then
                create_sql = create_sql:gsub("`", "\"");
+       elseif params.driver == "MySQL" then
+               create_sql = create_sql:gsub("`value` TEXT", "`value` MEDIUMTEXT");
        end
        
        local stmt = connection:prepare(create_sql);
@@ -89,10 +78,71 @@ do -- process options to get a db connection
                local commit_ok = connection:commit();
                if ok and commit_ok then
                        module:log("info", "Initialized new %s database with prosody table", params.driver);
+                       local index_sql = "CREATE INDEX `prosody_index` ON `prosody` (`host`, `user`, `store`, `key`)";
+                       if params.driver == "PostgreSQL" then
+                               index_sql = index_sql:gsub("`", "\"");
+                       elseif params.driver == "MySQL" then
+                               index_sql = index_sql:gsub("`([,)])", "`(20)%1");
+                       end
+                       local stmt, err = connection:prepare(index_sql);
+                       local ok, commit_ok, commit_err;
+                       if stmt then
+                               ok, err = stmt:execute();
+                               commit_ok, commit_err = connection:commit();
+                       end
+                       if not(ok and commit_ok) then
+                               module:log("warn", "Failed to create index (%s), lookups may not be optimised", err or commit_err);
+                       end
+               else -- COMPAT: Upgrade tables from 0.8.0
+                       -- Failed to create, but check existing MySQL table here
+                       local stmt = connection:prepare("SHOW COLUMNS FROM prosody WHERE Field='value' and Type='text'");
+                       local ok = stmt:execute();
+                       local commit_ok = connection:commit();
+                       if ok and commit_ok then
+                               if stmt:rowcount() > 0 then
+                                       local stmt = connection:prepare("ALTER TABLE prosody MODIFY COLUMN `value` MEDIUMTEXT");
+                                       local ok = stmt:execute();
+                                       local commit_ok = connection:commit();
+                                       if ok and commit_ok then
+                                               module:log("info", "Database table automatically upgraded");
+                                       end
+                               end
+                               repeat until not stmt:fetch();
+                       else
+                               module:log("error", "Failed to upgrade database schema, please see http://prosody.im/doc/mysql for help");
+                       end
                end
        end
 end
 
+do -- process options to get a db connection
+       local ok;
+       prosody.unlock_globals();
+       ok, DBI = pcall(require, "DBI");
+       if not ok then
+               package.loaded["DBI"] = {};
+               module:log("error", "Failed to load the LuaDBI library for accessing SQL databases: %s", DBI);
+               module:log("error", "More information on installing LuaDBI can be found at http://prosody.im/doc/depends#luadbi");
+       end
+       prosody.lock_globals();
+       if not ok or not DBI.Connect then
+               return; -- Halt loading of this module
+       end
+
+       params = params or { driver = "SQLite3" };
+       
+       if params.driver == "SQLite3" then
+               params.database = resolve_relative_path(prosody.paths.data or ".", params.database or "prosody.sqlite");
+       end
+       
+       assert(params.driver and params.database, "Both the SQL driver and the database need to be specified");
+       
+       assert(connect());
+       
+       -- Automatically create table, ignore failure (table probably already exists)
+       create_table();
+end
+
 local function serialize(value)
        local t = type(value);
        if t == "string" or t == "boolean" or t == "number" then