From 7481fe99402d4db772ee1113e82e6f847ecdb5d4 Mon Sep 17 00:00:00 2001 From: Seamus Lee Date: Thu, 5 Jul 2018 15:15:26 +1000 Subject: [PATCH] dev/core#234 Move all steps to 5.3.0 from 5.3.alpha1 --- CRM/Upgrade/Incremental/sql/5.3.0.mysql.tpl | 17 +++++++++++++++++ .../Incremental/sql/5.3.alpha1.mysql.tpl | 17 ----------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/CRM/Upgrade/Incremental/sql/5.3.0.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.3.0.mysql.tpl index bcf4c947c0..b557c2542b 100644 --- a/CRM/Upgrade/Incremental/sql/5.3.0.mysql.tpl +++ b/CRM/Upgrade/Incremental/sql/5.3.0.mysql.tpl @@ -1 +1,18 @@ {* file to handle db changes in 5.3.0 during upgrade *} +ALTER TABLE civicrm_custom_group ALTER column is_multiple SET DEFAULT 0; +UPDATE civicrm_custom_group SET is_multiple = 0 WHERE is_multiple IS NULL; +ALTER TABLE civicrm_custom_group ALTER column is_active SET DEFAULT 1; +ALTER TABLE civicrm_custom_field ALTER column is_view SET DEFAULT 0; +UPDATE civicrm_custom_field SET is_view = 0 WHERE is_view IS NULL; +ALTER TABLE civicrm_custom_field ALTER column is_required SET DEFAULT 0; +UPDATE civicrm_custom_field SET is_required = 0 WHERE is_required IS NULL; +ALTER TABLE civicrm_custom_field ALTER column is_searchable SET DEFAULT 0; +UPDATE civicrm_custom_field SET is_searchable = 0 WHERE is_required IS NULL; +ALTER TABLE civicrm_custom_field ALTER column is_active SET DEFAULT 1; + +SET @UKCountryId = (SELECT id FROM civicrm_country cc WHERE cc.name = 'United Kingdom'); +INSERT INTO civicrm_state_province (country_id, abbreviation, name) +VALUES (@UKCountryId, 'MON', 'Monmouthshire'); + +{* dev/core/#152 *} +UPDATE `civicrm_custom_field` set `html_type` = "Multi-Select" WHERE `html_type` = "AdvMulti-Select"; diff --git a/CRM/Upgrade/Incremental/sql/5.3.alpha1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.3.alpha1.mysql.tpl index cb1a7511c1..8a3d52ecc1 100644 --- a/CRM/Upgrade/Incremental/sql/5.3.alpha1.mysql.tpl +++ b/CRM/Upgrade/Incremental/sql/5.3.alpha1.mysql.tpl @@ -1,18 +1 @@ {* file to handle db changes in 5.3.alpha1 during upgrade *} -ALTER TABLE civicrm_custom_group ALTER column is_multiple SET DEFAULT 0; -UPDATE civicrm_custom_group SET is_multiple = 0 WHERE is_multiple IS NULL; -ALTER TABLE civicrm_custom_group ALTER column is_active SET DEFAULT 1; -ALTER TABLE civicrm_custom_field ALTER column is_view SET DEFAULT 0; -UPDATE civicrm_custom_field SET is_view = 0 WHERE is_view IS NULL; -ALTER TABLE civicrm_custom_field ALTER column is_required SET DEFAULT 0; -UPDATE civicrm_custom_field SET is_required = 0 WHERE is_required IS NULL; -ALTER TABLE civicrm_custom_field ALTER column is_searchable SET DEFAULT 0; -UPDATE civicrm_custom_field SET is_searchable = 0 WHERE is_required IS NULL; -ALTER TABLE civicrm_custom_field ALTER column is_active SET DEFAULT 1; - -SET @UKCountryId = (SELECT id FROM civicrm_country cc WHERE cc.name = 'United Kingdom'); -INSERT INTO civicrm_state_province (country_id, abbreviation, name) -VALUES (@UKCountryId, 'MON', 'Monmouthshire'); - -{* dev/core/#152 *} -UPDATE `civicrm_custom_field` set `html_type` = "Multi-Select" WHERE `html_type` = "AdvMulti-Select"; -- 2.25.1