Merge pull request #20835 from MegaphoneJon/core-2687

[civicrm-core.git] / xml / templates / schema.tpl

diff --git a/xml/templates/schema.tpl b/xml/templates/schema.tpl
index 6d413c3e789ed089e503e3996e2825c9108c3664..d3e618951948d49923655c914342ae88627eef5c 100644 (file)
--- a/xml/templates/schema.tpl
+++ b/xml/templates/schema.tpl
@@ -32,18 +32,18 @@ CREATE TABLE `{$table.name}` ({assign var='first' value=true}
 {foreach from=$table.fields item=field}
 {if ! $first},{/if}{assign var='first' value=false}
 
-  `{$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 '{ts escape=sql}{$field.comment}{/ts}'{/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 isset($field.autoincrement)} AUTO_INCREMENT{/if}{if $field.default|count_characters} DEFAULT {$field.default}{/if}{if $field.comment} COMMENT '{ts escape=sql}{$field.comment}{/ts}'{/if}
 {/foreach}{* table.fields *}{strip}
 
 {/strip}{if $table.primaryKey}{if !$first},
 {/if}{assign var='first' value=false}{assign var='firstIndexField' value=true}
   PRIMARY KEY ({foreach from=$table.primaryKey.field item=fieldName}{if $firstIndexField}{assign var='firstIndexField' value=false}{else},{/if}`{$fieldName}`{/foreach}){/if}{* table.primaryKey *}
-{if $table.index}{foreach from=$table.index item=index}{if !$first},
+{if !empty($table.index)}{foreach from=$table.index item=index}{if !$first},
 {/if}{assign var='first' value=false}
-  {if $index.unique}UNIQUE {/if}INDEX `{$index.name}`({assign var='firstIndexField' value=true}{foreach from=$index.field item=fieldName}{strip}
+  {if isset($index.unique)}UNIQUE {/if}INDEX `{$index.name}`({assign var='firstIndexField' value=true}{foreach from=$index.field item=fieldName}{strip}
 {/strip}{if $firstIndexField}{assign var='firstIndexField' value=false}{else}, {/if}{$fieldName}{/foreach}){/foreach}{* table.index *}
 {/if}{* table.index *}
-{if $table.foreignKey}
+{if !empty($table.foreignKey)}
 {foreach from=$table.foreignKey item=foreign}{if ! $first},
 {/if}
 {assign var='first' value=false}{if $mysql eq 'simple'}