Skip to content

dao: update function: generated SQL was incorrect #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 23, 2020
Merged

dao: update function: generated SQL was incorrect #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion easydao-maven-plugin/src/main/java/hu/vanio/easydao/model/Table.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,21 @@ public List<Field> getNonPkFields() {
}
return retVal;
}


/**
* Returns non-primary and not virtual key fields
* @return The list of non-primary key and not virtual key fields
*/
public List<Field> getNonPkAndNotVirtualFields() {
List<Field> retVal = new ArrayList<>();
for (Field fd : this.fieldList) {
if (!fd.isPrimaryKey() && !fd.isVirtual()) {
retVal.add(fd);
}
}
return retVal;
}

/**
* Returns the standalone primary key field of this table. If there is no primary key field in this table, it returns null.
* @return The standalone primary key field of this table or null if there is no primary key field in this table.
Expand Down
4 changes: 1 addition & 3 deletions easydao-maven-plugin/src/main/resources/hu/vanio/easydao/templates/dao.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,10 +251,8 @@ public class ${t.javaName}${e.daoSuffix}Impl implements ${t.javaName}${e.daoSuff
String sql = "update ${t.dbName} " +
"set " +
<#assign fieldList>
<#list t.nonPkFields as field>
<#if !field.virtual>
<#list t.nonPkAndNotVirtualFields as field>
<#if field.blob||field.clob>(updateLobFields?"${field.dbName} = ? <#if field_has_next>, </#if>":"") +<#else> "${field.dbName} = ? <#if field_has_next>, </#if>" +</#if>
</#if>
</#list>
</#assign>
${fieldList?remove_ending(", ")}
Expand Down