From 3a88e33176ee767bd4f24ccff70b95fae55aa922 Mon Sep 17 00:00:00 2001
From: "Donald A. Lobo" <lobo@civicrm.org>
Date: Mon, 28 Oct 2013 15:33:43 -0700
Subject: [PATCH] CRM-13665 - Make upgrade fault tolerant for merging activity
contacts
http://issues.civicrm.org/jira/browse/CRM-13665
---
CRM/Upgrade/Incremental/php/FourFour.php | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/CRM/Upgrade/Incremental/php/FourFour.php b/CRM/Upgrade/Incremental/php/FourFour.php
index a74c71d922..a6e14bf635 100644
--- a/CRM/Upgrade/Incremental/php/FourFour.php
+++ b/CRM/Upgrade/Incremental/php/FourFour.php
@@ -133,7 +133,7 @@ class CRM_Upgrade_Incremental_php_FourFour {
2 => array('Fattorini Name Badge 100x65', 'String'),
3 => array('Hanging Badge 3-3/4" x 4-3"/4', 'String'),
);
-
+
foreach ($insertStatements as $values) {
$query = 'INSERT INTO civicrm_option_value (`option_group_id`, `label`, `value`, `name`, `grouping`, `filter`, `is_default`, `weight`, `description`, `is_optgroup`, `is_reserved`, `is_active`, `component_id`, `visibility_id`) VALUES' . $values;
CRM_Core_DAO::executeQuery($query, $queryParams);
@@ -193,6 +193,10 @@ VALUES
$dao = CRM_Core_DAO::executeQuery($query);
}
+ // sometimes an user does not make a clean backup and the above table
+ // already exists, so lets delete this table - CRM-13665
+ $query = "DROP TABLE civicrm_activity_contact";
+ $dao = CRM_Core_DAO::executeQuery($query);
$query = "
CREATE TABLE IF NOT EXISTS civicrm_activity_contact (
@@ -208,6 +212,7 @@ CREATE TABLE IF NOT EXISTS civicrm_activity_contact (
$dao = CRM_Core_DAO::executeQuery($query);
+
$query = "
INSERT INTO civicrm_activity_contact (activity_id, contact_id, record_type_id)
SELECT activity_id, target_contact_id, {$targetID} as record_type_id
--
GitLab