--- a/plugins/mod_storage_sql.lua	Wed Apr 12 21:53:21 2017 +0200
+++ b/plugins/mod_storage_sql.lua	Wed Apr 12 23:16:23 2017 +0200
@@ -484,7 +484,8 @@
 		local check_encoding_query = [[
 		SELECT "COLUMN_NAME","COLUMN_TYPE","TABLE_NAME"
 		FROM "information_schema"."columns"
-		WHERE "TABLE_NAME" LIKE 'prosody%%' AND ( "CHARACTER_SET_NAME"!=? OR "COLLATION_NAME"!=?);
+		WHERE "TABLE_NAME" LIKE 'prosody%%'
+		AND ( "CHARACTER_SET_NAME"!=? OR "COLLATION_NAME"!=?);
 		]];
 		-- FIXME Is it ok to ignore the return values from this?
 		engine:transaction(function()
@@ -506,7 +507,9 @@
 				end
 			end
 		end);
-		success,err = engine:transaction(function() return engine:execute(check_encoding_query, engine.charset, engine.charset.."_bin"); end);
+		success,err = engine:transaction(function()
+			return engine:execute(check_encoding_query, 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;