# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1542318932 0
# Node ID b7a23136f345bdd9444c36c378a284734dc8bd02
# Parent  a1c956bf68725522452dfb8f70cce2650a41ca04# Parent  2fcf517b811e8f512dbc037d06fd88c62613e253
Merge 0.11->trunk

diff -r a1c956bf6872 -r b7a23136f345 plugins/mod_storage_sql.lua
--- a/plugins/mod_storage_sql.lua	Thu Nov 15 10:26:50 2018 +0000
+++ b/plugins/mod_storage_sql.lua	Thu Nov 15 21:55:32 2018 +0000
@@ -510,12 +510,12 @@
 	if params.driver == "MySQL" then
 		local success,err = engine:transaction(function()
 			do
-				local result = engine:execute("SHOW COLUMNS FROM \"prosody\" WHERE \"Field\"='value' and \"Type\"='text'");
+				local result = assert(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 (value column size)...");
-						engine:execute("ALTER TABLE \"prosody\" MODIFY COLUMN \"value\" MEDIUMTEXT");
+						assert(engine:execute("ALTER TABLE \"prosody\" MODIFY COLUMN \"value\" MEDIUMTEXT"));
 						module:log("info", "Database table automatically upgraded");
 					end
 				end
@@ -528,9 +528,9 @@
 					changes = true;
 					if apply_changes then
 						module:log("info", "Upgrading database schema (prosodyarchive_index)...");
-						engine:execute[[ALTER TABLE "prosodyarchive" DROP INDEX prosodyarchive_index;]];
+						assert(engine:execute[[ALTER TABLE "prosodyarchive" DROP INDEX prosodyarchive_index;]]);
 						local new_index = sql.Index { table = "prosodyarchive", name="prosodyarchive_index", "host", "user", "store", "key" };
-						engine:_create_index(new_index);
+						assert(engine:_create_index(new_index));
 						module:log("info", "Database table automatically upgraded");
 					end
 				end