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 f5be1d8c2b7c42a122bbe1a4f6e4ff698685d512..d3e618951948d49923655c914342ae88627eef5c 100644 (file)
--- a/xml/templates/schema.tpl
+++ b/xml/templates/schema.tpl
@@ -8,18 +8,17 @@
 --
 -- Generated from {$smarty.template}
 -- {$generated}
---
-{$database.comments}
+--{if $database.comment} {$database.comment}{/if}
 
-{include file="drop.tpl"}
+{include file="drop.tpl" no_license=TRUE}
 
 -- /*******************************************************
 -- *
 -- * Create new tables
 -- *
 -- *******************************************************/
-
 {foreach from=$tables item=table}
+
 -- /*******************************************************
 -- *
 -- * {$table.name}
@@ -29,47 +28,28 @@
 {/if}
 -- *
 -- *******************************************************/
-CREATE TABLE `{$table.name}` (
-{assign var='first' value=true}
-
+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}
-{/foreach} {* table.fields *}
-
-{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}
-  {assign var='first' value=false}
-  {if $index.unique} UNIQUE{/if} INDEX `{$index.name}`(
-  {assign var='firstIndexField' value=true}
-  {foreach from=$index.field item=fieldName}
-    {if $firstIndexField}{assign var='firstIndexField' value=false}{else}, {/if}{$fieldName}
-  {/foreach}
+{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 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 !empty($table.index)}{foreach from=$table.index item=index}{if !$first},
+{/if}{assign var='first' value=false}
+  {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 !empty($table.foreignKey)}
+{foreach from=$table.foreignKey item=foreign}{if ! $first},
+{/if}
+{assign var='first' value=false}{if $mysql eq 'simple'}
+  INDEX FKEY_{$foreign.name} ( `{$foreign.name}` ),{/if}
+  CONSTRAINT {$foreign.uniqName} FOREIGN KEY (`{$foreign.name}`) REFERENCES `{$foreign.table}`(`{$foreign.key}`){if $foreign.onDelete} ON DELETE {$foreign.onDelete}{/if}{/foreach}{* table.foreignKey *}{/if}{strip}
+  {* table.foreignKey *}{/strip}
 )
-{/foreach} {* table.index *}
-{/if} {* table.index *}
-
-{if $table.foreignKey}
-{foreach from=$table.foreignKey item=foreign}
-{if ! $first},{/if}
-{assign var='first' value=false}
-     {if $mysql eq 'simple'} INDEX FKEY_{$foreign.name} ( `{$foreign.name}` ) , {/if}
-     CONSTRAINT {$foreign.uniqName} FOREIGN KEY (`{$foreign.name}`) REFERENCES `{$foreign.table}`(`{$foreign.key}`) {if $foreign.onDelete}ON DELETE {$foreign.onDelete}{/if}
-{/foreach} {* table.foreignKey *}
-{/if} {* table.foreignKey *}
-
-{* ) {if $mysql eq 'modern' }{$table.attributes}{/if}; *}
-) {if $mysql eq 'modern' } {$table.attributes_modern} {else} {$table.attributes_simple} {/if} ;
-
-{/foreach} {* tables *}
+{if $mysql eq 'modern' }{$table.attributes_modern}{else}{$table.attributes_simple}{/if};
+{/foreach}{* tables *}