From e10c02237ccae1a1b61585e461164bb0dae03095 Mon Sep 17 00:00:00 2001
From: CiviCRM
Date: Thu, 3 Dec 2020 07:03:00 +0000
Subject: [PATCH] Set version to 5.34.alpha1
---
.../Incremental/php/FiveThirtyFour.php | 72 +++++++++++++++++++
.../Incremental/sql/5.34.alpha1.mysql.tpl | 1 +
sql/civicrm_generated.mysql | 2 +-
sql/test_data_second_domain.mysql | 2 +-
xml/version.xml | 2 +-
5 files changed, 76 insertions(+), 3 deletions(-)
create mode 100644 CRM/Upgrade/Incremental/php/FiveThirtyFour.php
create mode 100644 CRM/Upgrade/Incremental/sql/5.34.alpha1.mysql.tpl
diff --git a/CRM/Upgrade/Incremental/php/FiveThirtyFour.php b/CRM/Upgrade/Incremental/php/FiveThirtyFour.php
new file mode 100644
index 0000000000..03c0ba7eea
--- /dev/null
+++ b/CRM/Upgrade/Incremental/php/FiveThirtyFour.php
@@ -0,0 +1,72 @@
+' . ts('A new permission, "%1", has been added. This permission is now used to control access to the Manage Tags screen.', array(1 => ts('manage tags'))) . '
';
+ // }
+ }
+
+ /**
+ * Compute any messages which should be displayed after upgrade.
+ *
+ * @param string $postUpgradeMessage
+ * alterable.
+ * @param string $rev
+ * an intermediate version; note that setPostUpgradeMessage is called repeatedly with different $revs.
+ */
+ public function setPostUpgradeMessage(&$postUpgradeMessage, $rev) {
+ // Example: Generate a post-upgrade message.
+ // if ($rev == '5.12.34') {
+ // $postUpgradeMessage .= '
' . ts("By default, CiviCRM now disables the ability to import directly from SQL. To use this feature, you must explicitly grant permission 'import SQL datasource'.");
+ // }
+ }
+
+ /*
+ * Important! All upgrade functions MUST add a 'runSql' task.
+ * Uncomment and use the following template for a new upgrade version
+ * (change the x in the function name):
+ */
+
+ // /**
+ // * Upgrade function.
+ // *
+ // * @param string $rev
+ // */
+ // public function upgrade_5_0_x($rev) {
+ // $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev);
+ // $this->addTask('Do the foo change', 'taskFoo', ...);
+ // // 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.
+ // }
+
+ // public static function taskFoo(CRM_Queue_TaskContext $ctx, ...) {
+ // return TRUE;
+ // }
+
+}
diff --git a/CRM/Upgrade/Incremental/sql/5.34.alpha1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.34.alpha1.mysql.tpl
new file mode 100644
index 0000000000..5d1c91f3e2
--- /dev/null
+++ b/CRM/Upgrade/Incremental/sql/5.34.alpha1.mysql.tpl
@@ -0,0 +1 @@
+{* file to handle db changes in 5.34.alpha1 during upgrade *}
diff --git a/sql/civicrm_generated.mysql b/sql/civicrm_generated.mysql
index 8d013bba4a..0b120987ae 100644
--- a/sql/civicrm_generated.mysql
+++ b/sql/civicrm_generated.mysql
@@ -399,7 +399,7 @@ UNLOCK TABLES;
LOCK TABLES `civicrm_domain` WRITE;
/*!40000 ALTER TABLE `civicrm_domain` DISABLE KEYS */;
-INSERT INTO `civicrm_domain` (`id`, `name`, `description`, `version`, `contact_id`, `locales`, `locale_custom_strings`) VALUES (1,'Default Domain Name',NULL,'5.33.beta1',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}');
+INSERT INTO `civicrm_domain` (`id`, `name`, `description`, `version`, `contact_id`, `locales`, `locale_custom_strings`) VALUES (1,'Default Domain Name',NULL,'5.34.alpha1',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}');
/*!40000 ALTER TABLE `civicrm_domain` ENABLE KEYS */;
UNLOCK TABLES;
diff --git a/sql/test_data_second_domain.mysql b/sql/test_data_second_domain.mysql
index 5d4d676c86..409b739dff 100644
--- a/sql/test_data_second_domain.mysql
+++ b/sql/test_data_second_domain.mysql
@@ -963,4 +963,4 @@ INSERT INTO civicrm_navigation
VALUES
( @domainID, CONCAT('civicrm/report/instance/', @instanceID,'&reset=1'), 'Mailing Detail Report', 'Mailing Detail Report', 'administer CiviMail', 'OR', @reportlastID, '1', NULL, @instanceID+2 );
UPDATE civicrm_report_instance SET navigation_id = LAST_INSERT_ID() WHERE id = @instanceID;
-UPDATE civicrm_domain SET version = '5.33.beta1';
+UPDATE civicrm_domain SET version = '5.34.alpha1';
diff --git a/xml/version.xml b/xml/version.xml
index 04935f318c..a506f2ee39 100644
--- a/xml/version.xml
+++ b/xml/version.xml
@@ -1,4 +1,4 @@
- 5.33.beta1
+ 5.34.alpha1
--
2.25.1