Patches applied to CiviCRM upgrade process when upgrading DB for EBBC

civicrm-2.2.x-upgrade.patch

--- /tmp/civicrm/CRM/Upgrade/Incremental/sql/2.2.alpha1.mysql.tpl	2009-04-14 19:16:47.000000000 +1200
+++ ./CRM/Upgrade/Incremental/sql/2.2.alpha1.mysql.tpl	2012-05-06 11:01:06.000000000 +1200
@@ -15,7 +15,7 @@
 -- make the register_by_id cascade in civicrm_participant	
 
 ALTER TABLE `civicrm_participant`
-   DROP FOREIGN KEY `FK_civicrm_participant_registered_by_id`;
+   DROP KEY `FK_civicrm_participant_registered_by_id`;
 ALTER TABLE `civicrm_participant`
     ADD CONSTRAINT `FK_civicrm_participant_registered_by_id` FOREIGN KEY (`registered_by_id`) REFERENCES `civicrm_participant` (`id`) ON DELETE CASCADE;
 
@@ -39,27 +39,27 @@
       ADD `pay_later_receipt_{$locale}` text collate utf8_unicode_ci,
     {/foreach}
   {else}
-    ADD `intro_text` text collate utf8_unicode_ci COMMENT 'Introductory message for Event Registration page. Text and html allowed. Displayed at the top of Event Registration form.',
-    ADD `footer_text` text collate utf8_unicode_ci COMMENT 'Footer message for Event Registration page. Text and html allowed. Displayed at the bottom of Event Registration form.',
-    ADD `confirm_title` varchar(255) collate utf8_unicode_ci default NULL COMMENT 'Title for Confirmation page.',
-    ADD `confirm_text` text collate utf8_unicode_ci COMMENT 'Introductory message for Event Registration page. Text and html allowed. Displayed at the top of Event Registration form.',
-    ADD `confirm_footer_text` text collate utf8_unicode_ci COMMENT 'Footer message for Event Registration page. Text and html allowed. Displayed at the bottom of Event Registration form.',
-    ADD `confirm_email_text` text collate utf8_unicode_ci COMMENT 'text to include above standard event info on confirmation email. emails are text-only, so do not allow html for now',
-    ADD `confirm_from_name` varchar(255) collate utf8_unicode_ci default NULL COMMENT 'FROM email name used for confirmation emails.',
-    ADD `thankyou_title` varchar(255) collate utf8_unicode_ci default NULL COMMENT 'Title for ThankYou page.',
-    ADD `thankyou_text` text collate utf8_unicode_ci COMMENT 'ThankYou Text.',
-    ADD `thankyou_footer_text` text collate utf8_unicode_ci COMMENT 'Footer message.',
-    ADD `pay_later_text` text collate utf8_unicode_ci COMMENT 'The text displayed to the user in the main form',
-    ADD `pay_later_receipt` text collate utf8_unicode_ci COMMENT 'The receipt sent to the user instead of the normal receipt text',
-  {/if}
-   ADD `is_email_confirm` tinyint(4) default '0' COMMENT 'If true, confirmation is automatically emailed to contact on successful registration.',
-   ADD `confirm_from_email` varchar(255) collate utf8_unicode_ci default NULL COMMENT 'FROM email address used for confirmation emails.',
-   ADD `cc_confirm` varchar(255) collate utf8_unicode_ci default NULL COMMENT 'comma-separated list of email addresses to cc each time a confirmation is sent',
-   ADD `bcc_confirm` varchar(255) collate utf8_unicode_ci default NULL COMMENT 'comma-separated list of email addresses to bcc each time a confirmation is sent',
-   ADD `default_fee_id` int(10) unsigned default NULL COMMENT 'FK to civicrm_option_value.',
-   ADD `default_discount_id` int(10) unsigned default NULL COMMENT 'FK to civicrm_option_value.',
-   ADD `is_pay_later` tinyint(4) default '0' COMMENT 'if true - allows the user to send payment directly to the org later',
-   ADD `is_multiple_registrations` tinyint(4) default '0' COMMENT 'if true - allows the user to register multiple participants for event',
+    MODIFY `intro_text` text collate utf8_unicode_ci COMMENT 'Introductory message for Event Registration page. Text and html allowed. Displayed at the top of Event Registration form.',
+    MODIFY `footer_text` text collate utf8_unicode_ci COMMENT 'Footer message for Event Registration page. Text and html allowed. Displayed at the bottom of Event Registration form.',
+    MODIFY `confirm_title` varchar(255) collate utf8_unicode_ci default NULL COMMENT 'Title for Confirmation page.',
+    MODIFY `confirm_text` text collate utf8_unicode_ci COMMENT 'Introductory message for Event Registration page. Text and html allowed. Displayed at the top of Event Registration form.',
+    MODIFY `confirm_footer_text` text collate utf8_unicode_ci COMMENT 'Footer message for Event Registration page. Text and html allowed. Displayed at the bottom of Event Registration form.',
+    MODIFY `confirm_email_text` text collate utf8_unicode_ci COMMENT 'text to include above standard event info on confirmation email. emails are text-only, so do not allow html for now',
+    MODIFY `confirm_from_name` varchar(255) collate utf8_unicode_ci default NULL COMMENT 'FROM email name used for confirmation emails.',
+    MODIFY `thankyou_title` varchar(255) collate utf8_unicode_ci default NULL COMMENT 'Title for ThankYou page.',
+    MODIFY `thankyou_text` text collate utf8_unicode_ci COMMENT 'ThankYou Text.',
+    MODIFY `thankyou_footer_text` text collate utf8_unicode_ci COMMENT 'Footer message.',
+    MODIFY `pay_later_text` text collate utf8_unicode_ci COMMENT 'The text displayed to the user in the main form',
+    MODIFY `pay_later_receipt` text collate utf8_unicode_ci COMMENT 'The receipt sent to the user instead of the normal receipt text',
+  {/if}
+   MODIFY `is_email_confirm` tinyint(4) default '0' COMMENT 'If true, confirmation is automatically emailed to contact on successful registration.',
+   MODIFY `confirm_from_email` varchar(255) collate utf8_unicode_ci default NULL COMMENT 'FROM email address used for confirmation emails.',
+   MODIFY `cc_confirm` varchar(255) collate utf8_unicode_ci default NULL COMMENT 'comma-separated list of email addresses to cc each time a confirmation is sent',
+   MODIFY `bcc_confirm` varchar(255) collate utf8_unicode_ci default NULL COMMENT 'comma-separated list of email addresses to bcc each time a confirmation is sent',
+   MODIFY `default_fee_id` int(10) unsigned default NULL COMMENT 'FK to civicrm_option_value.',
+   MODIFY `default_discount_id` int(10) unsigned default NULL COMMENT 'FK to civicrm_option_value.',
+   MODIFY `is_pay_later` tinyint(4) default '0' COMMENT 'if true - allows the user to send payment directly to the org later',
+   MODIFY `is_multiple_registrations` tinyint(4) default '0' COMMENT 'if true - allows the user to register multiple participants for event',
    ALTER `max_participants`  DROP DEFAULT;
 
 UPDATE civicrm_event ce
diff -urw /tmp/civicrm/CRM/Upgrade/Incremental/sql/2.2.beta4.mysql.tpl ./CRM/Upgrade/Incremental/sql/2.2.beta4.mysql.tpl
--- /tmp/civicrm/CRM/Upgrade/Incremental/sql/2.2.beta4.mysql.tpl	2009-03-12 22:54:32.000000000 +1300
+++ ./CRM/Upgrade/Incremental/sql/2.2.beta4.mysql.tpl	2012-05-06 11:05:42.000000000 +1200
@@ -1,7 +1,7 @@
 -- CRM-1971
 
 ALTER TABLE civicrm_event 
-   DROP FOREIGN KEY `FK_civicrm_event_loc_block_id`;
+   DROP KEY `FK_civicrm_event_loc_block_id`;
 ALTER TABLE civicrm_event 
    ADD CONSTRAINT `FK_civicrm_event_loc_block_id` FOREIGN KEY (`loc_block_id`) REFERENCES `civicrm_loc_block` (`id`) ON DELETE SET NULL;