From d09d52ced88396746addc60e5b132dba388ef8c4 Mon Sep 17 00:00:00 2001 From: Seamus Lee Date: Mon, 6 Jun 2016 23:18:57 +1000 Subject: [PATCH] add missing Columns --- CRM/Upgrade/Incremental/php/FourSeven.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/CRM/Upgrade/Incremental/php/FourSeven.php b/CRM/Upgrade/Incremental/php/FourSeven.php index 7ec97f95e4..315c0658a6 100644 --- a/CRM/Upgrade/Incremental/php/FourSeven.php +++ b/CRM/Upgrade/Incremental/php/FourSeven.php @@ -269,11 +269,13 @@ class CRM_Upgrade_Incremental_php_FourSeven extends CRM_Upgrade_Incremental_Base CRM_Core_DAO::executeQuery('ALTER TABLE civicrm_setting DROP INDEX index_group_name'); CRM_Core_DAO::executeQuery('ALTER TABLE civicrm_setting DROP COLUMN group_name'); CRM_Core_DAO::executeQuery('ALTER TABLE civicrm_setting ADD UNIQUE INDEX index_domain_contact_name (domain_id, contact_id, name)'); - CRM_Core_DAO::executeQuery('INSERT INTO civicrm_setting (name, contact_id, domain_id, value) - SELECT DISTNCT name, contact_id, domain_id, value + CRM_Core_DAO::executeQuery('INSERT INTO civicrm_setting (name, contact_id, domain_id, value, is_domain, created_id, created_date) + SELECT name, contact_id, domain_id, value, 0, contact_id, %1 FROM civicrm_activity_setting WHERE name = "activity_tab_filter" - AND value is not NULL'); + AND value is not NULL', array( + 1 => CRM_Utils_Time::getTime('Y-m-d H:i:s'), + ); CRM_Core_DAO::executeQuery('DROP TABLE civicrm_activity_setting'); $domainDao = CRM_Core_DAO::executeQuery('SELECT id, config_backend FROM civicrm_domain'); -- 2.25.1