# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1492039824 -7200
# Node ID 32898a74b9d9114393e959a15236b73f49679cc6
# Parent  60207251863c1db63ad31f96c8c6ce539d76023c# Parent  8ca11201bfe74906e17d588dd992926f1b0b7928
Merge 0.10->trunk

diff -r 60207251863c -r 32898a74b9d9 plugins/mod_storage_sql.lua
--- a/plugins/mod_storage_sql.lua	Wed Apr 12 20:59:18 2017 +0200
+++ b/plugins/mod_storage_sql.lua	Thu Apr 13 01:30:24 2017 +0200
@@ -462,12 +462,12 @@
 	local changes = false;
 	if params.driver == "MySQL" then
 		local success,err = engine:transaction(function()
-			local result = engine:execute("SHOW COLUMNS FROM prosody WHERE Field='value' and Type='text'");
+			local result = engine:execute("SHOW COLUMNS FROM \"prosody\" WHERE \"Field\"='value' and \"Type\"='text'");
 			if result:rowcount() > 0 then
 				changes = true;
 				if apply_changes then
 					module:log("info", "Upgrading database schema...");
-					engine:execute("ALTER TABLE prosody MODIFY COLUMN \"value\" MEDIUMTEXT");
+					engine:execute("ALTER TABLE \"prosody\" MODIFY COLUMN \"value\" MEDIUMTEXT");
 					module:log("info", "Database table automatically upgraded");
 				end
 			end
@@ -484,12 +484,13 @@
 		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' );
+		WHERE "TABLE_NAME" LIKE 'prosody%%'
+		AND "TABLE_SCHEMA" = ?
+		AND ( "CHARACTER_SET_NAME"!=? OR "COLLATION_NAME"!=?);
 		]];
-		check_encoding_query = check_encoding_query:format(engine.charset, engine.charset);
 		-- FIXME Is it ok to ignore the return values from this?
 		engine:transaction(function()
-			local result = assert(engine:execute(check_encoding_query));
+			local result = assert(engine:execute(check_encoding_query, params.database, engine.charset, engine.charset.."_bin"));
 			local n_bad_columns = result:rowcount();
 			if n_bad_columns > 0 then
 				changes = true;
@@ -507,7 +508,10 @@
 				end
 			end
 		end);
-		success,err = engine:transaction(function() return engine:execute(check_encoding_query); end);
+		success,err = engine:transaction(function()
+			return engine:execute(check_encoding_query, params.database,
+				engine.charset, engine.charset.."_bin");
+		end);
 		if not success then
 			module:log("error", "Failed to check/upgrade database encoding: %s", err or "unknown error");
 			return false;