@cronapp/templates 2.9.1-SP.13 → 2.9.1-SP.15

package/package.json

@@ -1,5 +1,5 @@
 {
   "name": "@cronapp/templates",
-  "version": "2.9.1-SP.13",
+  "version": "2.9.1-SP.15",
   "cronapp-ide-minimum-version": "2.5.0"
 }

package/templates/low-code/data-layer/ENTITIES.ftl

@@ -127,7 +127,7 @@ import org.eclipse.persistence.annotations.*;
 @TenantDiscriminatorColumns({
     </#if>
     <#list clazz.multitententFields as field>
-@TenantDiscriminatorColumn(name = "${field.dbFieldName}", contextProperty = "${field.multitenantContext}")<#if field_has_next>,</#if>
+@TenantDiscriminatorColumn(name = "${field.dbFieldName?replace("\"", "\\\"")}", contextProperty = "${field.multitenantContext}")<#if field_has_next>,</#if>
     </#list>
     <#if (clazz.multitententFields?size > 1)>
 })
@@ -208,7 +208,7 @@ public class ${clazz.name} implements Serializable {
         <#if (field.relationNames?size == 1)>
             <#list field.relationNames?keys as key>
                 <#if key??>
-    @JoinColumn(name="${key}", nullable = ${field.nullable?c}, referencedColumnName = "${field.relationNames[key]}", insertable=${field.insertable?c}, updatable=${field.updatable?c})
+    @JoinColumn(name="${(key)?replace("\"", "\\\"")}", nullable = ${field.nullable?c}, referencedColumnName = "${field.relationNames[key]?replace("\"", "\\\"")}", insertable=${field.insertable?c}, updatable=${field.updatable?c})
                 </#if>
             </#list>
         <#elseif (field.relationNames?size > 1)>
@@ -216,14 +216,14 @@ public class ${clazz.name} implements Serializable {
     @JoinColumns({
             <#list field.relationNames?keys as key>
                 <#if key??>
-    @JoinColumn(name="${key}", nullable = ${field.nullable?c}, referencedColumnName = "${field.relationNames[key]}", insertable=${field.insertable?c}, updatable=${field.updatable?c})
+    @JoinColumn(name="${(key)?replace("\"", "\\\"")}", nullable = ${field.nullable?c}, referencedColumnName = "${field.relationNames[key]?replace("\"", "\\\"")}", insertable=${field.insertable?c}, updatable=${field.updatable?c})
                     <#if (i>1)>,</#if>
                 </#if>
                 <#assign i = i-1>
             </#list>
     })
         <#else>
-    @Column(name = "${field.dbFieldName}", nullable = ${field.nullable?c}<#if !field.primaryKey>, unique = ${field.unique?c}</#if><#if field.length??>, length=${field.length?c}</#if><#if field.precision??>, precision=${field.precision?c}</#if><#if field.scale??>, scale=${field.scale?c}</#if>, insertable=${field.insertable?c}, updatable=${field.updatable?c}<#if field.columnDefinition??>, columnDefinition = "${field.columnDefinition}"</#if>)
+    @Column(name = "${field.dbFieldName?replace("\"", "\\\"")}", nullable = ${field.nullable?c}<#if !field.primaryKey>, unique = ${field.unique?c}</#if><#if field.length??>, length=${field.length?c}</#if><#if field.precision??>, precision=${field.precision?c}</#if><#if field.scale??>, scale=${field.scale?c}</#if>, insertable=${field.insertable?c}, updatable=${field.updatable?c}<#if field.columnDefinition??>, columnDefinition = "${field.columnDefinition}"</#if>)
         </#if>
         ${field.modifier} <#if field.arrayRelation>${field.type}<#else>${field.type}</#if> ${name}<#if field.defaultValue?has_content> = ${field.defaultValue}<#elseif field.primaryKey && field.generationType?? && field.generationType == "UUID"> = UUID.randomUUID().toString().toUpperCase()</#if>;
     </#if>
@@ -251,7 +251,7 @@ public class ${clazz.name} implements Serializable {
         <#if (field.relationNames?size == 1)>
             <#list field.relationNames?keys as key>
                 <#if key??>
-    @JoinColumn(name="${key}", nullable = ${field.nullable?c}, referencedColumnName = "${field.relationNames[key]}", insertable=${field.insertable?c}, updatable=${field.updatable?c}<#if field.cascade>, foreignKey = @ForeignKey(name = "<#if tableName??>${tableName}<#else>${clazz.name?upper_case}</#if>_${key?upper_case}_${field.dbTableRelationClazz}_${field.relationNames[key]?upper_case}", foreignKeyDefinition = "FOREIGN KEY (${key}) REFERENCES ${field.dbTableRelationClazz} (${field.relationNames[key]}) ON DELETE CASCADE")<#elseif field.fkName?has_content>, foreignKey = @ForeignKey(name = "${field.fkName}", foreignKeyDefinition = "FOREIGN KEY (${key}) REFERENCES ${field.dbTableRelationClazz} (${field.relationNames[key]})")</#if>)
+    @JoinColumn(name="${(key)?replace("\"", "\\\"")}", nullable = ${field.nullable?c}, referencedColumnName = "${field.relationNames[key]?replace("\"", "\\\"")}", insertable=${field.insertable?c}, updatable=${field.updatable?c}<#if field.cascade>, foreignKey = @ForeignKey(name = "<#if tableName??>${tableName?replace("\"", "\\\"")}<#else>${(clazz.name?upper_case)?replace("\"", "\\\"")}</#if>_${(key?upper_case)?replace("\"", "\\\"")}_${field.dbTableRelationClazz?replace("\"", "\\\"")}_${(field.relationNames[key]?upper_case)?replace("\"", "\\\"")}", foreignKeyDefinition = "FOREIGN KEY (${(key)?replace("\"", "\\\"")}) REFERENCES ${field.dbTableRelationClazz} (${field.relationNames[key]?replace("\"", "\\\"")}) ON DELETE CASCADE")<#elseif field.fkName?has_content>, foreignKey = @ForeignKey(name = "${field.fkName?replace("\"", "\\\"")}", foreignKeyDefinition = "FOREIGN KEY (${(key)?replace("\"", "\\\"")}) REFERENCES ${field.dbTableRelationClazz} (${field.relationNames[key]?replace("\"", "\\\"")})")</#if>)
                 </#if>
             </#list>
         <#elseif (field.relationNames?size > 1)>
@@ -259,14 +259,14 @@ public class ${clazz.name} implements Serializable {
     @JoinColumns({
             <#list field.relationNames?keys as key>
                 <#if key??>
-    @JoinColumn(name="${key}", nullable = ${field.nullable?c}, referencedColumnName = "${field.relationNames[key]}", insertable=${field.insertable?c}, updatable=${field.updatable?c}<#if field.fkName?has_content>, foreignKey = @ForeignKey(name = "${field.fkName}", foreignKeyDefinition = "FOREIGN KEY (${key}) REFERENCES ${field.dbTableRelationClazz} (${field.relationNames[key]})")</#if>)
+    @JoinColumn(name="${(key)?replace("\"", "\\\"")}", nullable = ${field.nullable?c}, referencedColumnName = "${field.relationNames[key]?replace("\"", "\\\"")}", insertable=${field.insertable?c}, updatable=${field.updatable?c}<#if field.fkName?has_content>, foreignKey = @ForeignKey(name = "${field.fkName?replace("\"", "\\\"")}", foreignKeyDefinition = "FOREIGN KEY (${(key)?replace("\"", "\\\"")}) REFERENCES ${field.dbTableRelationClazz} (${field.relationNames[key]?replace("\"", "\\\"")})")</#if>)
                     <#if (i>1)>,</#if>
                 </#if>
                 <#assign i = i-1>
             </#list>
     })
         <#elseif field.arrayRelation>
-    @OneToMany(fetch = FetchType.LAZY, mappedBy="${field.mappedBy}", insertable=${field.insertable?c}, updatable=${field.updatable?c})
+    @OneToMany(fetch = FetchType.LAZY, mappedBy="${field.mappedBy?replace("\"", "\\\"")}", insertable=${field.insertable?c}, updatable=${field.updatable?c})
         <#else>
             <#if field.transient>
     @Transient
@@ -280,7 +280,7 @@ public class ${clazz.name} implements Serializable {
                 <#elseif field.isTimestamp()>
     @Temporal(TemporalType.TIMESTAMP)
                 </#if>
-    @Column(name = "${field.dbFieldName}", nullable = ${field.nullable?c}<#if !field.primaryKey>, unique = ${field.unique?c}</#if><#if field.length??>, length=${field.length?c}</#if><#if field.precision??>, precision=${field.precision?c}</#if><#if field.scale??>, scale=${field.scale?c}</#if>, insertable=${field.insertable?c}, updatable=${field.updatable?c}<#if field.columnDefinition??>, columnDefinition = "${field.columnDefinition}"</#if>)
+    @Column(name = "${field.dbFieldName?replace("\"", "\\\"")}", nullable = ${field.nullable?c}<#if !field.primaryKey>, unique = ${field.unique?c}</#if><#if field.length??>, length=${field.length?c}</#if><#if field.precision??>, precision=${field.precision?c}</#if><#if field.scale??>, scale=${field.scale?c}</#if>, insertable=${field.insertable?c}, updatable=${field.updatable?c}<#if field.columnDefinition??>, columnDefinition = "${field.columnDefinition}"</#if>)
             </#if>
         </#if>
         <#if field.getUseOuterJoin()>
@@ -306,7 +306,7 @@ public class ${clazz.name} implements Serializable {
     /**
     * @generated
     */
-    <@single_line>@Column(name = "${field.dbFieldName}_history"
+    <@single_line>@Column(name = "${field.dbFieldName?replace("\"", "\\\"")}_history"
         <#if !field.insertable>, insertable = ${field.insertable?c}</#if>
         <#if !field.updatable>, updatable = ${field.updatable?c}</#if>
     )</@single_line>