From d6491a67c820d279819e33eec660190c1977f0b9 Mon Sep 17 00:00:00 2001 From: Matteo Scaramuccia Date: Wed, 28 Oct 2020 22:41:48 +0100 Subject: [PATCH 1/2] MDL-70042 message_popup: progress bar on upgrade only when necessary --- message/output/popup/db/upgrade.php | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/message/output/popup/db/upgrade.php b/message/output/popup/db/upgrade.php index 69daf6f3ad1..73172cca8c2 100644 --- a/message/output/popup/db/upgrade.php +++ b/message/output/popup/db/upgrade.php @@ -51,17 +51,19 @@ function xmldb_message_popup_upgrade($oldversion) { ON mpn.notificationid = n.id WHERE n.id IS NULL"; $total = $DB->count_records_sql("SELECT COUNT(mpn.id) " . $fromsql); - $i = 0; - $pbar = new progress_bar('deletepopupnotification', 500, true); - do { - if ($popupnotifications = $DB->get_records_sql("SELECT mpn.id " . $fromsql, null, 0, 1000)) { - list($insql, $inparams) = $DB->get_in_or_equal(array_keys($popupnotifications)); - $DB->delete_records_select('message_popup_notifications', "id $insql", $inparams); - // Update progress. - $i += count($inparams); - $pbar->update($i, $total, "Cleaning up orphaned popup notification records - $i/$total."); - } - } while ($popupnotifications); + if ($total > 0) { + $i = 0; + $pbar = new progress_bar('deletepopupnotification', 500, true); + do { + if ($popupnotifications = $DB->get_records_sql("SELECT mpn.id " . $fromsql, null, 0, 1000)) { + list($insql, $inparams) = $DB->get_in_or_equal(array_keys($popupnotifications)); + $DB->delete_records_select('message_popup_notifications', "id $insql", $inparams); + // Update progress. + $i += count($inparams); + $pbar->update($i, $total, "Cleaning up orphaned popup notification records - $i/$total."); + } + } while ($popupnotifications); + } // Reportbuilder savepoint reached. upgrade_plugin_savepoint(true, 2020020600, 'message', 'popup'); From faa76ee29af69fd04566da1c30dc1ab95f97d8bb Mon Sep 17 00:00:00 2001 From: Matteo Scaramuccia Date: Wed, 28 Oct 2020 22:44:07 +0100 Subject: [PATCH 2/2] MDL-70042 message_popup: Trivial savepoint comment cleanup --- message/output/popup/db/upgrade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/message/output/popup/db/upgrade.php b/message/output/popup/db/upgrade.php index 73172cca8c2..b8f213b29dd 100644 --- a/message/output/popup/db/upgrade.php +++ b/message/output/popup/db/upgrade.php @@ -65,7 +65,7 @@ function xmldb_message_popup_upgrade($oldversion) { } while ($popupnotifications); } - // Reportbuilder savepoint reached. + // Popup message processor savepoint reached. upgrade_plugin_savepoint(true, 2020020600, 'message', 'popup'); }