From 118ad8c5db2c6c989ed8370a89350c7d7dc4716c Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Sat, 6 Mar 2021 01:58:23 -0800
Subject: [PATCH] (Cleanup) Upgrader - Remove empty steps from 5.30-series

---
 CRM/Upgrade/Incremental/php/FiveThirtyOne.php     | 2 +-
 CRM/Upgrade/Incremental/php/FiveThirtySix.php     | 2 +-
 CRM/Upgrade/Incremental/php/FiveThirtyThree.php   | 2 +-
 CRM/Upgrade/Incremental/sql/5.30.beta1.mysql.tpl  | 1 -
 CRM/Upgrade/Incremental/sql/5.31.beta1.mysql.tpl  | 1 -
 CRM/Upgrade/Incremental/sql/5.31.beta2.mysql.tpl  | 1 -
 CRM/Upgrade/Incremental/sql/5.32.beta1.mysql.tpl  | 1 -
 CRM/Upgrade/Incremental/sql/5.33.alpha1.mysql.tpl | 1 -
 CRM/Upgrade/Incremental/sql/5.33.beta1.mysql.tpl  | 1 -
 CRM/Upgrade/Incremental/sql/5.34.beta1.mysql.tpl  | 1 -
 CRM/Upgrade/Incremental/sql/5.35.beta1.mysql.tpl  | 1 -
 CRM/Upgrade/Incremental/sql/5.36.alpha1.mysql.tpl | 1 -
 CRM/Upgrade/Incremental/sql/5.36.beta1.mysql.tpl  | 1 -
 13 files changed, 3 insertions(+), 13 deletions(-)
 delete mode 100644 CRM/Upgrade/Incremental/sql/5.30.beta1.mysql.tpl
 delete mode 100644 CRM/Upgrade/Incremental/sql/5.31.beta1.mysql.tpl
 delete mode 100644 CRM/Upgrade/Incremental/sql/5.31.beta2.mysql.tpl
 delete mode 100644 CRM/Upgrade/Incremental/sql/5.32.beta1.mysql.tpl
 delete mode 100644 CRM/Upgrade/Incremental/sql/5.33.alpha1.mysql.tpl
 delete mode 100644 CRM/Upgrade/Incremental/sql/5.33.beta1.mysql.tpl
 delete mode 100644 CRM/Upgrade/Incremental/sql/5.34.beta1.mysql.tpl
 delete mode 100644 CRM/Upgrade/Incremental/sql/5.35.beta1.mysql.tpl
 delete mode 100644 CRM/Upgrade/Incremental/sql/5.36.alpha1.mysql.tpl
 delete mode 100644 CRM/Upgrade/Incremental/sql/5.36.beta1.mysql.tpl

diff --git a/CRM/Upgrade/Incremental/php/FiveThirtyOne.php b/CRM/Upgrade/Incremental/php/FiveThirtyOne.php
index 7a1f2d23a3..34da4fef69 100644
--- a/CRM/Upgrade/Incremental/php/FiveThirtyOne.php
+++ b/CRM/Upgrade/Incremental/php/FiveThirtyOne.php
@@ -73,7 +73,7 @@ class CRM_Upgrade_Incremental_php_FiveThirtyOne extends CRM_Upgrade_Incremental_
 
   public function upgrade_5_31_beta2($rev) {
     $this->addTask('Restore null-ity of "civicrm_group.title" field', 'groupTitleRestore');
-    $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev);
+    // Not used // $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev);
   }
 
   public static function enableEwaySingleExtension(CRM_Queue_TaskContext $ctx) {
diff --git a/CRM/Upgrade/Incremental/php/FiveThirtySix.php b/CRM/Upgrade/Incremental/php/FiveThirtySix.php
index 89a65a6c77..e4e0047328 100644
--- a/CRM/Upgrade/Incremental/php/FiveThirtySix.php
+++ b/CRM/Upgrade/Incremental/php/FiveThirtySix.php
@@ -67,7 +67,7 @@ class CRM_Upgrade_Incremental_php_FiveThirtySix extends CRM_Upgrade_Incremental_
    * @param string $rev
    */
   public function upgrade_5_36_alpha1(string $rev): void {
-    $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev);
+    // Not used // $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev);
 
     $this->addTask('core-issue#2422 - Add created_id to civicrm_saved_search', 'addColumn',
       'civicrm_saved_search', 'created_id', "int(10) unsigned DEFAULT NULL COMMENT 'FK to contact table.'");
diff --git a/CRM/Upgrade/Incremental/php/FiveThirtyThree.php b/CRM/Upgrade/Incremental/php/FiveThirtyThree.php
index 8d67bd4c0f..391779d589 100644
--- a/CRM/Upgrade/Incremental/php/FiveThirtyThree.php
+++ b/CRM/Upgrade/Incremental/php/FiveThirtyThree.php
@@ -52,7 +52,7 @@ class CRM_Upgrade_Incremental_php_FiveThirtyThree extends CRM_Upgrade_Incrementa
    * @param string $rev
    */
   public function upgrade_5_33_alpha1($rev) {
-    $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev);
+    // Not used // $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev);
     $this->addTask('Add column civicrm_dashboard.directive', 'addColumn', 'civicrm_dashboard', 'directive', "varchar(255) COMMENT 'Element name of angular directive to invoke (lowercase hyphenated format)'");
   }
 
diff --git a/CRM/Upgrade/Incremental/sql/5.30.beta1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.30.beta1.mysql.tpl
deleted file mode 100644
index 9c22ccacf1..0000000000
--- a/CRM/Upgrade/Incremental/sql/5.30.beta1.mysql.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{* file to handle db changes in 5.30.beta1 during upgrade *}
diff --git a/CRM/Upgrade/Incremental/sql/5.31.beta1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.31.beta1.mysql.tpl
deleted file mode 100644
index c549cd347e..0000000000
--- a/CRM/Upgrade/Incremental/sql/5.31.beta1.mysql.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{* file to handle db changes in 5.31.beta1 during upgrade *}
diff --git a/CRM/Upgrade/Incremental/sql/5.31.beta2.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.31.beta2.mysql.tpl
deleted file mode 100644
index 33384db172..0000000000
--- a/CRM/Upgrade/Incremental/sql/5.31.beta2.mysql.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{* file to handle db changes in 5.31.beta2 during upgrade *}
diff --git a/CRM/Upgrade/Incremental/sql/5.32.beta1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.32.beta1.mysql.tpl
deleted file mode 100644
index e2257e2b95..0000000000
--- a/CRM/Upgrade/Incremental/sql/5.32.beta1.mysql.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{* file to handle db changes in 5.32.beta1 during upgrade *}
diff --git a/CRM/Upgrade/Incremental/sql/5.33.alpha1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.33.alpha1.mysql.tpl
deleted file mode 100644
index 483b660fac..0000000000
--- a/CRM/Upgrade/Incremental/sql/5.33.alpha1.mysql.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{* file to handle db changes in 5.33.alpha1 during upgrade *}
diff --git a/CRM/Upgrade/Incremental/sql/5.33.beta1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.33.beta1.mysql.tpl
deleted file mode 100644
index 55a35a7854..0000000000
--- a/CRM/Upgrade/Incremental/sql/5.33.beta1.mysql.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{* file to handle db changes in 5.33.beta1 during upgrade *}
diff --git a/CRM/Upgrade/Incremental/sql/5.34.beta1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.34.beta1.mysql.tpl
deleted file mode 100644
index 9e19f32e68..0000000000
--- a/CRM/Upgrade/Incremental/sql/5.34.beta1.mysql.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{* file to handle db changes in 5.34.beta1 during upgrade *}
diff --git a/CRM/Upgrade/Incremental/sql/5.35.beta1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.35.beta1.mysql.tpl
deleted file mode 100644
index b68c9003fc..0000000000
--- a/CRM/Upgrade/Incremental/sql/5.35.beta1.mysql.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{* file to handle db changes in 5.35.beta1 during upgrade *}
diff --git a/CRM/Upgrade/Incremental/sql/5.36.alpha1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.36.alpha1.mysql.tpl
deleted file mode 100644
index 50af2344a6..0000000000
--- a/CRM/Upgrade/Incremental/sql/5.36.alpha1.mysql.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{* file to handle db changes in 5.36.alpha1 during upgrade *}
diff --git a/CRM/Upgrade/Incremental/sql/5.36.beta1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.36.beta1.mysql.tpl
deleted file mode 100644
index 1fa88eeb1e..0000000000
--- a/CRM/Upgrade/Incremental/sql/5.36.beta1.mysql.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{* file to handle db changes in 5.36.beta1 during upgrade *}
-- 
2.25.1