Spring/spring-data-relational
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATAJDBC-144 - Using correct column names from NamingStrategy.

Browse Source 
The list of columns used in the SqlGenerator contained property names instead of column names, leading to errors when a non-trivial NamingStrategy was used.
This commit is contained in:
Jens Schauder
2017-10-27 16:09:05 +02:00
committed by Greg Turnquist
parent 3706826739
commit 482f330f02
4 changed files with 37 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/org/springframework/data/jdbc/core/SqlGenerator.java
View File

@@ -43,8 +43,8 @@ class SqlGenerator {
private final JdbcPersistentEntity<?> entity;
private final JdbcMappingContext context;
private final List<String> propertyNames = new ArrayList<>();
private final List<String> nonIdPropertyNames = new ArrayList<>();
private final List<String> columnNames = new ArrayList<>();
private final List<String> nonIdColumnNames = new ArrayList<>();
private final Lazy<String> findOneSql = Lazy.of(this::createFindOneSelectSql);
private final Lazy<String> findAllSql = Lazy.of(this::createFindAllSql);
@@ -64,17 +64,17 @@ class SqlGenerator {
this.context = context;
this.entity = entity;
this.sqlGeneratorSource = sqlGeneratorSource;
initPropertyNames();
initColumnNames();
}
private void initPropertyNames() {
private void initColumnNames() {
entity.doWithProperties((PropertyHandler<JdbcPersistentProperty>) p -> {
// the referencing column of referenced entity is expected to be on the other side of the relation
if (!p.isEntity()) {
propertyNames.add(p.getName());
columnNames.add(p.getColumnName());
if (!entity.isIdProperty(p)) {
nonIdPropertyNames.add(p.getName());
nonIdColumnNames.add(p.getColumnName());
}
}
});
@@ -211,11 +211,11 @@ class SqlGenerator {
String insertTemplate = "insert into %s (%s) values (%s)";
List<String> propertyNamesForInsert = new ArrayList<>(excludeId ? nonIdPropertyNames : propertyNames);
propertyNamesForInsert.addAll(additionalColumns);
List<String> columnNamesForInsert = new ArrayList<>(excludeId ? nonIdColumnNames : columnNames);
columnNamesForInsert.addAll(additionalColumns);
String tableColumns = String.join(", ", propertyNamesForInsert);
String parameterNames = propertyNamesForInsert.stream().collect(Collectors.joining(", :", ":", ""));
String tableColumns = String.join(", ", columnNamesForInsert);
String parameterNames = columnNamesForInsert.stream().collect(Collectors.joining(", :", ":", ""));
return String.format(insertTemplate, entity.getTableName(), tableColumns, parameterNames);
}
@@ -224,7 +224,7 @@ class SqlGenerator {
String updateTemplate = "update %s set %s where %s = :%s";
String setClause = propertyNames.stream()//
String setClause = columnNames.stream()//
.map(n -> String.format("%s = :%s", n, n))//
.collect(Collectors.joining(", "));