CRM-15343 - 4.5.0 corrupts soft references to case-types

https://issues.civicrm.org/jira/browse/CRM-15343

diff --git a/CRM/Case/xml/configuration.sample/case_sample.mysql.tpl b/CRM/Case/xml/configuration.sample/case_sample.mysql.tpl
index 75c1dd5328239b75e9a8bf9195213e6103d0c271..ed19acdaf0b26d5eed9fcbaf43a1948db9670083 100644 (file)
--- a/CRM/Case/xml/configuration.sample/case_sample.mysql.tpl
+++ b/CRM/Case/xml/configuration.sample/case_sample.mysql.tpl
@@ -18,6 +18,13 @@ INSERT IGNORE INTO `civicrm_case_type` (  {localize field='title'}`title`{/local
   ({localize}'{ts escape="sql"}Housing Support{/ts}'{/localize}, 'housing_support', {localize}'{ts escape="sql"}Help homeless individuals obtain temporary and long-term housing{/ts}'{/localize}, @max_wt + 1, 0, 1),
   ({localize}'{ts escape="sql"}Adult Day Care Referral{/ts}'{/localize}, 'adult_day_care_referral', {localize}'{ts escape="sql"}Arranging adult day care for senior individuals{/ts}'{/localize}, @max_wt + 2, 0, 1);
 
+-- CRM-15343 set the auto increment civicrm_case_type.id start point to max id to avoid conflict in future insertion
+SELECT @max_case_type_id := max(id) from civicrm_case_type;
+SET @query  = CONCAT("ALTER TABLE civicrm_case_type AUTO_INCREMENT = ", IFNULL(@max_case_type_id,1));
+PREPARE alter_case_type_auto_inc FROM @query;
+EXECUTE alter_case_type_auto_inc;
+DEALLOCATE PREPARE alter_case_type_auto_inc;
+
 -- /*******************************************************
 -- *
 -- * Case Status - Set names for Open and Closed

diff --git a/CRM/Upgrade/Incremental/sql/4.5.alpha1.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.5.alpha1.mysql.tpl
index 04777af7eb250fa076948f2fb85f900a9cfa27d6..25da57f2560bcd7e280ac011d2698ceba5d40b30 100644 (file)
--- a/CRM/Upgrade/Incremental/sql/4.5.alpha1.mysql.tpl
+++ b/CRM/Upgrade/Incremental/sql/4.5.alpha1.mysql.tpl
@@ -348,7 +348,7 @@ ALTER TABLE civicrm_case
 
 -- CRM-15343 set the auto increment civicrm_case_type.id start point to max id to avoid conflict in future insertion
 SELECT @max_case_type_id := max(id) from civicrm_case_type;
-SET @query  = CONCAT("ALTER TABLE civicrm_case_type AUTO_INCREMENT = ", @max_case_type_id);
+SET @query  = CONCAT("ALTER TABLE civicrm_case_type AUTO_INCREMENT = ", IFNULL(@max_case_type_id,1));
 PREPARE alter_case_type_auto_inc FROM @query;
 EXECUTE alter_case_type_auto_inc;
 DEALLOCATE PREPARE alter_case_type_auto_inc;