fix #129

jhipster · Aug 21, 2020 · 85395eb · 85395eb
1 parent 90ad63f
commit 85395eb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,7 @@
 
 # [1.2.0](https://github.com/jhipster/generator-jhipster-nodejs/tree/v1.2.0)
 
+-   Blob types not saved [issue #129](https://github.com/jhipster/generator-jhipster-nodejs/issues/129)
 -   Unexpected logs when creating a new app using import-jdl [issue #159](https://github.com/jhipster/generator-jhipster-nodejs/issues/159)
 -   Language i18n for angular home page translation NHipster [issue #45](https://github.com/jhipster/generator-jhipster-nodejs/issues/45)
 -   Language i18n for react home page translation NHipster [issue #59](https://github.com/jhipster/generator-jhipster-nodejs/issues/59)

diff --git a/generators/entity-server/templates/server/src/domain/entity.ts.ejs b/generators/entity-server/templates/server/src/domain/entity.ts.ejs
@@ -67,11 +67,11 @@ export default class <%= asEntity(entityClass) %> extends BaseEntity  {
         <%_ if (fields[idx].fieldIsEnum) { _%>
     @Column({type: 'simple-enum', name: '<%-fieldNameAsDatabaseColumn %>', enum: <%= fieldType %>})
         <%_ } else if (['Instant', 'ZonedDateTime', 'LocalDate'].includes(fieldType)) { _%>
-    @Column({<%_ if(fieldColumnType) { _%> type: '<%-fieldColumnType%>' ,<%_ }_%> name: "<%-fieldNameAsDatabaseColumn %>"<% if (required) { %>, nullable: false<% } %><% if (unique) { %>, unique: true<% } %>})
+    @Column({<%_ if(fieldColumnType) { _%> type: '<%-fieldColumnType%>' ,<%_ }_%> name: "<%-fieldNameAsDatabaseColumn %>"<% if (!required) { %>, nullable: true<% } %><% if (unique) { %>, unique: true<% } %>})
         <%_ } else if (fieldType === 'BigDecimal') { _%>
-    @Column({<%_ if(fieldColumnType) { _%> type: '<%-fieldColumnType%>' ,<%_ }_%> name: "<%-fieldNameAsDatabaseColumn %>", precision : 10, scale : 2<% if (required) { %>, nullable: false<% } %><% if (unique) { %>, unique: true<% } %>})
+    @Column({<%_ if(fieldColumnType) { _%> type: '<%-fieldColumnType%>' ,<%_ }_%> name: "<%-fieldNameAsDatabaseColumn %>", precision : 10, scale : 2<% if (!required) { %>, nullable: true<% } %><% if (unique) { %>, unique: true<% } %>})
         <%_ } else { _%>
-    @Column({<%_ if(fieldColumnType) { _%> type: '<%-fieldColumnType%>' ,<%_ }_%>  name: "<%-fieldNameAsDatabaseColumn %>"<% if (fieldValidate === true) { %><% if (fieldValidateRules.includes('maxlength')) { %>, length: <%= fieldValidateRulesMaxlength %><% } %><% if (required) { %>, nullable: false<% } %><% if (unique) { %>, unique: true<% } %><% } %>})
+    @Column({<%_ if(fieldColumnType) { _%> type: '<%-fieldColumnType%>' ,<%_ }_%>  name: "<%-fieldNameAsDatabaseColumn %>"<% if (fieldValidate === true) { %><% if (fieldValidateRules.includes('maxlength')) { %>, length: <%= fieldValidateRulesMaxlength %><% } %> <% } %><% if (!required) { %>, nullable: true<% } %><% if (unique) { %>, unique: true<% }%>})
         <%_ } _%>
         <%_ if (fields[idx].fieldIsEnum) { _%>
     <%= fieldName %>: <%= fieldType %>;
@@ -80,7 +80,7 @@ export default class <%= asEntity(entityClass) %> extends BaseEntity  {
         <%_ } _%>
 
     <%_ if ((fieldType === 'byte[]' || fieldType === 'ByteBuffer') && fieldTypeBlobContent !== 'text') { _%>
-    @Column({name: '<%-fieldNameAsDatabaseColumn %>_content_type'})
+    @Column({name: '<%-fieldNameAsDatabaseColumn %>_content_type'<% if (!required) { %>, nullable: true<% } %>})
     <%= fieldName %>ContentType: string;
     <%_ }
     } _%>