CRM-17686 move from beta5 to beta6

diff --git a/CRM/Upgrade/Incremental/php/FourSeven.php b/CRM/Upgrade/Incremental/php/FourSeven.php
index 061913b9afc3eb7a3c280d9e90c5649bd7f80469..c33b22201b419398e2812b8b3f538df9c5e12113 100644 (file)
--- a/CRM/Upgrade/Incremental/php/FourSeven.php
+++ b/CRM/Upgrade/Incremental/php/FourSeven.php
@@ -139,7 +139,7 @@ class CRM_Upgrade_Incremental_php_FourSeven extends CRM_Upgrade_Incremental_Base
    *
    * @param string $rev
    */
-  public function upgrade_4_7_beta5($rev) {
+  public function upgrade_4_7_beta6($rev) {
     $this->addTask(ts('Upgrade DB to %1: SQL', array(1 => $rev)), 'runSql', $rev);
     $this->addTask('Disable flexible jobs extension', 'disableFlexibleJobsExtension');
   }

diff --git a/CRM/Upgrade/Incremental/sql/4.7.beta5.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.7.beta5.mysql.tpl
index 54b3e3e700ac47079a9ca1133b5734dd9662579e..a97a6161571b9163d3e5f071857cfb2b8baf14f9 100644 (file)
--- a/CRM/Upgrade/Incremental/sql/4.7.beta5.mysql.tpl
+++ b/CRM/Upgrade/Incremental/sql/4.7.beta5.mysql.tpl
@@ -1,5 +1 @@
 {* file to handle db changes in 4.7.beta5 during upgrade *}
-
--- CRM-17686
-ALTER TABLE `civicrm_job`
-ADD COLUMN `scheduled_run_date` timestamp NULL DEFAULT NULL COMMENT 'When is this cron entry scheduled to run' AFTER `last_run`;

diff --git a/CRM/Upgrade/Incremental/sql/4.7.beta6.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.7.beta6.mysql.tpl
index 39b83f9e492a9cf44ec2930a3e4f64edd91475c4..eaf4c4a2c737aa47a5f569971e4009936e3645b9 100644 (file)
--- a/CRM/Upgrade/Incremental/sql/4.7.beta6.mysql.tpl
+++ b/CRM/Upgrade/Incremental/sql/4.7.beta6.mysql.tpl
@@ -1 +1,5 @@
 {* file to handle db changes in 4.7.beta6 during upgrade *}
+
+-- CRM-17686
+ALTER TABLE `civicrm_job`
+ADD COLUMN `scheduled_run_date` timestamp NULL DEFAULT NULL COMMENT 'When is this cron entry scheduled to run' AFTER `last_run`;