aboutsummaryrefslogtreecommitdiffstats
path: root/tools/migration/migrator
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2011-06-07 01:29:34 +0100
committerMatthew Wild <mwild1@gmail.com>2011-06-07 01:29:34 +0100
commit7d8433ac020c30ba9d3a73956ecabf6822e97d76 (patch)
treeb14478387b7fa4ac1cf1e954ca9515f983df0291 /tools/migration/migrator
parentcc5269517df6d8643437875bb49baec4bd3e6f87 (diff)
parent7c6db5e1b2d8579501981b1010574f0363330d28 (diff)
downloadprosody-7d8433ac020c30ba9d3a73956ecabf6822e97d76.tar.gz
prosody-7d8433ac020c30ba9d3a73956ecabf6822e97d76.zip
Merge 0.8->trunk
Diffstat (limited to 'tools/migration/migrator')
-rw-r--r--tools/migration/migrator/prosody_sql.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/migration/migrator/prosody_sql.lua b/tools/migration/migrator/prosody_sql.lua
index ec86417c..27b5835e 100644
--- a/tools/migration/migrator/prosody_sql.lua
+++ b/tools/migration/migrator/prosody_sql.lua
@@ -42,7 +42,7 @@ 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
+ elseif params.driver == "MySQL" then -- 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();