Merge pull request #10454 from murdos/fix-formatting-added_entity_cha…

…ngelog Fix formatting of the liquibase changelog that creates table
jhipster · Sep 20, 2019 · 063553c · 063553c
2 parents d311390 + 572cc68
commit 063553c
Showing 1 changed file with 60 additions and 61 deletions.
diff --git a/...ntity-server/templates/src/main/resources/config/liquibase/changelog/added_entity.xml.ejs b/...ntity-server/templates/src/main/resources/config/liquibase/changelog/added_entity.xml.ejs
@@ -49,62 +49,63 @@
         <%_ } _%>
             <column name="id" type="<%= primaryKeyType %>" <%_ if (primaryKeyType === 'varchar(100)' ) { _%> > <% } else { %> autoIncrement="${autoIncrement}"> <%_ } %>
                 <constraints primaryKey="true" nullable="false"/>
-            </column><% for (idx in fields) {
-            let nullable = true;
-            if (fields[idx].fieldValidate === true && fields[idx].fieldValidateRules.includes('required')) {
-                nullable = false;
-            }
-            let unique = false;
-            if (fields[idx].fieldValidate === true && fields[idx].fieldValidateRules.includes('unique')) {
-                unique = true;
-            }
-            let maxlength = 255;
-            if (fields[idx].fieldValidate === true && fields[idx].fieldValidateRules.includes('maxlength')) {
-                maxlength = fields[idx].fieldValidateRulesMaxlength;
-            }
-            const fieldType = fields[idx].fieldType;
-            const fieldTypeBlobContent = fields[idx].fieldTypeBlobContent;
-            const columnName = fields[idx].fieldNameAsDatabaseColumn;
-            let columnType;
-            if (fieldType === 'String' || fields[idx].fieldIsEnum) {
-                columnType="varchar(" + maxlength + ")";
-            } else if (fieldType === 'Integer') {
-                columnType="integer";
-            } else if (fieldType === 'Long') {
-                columnType="bigint";
-            } else if (fieldType === 'Float') {
-                columnType="${floatType}";
-            } else if (fieldType === 'Double') {
-                columnType="double";
-            } else if (fieldType === 'BigDecimal') {
-                columnType="decimal(21,2)";
-            } else if (fieldType === 'LocalDate') {
-                columnType="date";
-            } else if (fieldType === 'Instant') {
-                columnType="datetime";
-            } else if (fieldType === 'ZonedDateTime') {
-                columnType="datetime";
-            } else if (fieldType === 'Duration') {
-                columnType="bigint";
-            } else if (fieldType === 'UUID') {
-                columnType="${uuidType}";
-            } else if (fieldType === 'byte[]' && fieldTypeBlobContent !== 'text') {
-                if (prodDatabaseType === 'mysql' || prodDatabaseType === 'postgresql' || prodDatabaseType === 'mariadb') {
-                    columnType="longblob";
-                } else {
-                    columnType="blob";
+            </column>
+            <%_ for (idx in fields) {
+                let nullable = true;
+                if (fields[idx].fieldValidate === true && fields[idx].fieldValidateRules.includes('required')) {
+                    nullable = false;
                 }
-            } else if (fieldTypeBlobContent === 'text') {
-                columnType="${clobType}";
-            } else if (fieldType === 'Boolean') {
-                columnType="boolean";
-            }
-            %>
-            <%_ if (typeof fields[idx].javadoc == 'undefined') { _%>
+                let unique = false;
+                if (fields[idx].fieldValidate === true && fields[idx].fieldValidateRules.includes('unique')) {
+                    unique = true;
+                }
+                let maxlength = 255;
+                if (fields[idx].fieldValidate === true && fields[idx].fieldValidateRules.includes('maxlength')) {
+                    maxlength = fields[idx].fieldValidateRulesMaxlength;
+                }
+                const fieldType = fields[idx].fieldType;
+                const fieldTypeBlobContent = fields[idx].fieldTypeBlobContent;
+                const columnName = fields[idx].fieldNameAsDatabaseColumn;
+                let columnType;
+                if (fieldType === 'String' || fields[idx].fieldIsEnum) {
+                    columnType="varchar(" + maxlength + ")";
+                } else if (fieldType === 'Integer') {
+                    columnType="integer";
+                } else if (fieldType === 'Long') {
+                    columnType="bigint";
+                } else if (fieldType === 'Float') {
+                    columnType="${floatType}";
+                } else if (fieldType === 'Double') {
+                    columnType="double";
+                } else if (fieldType === 'BigDecimal') {
+                    columnType="decimal(21,2)";
+                } else if (fieldType === 'LocalDate') {
+                    columnType="date";
+                } else if (fieldType === 'Instant') {
+                    columnType="datetime";
+                } else if (fieldType === 'ZonedDateTime') {
+                    columnType="datetime";
+                } else if (fieldType === 'Duration') {
+                    columnType="bigint";
+                } else if (fieldType === 'UUID') {
+                    columnType="${uuidType}";
+                } else if (fieldType === 'byte[]' && fieldTypeBlobContent !== 'text') {
+                    if (prodDatabaseType === 'mysql' || prodDatabaseType === 'postgresql' || prodDatabaseType === 'mariadb') {
+                        columnType="longblob";
+                    } else {
+                        columnType="blob";
+                    }
+                } else if (fieldTypeBlobContent === 'text') {
+                    columnType="${clobType}";
+                } else if (fieldType === 'Boolean') {
+                    columnType="boolean";
+                }
+                _%>
+                <%_ if (typeof fields[idx].javadoc == 'undefined') { _%>
             <column name="<%=columnName %>" type="<%=columnType %>">
-            <%_ } else { _%>
+                <%_ } else { _%>
             <column name="<%=columnName %>" type="<%=columnType %>" remarks="<%- formatAsLiquibaseRemarks(fields[idx].javadoc) %>">
-            <%_ } _%>
+                <%_ } _%>
                 <%_ if (unique) {
                     const uniqueConstraintName = getUXConstraintName(entityTableName, columnName, prodDatabaseType);
                 _%>
@@ -119,11 +120,9 @@
             <column name="<%=columnName %>_content_type" type="<%=contentTypeColumnType%>">
                 <constraints nullable="<%= nullable %>" />
             </column>
-                <%_ } _%>
-            <%_
-            fields[idx].columnType = columnType;
-            _%>
-            <%_ } _%>
+                <%_ }
+                fields[idx].columnType = columnType;
+            } _%>
             <%_ for (idx in relationships) {
                 let nullable_relation = true,
                 relationshipType = relationships[idx].relationshipType,
@@ -133,7 +132,6 @@
                     nullable_relation = false;
                 }
                 if (relationships[idx].relationshipType === 'many-to-one') { _%>
-
             <column name="<%=getColumnName(relationshipName) %>_id" type="<%= relationshipColumnType %>">
                 <constraints nullable="<%= nullable_relation %>" />
             </column>
@@ -143,10 +141,11 @@
             _%>
             <column name="<%=getColumnName(relationshipName) %>_id" type="<%= relationshipColumnType %>">
                 <constraints unique="true" nullable="<%= nullable_relation %>" uniqueConstraintName="<%= uniqueConstraintName %>" />
-            </column><% } %><% } %>
+            </column>
+            <%_ }
+            } _%>
             <!-- jhipster-needle-liquibase-add-column - JHipster will add columns here, do not remove-->
         </createTable>
-
         <%_ for (const idx in fields) {
             if (fields[idx].fieldType === 'ZonedDateTime' || fields[idx].fieldType === 'Instant') { _%>
         <dropDefaultValue tableName="<%= entityTableName %>" columnName="<%=fields[idx].fieldNameAsDatabaseColumn %>" columnDataType="datetime"/>