aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2011-06-11 02:16:26 +0100
committerMatthew Wild <mwild1@gmail.com>2011-06-11 02:16:26 +0100
commit8ec24c7bf7bb143b106babeba5371f85c461f6d2 (patch)
treedfd6563c27531493d62304d49a11df4f1a56f1bd
parent089b80680f8dc0e5d2249662c01012a819c94c23 (diff)
downloadprosody-8ec24c7bf7bb143b106babeba5371f85c461f6d2.tar.gz
prosody-8ec24c7bf7bb143b106babeba5371f85c461f6d2.zip
mod_storage_sql: Add extra logging and error handling around table creationvault/0.8.20.8.2
-rw-r--r--plugins/mod_storage_sql.lua15
1 files changed, 11 insertions, 4 deletions
diff --git a/plugins/mod_storage_sql.lua b/plugins/mod_storage_sql.lua
index 59583def..6a2d36f1 100644
--- a/plugins/mod_storage_sql.lua
+++ b/plugins/mod_storage_sql.lua
@@ -75,7 +75,7 @@ local function create_table()
create_sql = create_sql:gsub("`value` TEXT", "`value` MEDIUMTEXT");
end
- local stmt = connection:prepare(create_sql);
+ local stmt, err = connection:prepare(create_sql);
if stmt then
local ok = stmt:execute();
local commit_ok = connection:commit();
@@ -103,18 +103,25 @@ local function create_table()
local commit_ok = connection:commit();
if ok and commit_ok then
if stmt:rowcount() > 0 then
+ module:log("info", "Upgrading database schema...");
local stmt = connection:prepare("ALTER TABLE prosody MODIFY COLUMN `value` MEDIUMTEXT");
- local ok = stmt:execute();
+ local ok, err = stmt:execute();
local commit_ok = connection:commit();
if ok and commit_ok then
module:log("info", "Database table automatically upgraded");
+ else
+ module:log("error", "Failed to upgrade database schema (%s), please see "
+ .."http://prosody.im/doc/mysql for help",
+ err or "unknown error");
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
+ elseif params.driver ~= "SQLite3" then -- SQLite normally fails to prepare for existing table
+ module:log("warn", "Prosody was not able to automatically check/create the database table (%s), "
+ .."see http://prosody.im/doc/modules/mod_storage_sql#table_management for help.",
+ err or "unknown error");
end
end