Merge 0.10->trunk

3 files changed, 67 insertions, 80 deletions

diff --git a/plugins/mod_storage_none.lua b/plugins/mod_storage_none.lua
index 770b2832..e05a0fb7 100644
--- a/plugins/mod_storage_none.lua
+++ b/plugins/mod_storage_none.lua
@@ -33,4 +33,8 @@ function driver:find()
 	return function () end, 0;
 end
 
+function driver:delete()
+	return true;
+end
+
 module:provides("storage", driver);
diff --git a/tools/migration/migrator/prosody_sql.lua b/tools/migration/migrator/prosody_sql.lua
index b8876af0..3324c819 100644
--- a/tools/migration/migrator/prosody_sql.lua
+++ b/tools/migration/migrator/prosody_sql.lua
@@ -1,6 +1,6 @@
 
 local assert = assert;
-local have_DBI, DBI = pcall(require,"DBI");
+local have_DBI = pcall(require,"DBI");
 local print = print;
 local type = type;
 local next = next;
@@ -15,50 +15,25 @@ if not have_DBI then
 	error("LuaDBI (required for SQL support) was not found, please see https://prosody.im/doc/depends#luadbi", 0);
 end
 
+local sql = require "util.sql";
 
-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 function create_table(engine, name) -- luacheck: ignore 431/engine
+	local Table, Column, Index = sql.Table, sql.Column, sql.Index;
+
+	local ProsodyTable = Table {
+		name= name or "prosody";
+		Column { name="host", type="TEXT", nullable=false };
+		Column { name="user", type="TEXT", nullable=false };
+		Column { name="store", type="TEXT", nullable=false };
+		Column { name="key", type="TEXT", nullable=false };
+		Column { name="type", type="TEXT", nullable=false };
+		Column { name="value", type="MEDIUMTEXT", nullable=false };
+		Index { name="prosody_index", "host", "user", "store", "key" };
+	};
+	engine:transaction(function()
+		ProsodyTable:create(engine);
+	end);
 
-	local stmt = connection:prepare(create_sql);
-	if stmt then
-		local ok = stmt:execute();
-		local commit_ok = connection:commit();
-		if ok and commit_ok then
-			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 = assert(stmt:execute());
-				commit_ok, commit_err = assert(connection:commit());
-			end
-		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();
-			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
 
 local function serialize(value)
@@ -109,24 +84,45 @@ local function decode_user(item)
 	return userdata;
 end
 
+local function needs_upgrade(engine, params)
+	if params.driver == "MySQL" then
+		local success = engine:transaction(function()
+			local result = engine:execute("SHOW COLUMNS FROM prosody WHERE Field='value' and Type='text'");
+			assert(result:rowcount() == 0);
+
+			-- COMPAT w/pre-0.10: Upgrade table to UTF-8 if not already
+			local check_encoding_query = [[
+			SELECT `COLUMN_NAME`,`COLUMN_TYPE`,`TABLE_NAME`
+			FROM `information_schema`.`columns`
+			WHERE `TABLE_NAME` LIKE 'prosody%%' AND ( `CHARACTER_SET_NAME`!='%s' OR `COLLATION_NAME`!='%s_bin' );
+			]];
+			check_encoding_query = check_encoding_query:format(engine.charset, engine.charset);
+			local result = engine:execute(check_encoding_query);
+			assert(result:rowcount() == 0)
+		end);
+		if not success then
+			-- Upgrade required
+			return true;
+		end
+	end
+	return false;
+end
+
 local function reader(input)
-	local dbh = assert(DBI.Connect(
-		assert(input.driver, "no input.driver specified"),
-		assert(input.database, "no input.database specified"),
-		input.username, input.password,
-		input.host, input.port
-	));
-	assert(dbh:ping());
-	local stmt = assert(dbh:prepare("SELECT * FROM prosody"));
-	assert(stmt:execute());
+	local engine = assert(sql:create_engine(input, function (engine) -- luacheck: ignore 431/engine
+		if needs_upgrade(engine, input) then
+			error("Old database format detected. Please run: prosodyctl mod_storage_sql upgrade");
+		end
+	end));
 	local keys = {"host", "user", "store", "key", "type", "value"};
-	local f,s,val = stmt:rows(true);
+	assert(engine:connect());
+	local f,s,val = assert(engine:select("SELECT `host`, `user`, `store`, `key`, `type`, `value` FROM `prosody`;"));
 	-- get SQL rows, sorted
 	local iter = mtools.sorted {
 		reader = function() val = f(s, val); return val; end;
 		filter = function(x)
 			for i=1,#keys do
-				if not x[keys[i]] then return false; end -- TODO log error, missing field
+				x[ keys[i] ] = x[i];
 			end
 			if x.host  == "" then x.host  = nil; end
 			if x.user  == "" then x.user  = nil; end
@@ -154,26 +150,18 @@ local function reader(input)
 end
 
 local function writer(output, iter)
-	local dbh = assert(DBI.Connect(
-		assert(output.driver, "no output.driver specified"),
-		assert(output.database, "no output.database specified"),
-		output.username, output.password,
-		output.host, output.port
-	));
-	assert(dbh:ping());
-	create_table(dbh, output);
-	local stmt = assert(dbh:prepare("SELECT * FROM prosody"));
-	assert(stmt:execute());
-	local stmt = assert(dbh:prepare("DELETE FROM prosody"));
-	assert(stmt:execute());
+	local engine = assert(sql:create_engine(output, function (engine) -- luacheck: ignore 431/engine
+		if needs_upgrade(engine, output) then
+			error("Old database format detected. Please run: prosodyctl mod_storage_sql upgrade");
+		end
+		create_table(engine);
+	end));
+	assert(engine:connect());
+	assert(engine:delete("DELETE FROM prosody"));
 	local insert_sql = "INSERT INTO `prosody` (`host`,`user`,`store`,`key`,`type`,`value`) VALUES (?,?,?,?,?,?)";
-	if output.driver == "PostgreSQL" then
-		insert_sql = insert_sql:gsub("`", "\"");
-	end
-	local insert = assert(dbh:prepare(insert_sql));
 
 	return function(item)
-		if not item then assert(dbh:commit()) return dbh:close(); end -- end of input
+		if not item then return end -- end of input
 		local host = item.host or "";
 		local user = item.user or "";
 		for store, data in pairs(item.stores) do
@@ -182,14 +170,14 @@ local function writer(output, iter)
 			for key, value in pairs(data) do
 				if type(key) == "string" and key ~= "" then
 					local t, value = assert(serialize(value));
-					local ok, err = assert(insert:execute(host, user, store, key, t, value));
+					local ok, err = assert(engine:insert(insert_sql, host, user, store, key, t, value));
 				else
 					extradata[key] = value;
 				end
 			end
 			if next(extradata) ~= nil then
 				local t, extradata = assert(serialize(extradata));
-				local ok, err = assert(insert:execute(host, user, store, "", t, extradata));
+				local ok, err = assert(engine:insert(insert_sql, host, user, store, "", t, extradata));
 			end
 		end
 	end;
diff --git a/tools/migration/prosody-migrator.lua b/tools/migration/prosody-migrator.lua
index 6cff9f67..1219d891 100644
--- a/tools/migration/prosody-migrator.lua
+++ b/tools/migration/prosody-migrator.lua
@@ -77,13 +77,8 @@ function load_store_handler(name)
 	else
 		local ok, err = pcall(require, "migrator."..store_type);
 		if not ok then
-			if package.loaded["migrator."..store_type] then
-				print(("Error: Failed to initialize '%s' store:\n\t%s")
-					:format(name, err));
-			else
-				print(("Error: Unrecognised store type for '%s': %s")
-					:format(from_store, store_type));
-			end
+			print(("Error: Failed to initialize '%s' store:\n\t%s")
+				:format(name, err));
 			return false;
 		end
 	end