From 02ffc0f2e585edd41c47d908a4c7318eae8d382a Mon Sep 17 00:00:00 2001 From: Tim Otten Date: Sun, 27 Oct 2013 08:06:04 -0700 Subject: [PATCH] CRM-13655 - Upgrade/.../FourFour.php - Setup correct schema for civicrm_word_replacement (4.3.x => 4.4.1) ---------------------------------------- * CRM-13655: WordReplacement - Uniqueness key should allow different cases and domains http://issues.civicrm.org/jira/browse/CRM-13655 --- CRM/Upgrade/Incremental/php/FourFour.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CRM/Upgrade/Incremental/php/FourFour.php b/CRM/Upgrade/Incremental/php/FourFour.php index e7c915b199..b6a4d5264f 100644 --- a/CRM/Upgrade/Incremental/php/FourFour.php +++ b/CRM/Upgrade/Incremental/php/FourFour.php @@ -255,13 +255,13 @@ WHERE source_contact_id IS NOT NULL"; $query = " CREATE TABLE IF NOT EXISTS `civicrm_word_replacement` ( `id` int unsigned NOT NULL AUTO_INCREMENT COMMENT 'Word replacement ID', - `find_word` varchar(255) COMMENT 'Word which need to be replaced', - `replace_word` varchar(255) COMMENT 'Word which will replace the word in find', + `find_word` varchar(255) COLLATE utf8_bin COMMENT 'Word which need to be replaced', + `replace_word` varchar(255) COLLATE utf8_bin COMMENT 'Word which will replace the word in find', `is_active` tinyint COMMENT 'Is this entry active?', `match_type` enum('wildcardMatch', 'exactMatch') DEFAULT 'wildcardMatch', `domain_id` int unsigned COMMENT 'FK to Domain ID. This is for Domain specific word replacement', PRIMARY KEY ( `id` ), - UNIQUE INDEX `UI_find`(find_word), + UNIQUE INDEX `UI_find`(domain_id, find_word), CONSTRAINT FK_civicrm_word_replacement_domain_id FOREIGN KEY (`domain_id`) REFERENCES `civicrm_domain`(`id`) ) ENGINE=InnoDB DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ; "; -- 2.25.1