aboutsummaryrefslogtreecommitdiffstats
path: root/tools/migration/migrator
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2011-06-03 00:58:09 +0100
committerMatthew Wild <mwild1@gmail.com>2011-06-03 00:58:09 +0100
commit648ce900d7f396770747c864758c20c04c77d143 (patch)
treec714d4a7da3a44ffa9e988531b178b8c0693d73b /tools/migration/migrator
parentc3c3bd3a5d36d36a0ee31a660ad3efd2d1a2a86d (diff)
parent27bc9300b89d76c5ef59e13653a9d67267830522 (diff)
downloadprosody-648ce900d7f396770747c864758c20c04c77d143.tar.gz
prosody-648ce900d7f396770747c864758c20c04c77d143.zip
Merge 0.8->trunk
Diffstat (limited to 'tools/migration/migrator')
-rw-r--r--tools/migration/migrator/prosody_files.lua7
-rw-r--r--tools/migration/migrator/prosody_sql.lua18
2 files changed, 24 insertions, 1 deletions
diff --git a/tools/migration/migrator/prosody_files.lua b/tools/migration/migrator/prosody_files.lua
index 4e42f564..be0c49f8 100644
--- a/tools/migration/migrator/prosody_files.lua
+++ b/tools/migration/migrator/prosody_files.lua
@@ -98,7 +98,12 @@ function reader(input)
local x = iter();
if x then
dm.set_data_path(path);
- x.data = assert(dm.load(x.user, x.host, x.store));
+ local err;
+ x.data, err = dm.load(x.user, x.host, x.store);
+ if x.data == nil and err then
+ error(("Error loading data at path %s for %s@%s (%s store)")
+ :format(path, x.user or "<nil>", x.host or "<nil>", x.store or "<nil>"), 0);
+ end
return x;
end
end;
diff --git a/tools/migration/migrator/prosody_sql.lua b/tools/migration/migrator/prosody_sql.lua
index 50ae8c40..ec86417c 100644
--- a/tools/migration/migrator/prosody_sql.lua
+++ b/tools/migration/migrator/prosody_sql.lua
@@ -21,6 +21,8 @@ local function create_table(connection, params)
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);
@@ -40,6 +42,22 @@ local function create_table(connection, params)
ok, err = assert(stmt:execute());
commit_ok, commit_err = assert(connection:commit());
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
+ print("Database table automatically upgraded");
+ end
+ end
+ repeat until not stmt:fetch();
+ end
end
end
end