From 9f8c485f873194e471b334662328d9f7659436e4 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Thu, 12 Oct 2017 15:31:21 +0100
Subject: [PATCH] CRM/Upgrade - Move 4.7.26 steps to 4.7.27

---
 CRM/Upgrade/Incremental/php/FourSeven.php    | 4 ++--
 CRM/Upgrade/Incremental/sql/4.7.26.mysql.tpl | 3 ---
 CRM/Upgrade/Incremental/sql/4.7.27.mysql.tpl | 3 +++
 CRM/Utils/Check/Component/Timestamps.php     | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/CRM/Upgrade/Incremental/php/FourSeven.php b/CRM/Upgrade/Incremental/php/FourSeven.php
index cf71dc5dc2..d1bc87ba8b 100644
--- a/CRM/Upgrade/Incremental/php/FourSeven.php
+++ b/CRM/Upgrade/Incremental/php/FourSeven.php
@@ -72,7 +72,7 @@ class CRM_Upgrade_Incremental_php_FourSeven extends CRM_Upgrade_Incremental_Base
           . '</p>';
       }
     }
-    if ($rev == '4.7.26') {
+    if ($rev == '4.7.27') {
       $params = array(
         1 => 'Close accounting batches created by user',
         2 => 'Close all accounting batches',
@@ -445,7 +445,7 @@ class CRM_Upgrade_Incremental_php_FourSeven extends CRM_Upgrade_Incremental_Base
    *
    * @param string $rev
    */
-  public function upgrade_4_7_26($rev) {
+  public function upgrade_4_7_27($rev) {
     $this->addTask(ts('Upgrade DB to %1: SQL', array(1 => $rev)), 'runSql', $rev);
     $this->addTask('CRM-21234 Missing subdivisions of Tajikistan', 'tajikistanMissingSubdivisions');
     $this->addTask('CRM-20892 - Add modified_date to civicrm_mailing', 'addColumn',
diff --git a/CRM/Upgrade/Incremental/sql/4.7.26.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.7.26.mysql.tpl
index b9310381e7..5eefccfff8 100644
--- a/CRM/Upgrade/Incremental/sql/4.7.26.mysql.tpl
+++ b/CRM/Upgrade/Incremental/sql/4.7.26.mysql.tpl
@@ -1,4 +1 @@
 {* file to handle db changes in 4.7.26 during upgrade *}
-
--- CRM-20892 Change created_date default so that we can add a modified_date column
-ALTER TABLE civicrm_mailing CHANGE created_date created_date timestamp NULL  DEFAULT NULL COMMENT 'Date and time this mailing was created.';
diff --git a/CRM/Upgrade/Incremental/sql/4.7.27.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.7.27.mysql.tpl
index a971b26276..749a947a17 100644
--- a/CRM/Upgrade/Incremental/sql/4.7.27.mysql.tpl
+++ b/CRM/Upgrade/Incremental/sql/4.7.27.mysql.tpl
@@ -1 +1,4 @@
 {* file to handle db changes in 4.7.27 during upgrade *}
+
+-- CRM-20892 Change created_date default so that we can add a modified_date column
+ALTER TABLE civicrm_mailing CHANGE created_date created_date timestamp NULL  DEFAULT NULL COMMENT 'Date and time this mailing was created.';
diff --git a/CRM/Utils/Check/Component/Timestamps.php b/CRM/Utils/Check/Component/Timestamps.php
index 4448a65ace..d7bc3c25a8 100644
--- a/CRM/Utils/Check/Component/Timestamps.php
+++ b/CRM/Utils/Check/Component/Timestamps.php
@@ -131,7 +131,7 @@ class CRM_Utils_Check_Component_Timestamps extends CRM_Utils_Check_Component {
       array('table' => 'civicrm_mailing_job', 'column' => 'end_date', 'changed' => '4.7.20', 'jira' => 'CRM-9683'),
       array('table' => 'civicrm_mailing_spool', 'column' => 'added_at', 'changed' => '4.7.20', 'jira' => 'CRM-9683'),
       array('table' => 'civicrm_mailing_spool', 'column' => 'removed_at', 'changed' => '4.7.20', 'jira' => 'CRM-9683'),
-      array('table' => 'civicrm_subscription_history', 'column' => 'date', 'changed' => '4.7.26', 'default' => 'CURRENT_TIMESTAMP', 'jira' => 'CRM-21157'),
+      array('table' => 'civicrm_subscription_history', 'column' => 'date', 'changed' => '4.7.27', 'default' => 'CURRENT_TIMESTAMP', 'jira' => 'CRM-21157'),
     );
   }
 
-- 
2.25.1