From 04aec59c5467f0922bd2c9116c799836acc47d9e Mon Sep 17 00:00:00 2001 From: Tim Otten Date: Sun, 27 Oct 2013 07:44:00 -0700 Subject: [PATCH] CRM-13655 - GenCode - Allow overriding COLLATE for specific columns ---------------------------------------- * CRM-13655: WordReplacement - Uniqueness key should allow different cases and domains http://issues.civicrm.org/jira/browse/CRM-13655 --- xml/GenCode.php | 1 + xml/templates/schema.tpl | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/xml/GenCode.php b/xml/GenCode.php index 043850e92e..75ec81747b 100644 --- a/xml/GenCode.php +++ b/xml/GenCode.php @@ -688,6 +688,7 @@ Alternatively you can get a version of CiviCRM that matches your PHP version } $field['required'] = $this->value('required', $fieldXML); + $field['collate'] = $this->value('collate', $fieldXML); $field['comment'] = $this->value('comment', $fieldXML); $field['default'] = $this->value('default', $fieldXML); $field['import'] = $this->value('import', $fieldXML); diff --git a/xml/templates/schema.tpl b/xml/templates/schema.tpl index a42defbd6a..dd0d4ab143 100644 --- a/xml/templates/schema.tpl +++ b/xml/templates/schema.tpl @@ -52,7 +52,7 @@ CREATE TABLE `{$table.name}` ( {if ! $first},{/if} {assign var='first' value=false} - `{$field.name}` {$field.sqlType} {if $field.required}{if $field.required == "false"}NULL{else}NOT NULL{/if}{/if} {if $field.autoincrement}AUTO_INCREMENT{/if} {if $field.default|count_characters}DEFAULT {$field.default}{/if} {if $field.comment}COMMENT '{$field.comment}'{/if} + `{$field.name}` {$field.sqlType}{if $field.collate} COLLATE {$field.collate}{/if} {if $field.required}{if $field.required == "false"}NULL{else}NOT NULL{/if}{/if} {if $field.autoincrement}AUTO_INCREMENT{/if} {if $field.default|count_characters}DEFAULT {$field.default}{/if} {if $field.comment}COMMENT '{$field.comment}'{/if} {/foreach} {* table.fields *} {if $table.primaryKey} -- 2.25.1