Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dev/release#16 - Cleanup empty upgrade steps #19744

Merged
merged 4 commits into from
Apr 8, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CRM/Upgrade/Incremental/php/FiveEighteen.php
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public function setPostUpgradeMessage(&$postUpgradeMessage, $rev) {
* @param string $rev
*/
public function upgrade_5_18_alpha1($rev) {
$this->addTask(ts('Upgrade DB to %1: SQL', array(1 => $rev)), 'runSql', $rev);
// Not used // $this->addTask(ts('Upgrade DB to %1: SQL', array(1 => $rev)), 'runSql', $rev);
$this->addTask('Update smart groups to reflect change of unique name for is_override', 'updateSmartGroups', [
'renameField' => [
['old' => 'is_override', 'new' => 'member_is_override'],
Expand Down
3 changes: 2 additions & 1 deletion CRM/Upgrade/Incremental/php/FiveEleven.php
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public function setPostUpgradeMessage(&$postUpgradeMessage, $rev) {
* @param string $rev
*/
public function upgrade_5_11_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('Update smart groups where jcalendar fields have been converted to datepicker', 'updateSmartGroups', [
'datepickerConversion' => [
'grant_application_received_date',
Expand All @@ -78,6 +78,7 @@ public function upgrade_5_11_alpha1($rev) {
* @param string $rev
*/
public function upgrade_5_11_beta1($rev) {
// Not used // $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev);
if (Civi::settings()->get('civimail_multiple_bulk_emails')) {
$this->addTask('Update any on hold groups to reflect field change', 'updateOnHold', $rev);
}
Expand Down
2 changes: 1 addition & 1 deletion CRM/Upgrade/Incremental/php/FiveFourteen.php
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public function setPostUpgradeMessage(&$postUpgradeMessage, $rev) {
* @param string $rev
*/
public function upgrade_5_14_alpha1($rev) {
$this->addTask(ts('Upgrade DB to %1: SQL', array(1 => $rev)), 'runSql', $rev);
// Not used // $this->addTask(ts('Upgrade DB to %1: SQL', array(1 => $rev)), 'runSql', $rev);
// Additional tasks here...
// Note: do not use ts() in the addTask description because it adds unnecessary strings to transifex.
// The above is an exception because 'Upgrade DB to %1: SQL' is generic & reusable.
Expand Down
2 changes: 1 addition & 1 deletion CRM/Upgrade/Incremental/php/FiveNineteen.php
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public function setPostUpgradeMessage(&$postUpgradeMessage, $rev) {
* @param string $rev
*/
public function upgrade_5_19_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 api4 menu', 'api4Menu');
$this->addTask('Add is_active field to civicrm_status_pref', 'addColumn', 'civicrm_status_pref', 'is_active',
"tinyint(4) DEFAULT '1' COMMENT 'Is this status check active'", FALSE, '5.19.0');
Expand Down
1 change: 1 addition & 0 deletions CRM/Upgrade/Incremental/php/FiveSeventeen.php
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ public function upgrade_5_17_alpha1($rev) {
* @param string $rev
*/
public function upgrade_5_17_1($rev) {
// Not used // $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev);
// Need to do this again because the alpha1 version had a typo and so didn't do anything.
$this->addTask(ts('Add pptx to accepted attachment file types'), 'updateFileTypes');
}
Expand Down
2 changes: 1 addition & 1 deletion CRM/Upgrade/Incremental/php/FiveSix.php
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public function setPostUpgradeMessage(&$postUpgradeMessage, $rev) {
* @param string $rev
*/
public function upgrade_5_6_beta2($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('dev/core#107 - Add Activity\'s default assignee options', 'addActivityDefaultAssigneeOptions');
}

Expand Down
2 changes: 1 addition & 1 deletion CRM/Upgrade/Incremental/php/FiveThirtyOne.php
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ public function upgrade_5_31_alpha1($rev) {

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) {
Expand Down
2 changes: 1 addition & 1 deletion CRM/Upgrade/Incremental/php/FiveThirtySix.php
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public function setPostUpgradeMessage(&$postUpgradeMessage, $rev) {
* @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.'");
Expand Down
2 changes: 1 addition & 1 deletion CRM/Upgrade/Incremental/php/FiveThirtyThree.php
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public function setPostUpgradeMessage(&$postUpgradeMessage, $rev) {
* @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)'");
}

Expand Down
2 changes: 1 addition & 1 deletion CRM/Upgrade/Incremental/php/FiveTwentyFive.php
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ public function upgrade_5_25_alpha1($rev) {
}

public function upgrade_5_25_beta3($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('Convert CiviContribute settings', 'updateContributeSettings');
}

Expand Down
2 changes: 1 addition & 1 deletion CRM/Upgrade/Incremental/php/FiveTwentyNine.php
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ public function upgrade_5_29_alpha1($rev) {
* @param string $rev
*/
public function upgrade_5_29_beta1($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('Make label field non required on price field value', 'priceFieldValueLabelNonRequired');
}

Expand Down
1 change: 0 additions & 1 deletion CRM/Upgrade/Incremental/sql/5.0.beta1.mysql.tpl

This file was deleted.

1 change: 0 additions & 1 deletion CRM/Upgrade/Incremental/sql/5.1.0.mysql.tpl

This file was deleted.

1 change: 0 additions & 1 deletion CRM/Upgrade/Incremental/sql/5.1.1.mysql.tpl

This file was deleted.

1 change: 0 additions & 1 deletion CRM/Upgrade/Incremental/sql/5.1.alpha1.mysql.tpl

This file was deleted.

1 change: 0 additions & 1 deletion CRM/Upgrade/Incremental/sql/5.1.beta1.mysql.tpl

This file was deleted.

1 change: 0 additions & 1 deletion CRM/Upgrade/Incremental/sql/5.10.beta1.mysql.tpl

This file was deleted.

1 change: 0 additions & 1 deletion CRM/Upgrade/Incremental/sql/5.11.0.mysql.tpl

This file was deleted.

1 change: 0 additions & 1 deletion CRM/Upgrade/Incremental/sql/5.11.alpha1.mysql.tpl

This file was deleted.

1 change: 0 additions & 1 deletion CRM/Upgrade/Incremental/sql/5.11.beta1.mysql.tpl

This file was deleted.

1 change: 0 additions & 1 deletion CRM/Upgrade/Incremental/sql/5.12.beta1.mysql.tpl

This file was deleted.

1 change: 0 additions & 1 deletion CRM/Upgrade/Incremental/sql/5.13.beta1.mysql.tpl

This file was deleted.

1 change: 0 additions & 1 deletion CRM/Upgrade/Incremental/sql/5.14.alpha1.mysql.tpl

This file was deleted.

1 change: 0 additions & 1 deletion CRM/Upgrade/Incremental/sql/5.15.0.mysql.tpl

This file was deleted.

1 change: 0 additions & 1 deletion CRM/Upgrade/Incremental/sql/5.15.beta1.mysql.tpl

This file was deleted.

1 change: 0 additions & 1 deletion CRM/Upgrade/Incremental/sql/5.16.beta1.mysql.tpl

This file was deleted.

1 change: 0 additions & 1 deletion CRM/Upgrade/Incremental/sql/5.17.1.mysql.tpl

This file was deleted.

1 change: 0 additions & 1 deletion CRM/Upgrade/Incremental/sql/5.17.beta1.mysql.tpl

This file was deleted.

1 change: 0 additions & 1 deletion CRM/Upgrade/Incremental/sql/5.18.0.mysql.tpl

This file was deleted.

1 change: 0 additions & 1 deletion CRM/Upgrade/Incremental/sql/5.18.alpha1.mysql.tpl

This file was deleted.

1 change: 0 additions & 1 deletion CRM/Upgrade/Incremental/sql/5.18.beta1.mysql.tpl

This file was deleted.

1 change: 0 additions & 1 deletion CRM/Upgrade/Incremental/sql/5.19.alpha1.mysql.tpl

This file was deleted.

1 change: 0 additions & 1 deletion CRM/Upgrade/Incremental/sql/5.19.beta1.mysql.tpl

This file was deleted.

1 change: 0 additions & 1 deletion CRM/Upgrade/Incremental/sql/5.2.beta1.mysql.tpl

This file was deleted.

1 change: 0 additions & 1 deletion CRM/Upgrade/Incremental/sql/5.20.beta1.mysql.tpl

This file was deleted.

1 change: 0 additions & 1 deletion CRM/Upgrade/Incremental/sql/5.21.beta1.mysql.tpl

This file was deleted.

1 change: 0 additions & 1 deletion CRM/Upgrade/Incremental/sql/5.22.alpha1.mysql.tpl

This file was deleted.

1 change: 0 additions & 1 deletion CRM/Upgrade/Incremental/sql/5.22.beta1.mysql.tpl

This file was deleted.

1 change: 0 additions & 1 deletion CRM/Upgrade/Incremental/sql/5.23.beta1.mysql.tpl

This file was deleted.

1 change: 0 additions & 1 deletion CRM/Upgrade/Incremental/sql/5.24.beta1.mysql.tpl

This file was deleted.

1 change: 0 additions & 1 deletion CRM/Upgrade/Incremental/sql/5.25.0.mysql.tpl

This file was deleted.

1 change: 0 additions & 1 deletion CRM/Upgrade/Incremental/sql/5.25.beta1.mysql.tpl

This file was deleted.

1 change: 0 additions & 1 deletion CRM/Upgrade/Incremental/sql/5.25.beta2.mysql.tpl

This file was deleted.

1 change: 0 additions & 1 deletion CRM/Upgrade/Incremental/sql/5.25.beta3.mysql.tpl

This file was deleted.

1 change: 0 additions & 1 deletion CRM/Upgrade/Incremental/sql/5.26.beta1.mysql.tpl

This file was deleted.

1 change: 0 additions & 1 deletion CRM/Upgrade/Incremental/sql/5.28.beta1.mysql.tpl

This file was deleted.

1 change: 0 additions & 1 deletion CRM/Upgrade/Incremental/sql/5.29.beta1.mysql.tpl

This file was deleted.

1 change: 0 additions & 1 deletion CRM/Upgrade/Incremental/sql/5.3.beta1.mysql.tpl

This file was deleted.

1 change: 0 additions & 1 deletion CRM/Upgrade/Incremental/sql/5.30.beta1.mysql.tpl

This file was deleted.

1 change: 0 additions & 1 deletion CRM/Upgrade/Incremental/sql/5.31.beta1.mysql.tpl

This file was deleted.

1 change: 0 additions & 1 deletion CRM/Upgrade/Incremental/sql/5.31.beta2.mysql.tpl

This file was deleted.

1 change: 0 additions & 1 deletion CRM/Upgrade/Incremental/sql/5.32.beta1.mysql.tpl

This file was deleted.

1 change: 0 additions & 1 deletion CRM/Upgrade/Incremental/sql/5.33.alpha1.mysql.tpl

This file was deleted.

1 change: 0 additions & 1 deletion CRM/Upgrade/Incremental/sql/5.33.beta1.mysql.tpl

This file was deleted.

1 change: 0 additions & 1 deletion CRM/Upgrade/Incremental/sql/5.34.beta1.mysql.tpl

This file was deleted.

1 change: 0 additions & 1 deletion CRM/Upgrade/Incremental/sql/5.35.beta1.mysql.tpl

This file was deleted.

1 change: 0 additions & 1 deletion CRM/Upgrade/Incremental/sql/5.36.alpha1.mysql.tpl

This file was deleted.

1 change: 0 additions & 1 deletion CRM/Upgrade/Incremental/sql/5.36.beta1.mysql.tpl

This file was deleted.

1 change: 0 additions & 1 deletion CRM/Upgrade/Incremental/sql/5.4.beta1.mysql.tpl

This file was deleted.

1 change: 0 additions & 1 deletion CRM/Upgrade/Incremental/sql/5.6.beta1.mysql.tpl

This file was deleted.

1 change: 0 additions & 1 deletion CRM/Upgrade/Incremental/sql/5.6.beta2.mysql.tpl

This file was deleted.

1 change: 0 additions & 1 deletion CRM/Upgrade/Incremental/sql/5.7.0.mysql.tpl

This file was deleted.

1 change: 0 additions & 1 deletion CRM/Upgrade/Incremental/sql/5.7.alpha1.mysql.tpl

This file was deleted.

1 change: 0 additions & 1 deletion CRM/Upgrade/Incremental/sql/5.8.beta1.mysql.tpl

This file was deleted.

1 change: 0 additions & 1 deletion CRM/Upgrade/Incremental/sql/5.9.0.mysql.tpl

This file was deleted.