add missing Columns
authorSeamus Lee <seamuslee001@gmail.com>
Mon, 6 Jun 2016 13:18:57 +0000 (23:18 +1000)
committerSeamus Lee <seamuslee001@gmail.com>
Thu, 23 Jun 2016 03:27:19 +0000 (13:27 +1000)
CRM/Upgrade/Incremental/php/FourSeven.php

index 7ec97f95e43acfc70c895204bfb6482a8e298b5d..315c0658a69099ff20f4064c09aa55d3e738a11b 100644 (file)
@@ -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');