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

#283 - Fix Id property and column name usage in SimpleR2dbcRepository.

Browse Source 
We now use the Id property name when using the converter to map property names to column names. In other places, where we don't use the converter, we stick with the Id column name.
This commit is contained in:
Mark Paluch
2020-01-23 09:18:52 +01:00
parent 44447da722
commit 613b5ad8db
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/main/java/org/springframework/data/r2dbc/repository/support/SimpleR2dbcRepository.java
View File

@@ -30,6 +30,7 @@ import org.springframework.data.r2dbc.core.PreparedOperation;
import org.springframework.data.r2dbc.core.ReactiveDataAccessStrategy;
import org.springframework.data.r2dbc.core.StatementMapper;
import org.springframework.data.r2dbc.query.Criteria;
import org.springframework.data.relational.core.mapping.RelationalPersistentProperty;
import org.springframework.data.relational.core.sql.Functions;
import org.springframework.data.relational.core.sql.Select;
import org.springframework.data.relational.core.sql.StatementBuilder;
@@ -129,12 +130,12 @@ public class SimpleR2dbcRepository<T, ID> implements ReactiveCrudRepository<T, I
Assert.notNull(id, "Id must not be null!");
List<String> columns = this.accessStrategy.getAllColumns(this.entity.getJavaType());
String idColumnName = getIdColumnName();
String idProperty = getIdProperty().getName();
StatementMapper mapper = this.accessStrategy.getStatementMapper().forType(this.entity.getJavaType());
StatementMapper.SelectSpec selectSpec = mapper.createSelect(this.entity.getTableName()) //
.withProjection(columns) //
.withCriteria(Criteria.where(idColumnName).is(id));
.withCriteria(Criteria.where(idProperty).is(id));
PreparedOperation<?> operation = mapper.getMappedObject(selectSpec);
@@ -160,12 +161,12 @@ public class SimpleR2dbcRepository<T, ID> implements ReactiveCrudRepository<T, I
Assert.notNull(id, "Id must not be null!");
String idColumnName = getIdColumnName();
String idProperty = getIdProperty().getName();
StatementMapper mapper = this.accessStrategy.getStatementMapper().forType(this.entity.getJavaType());
StatementMapper.SelectSpec selectSpec = mapper.createSelect(this.entity.getTableName())
.withProjection(Collections.singletonList(idColumnName)) //
.withCriteria(Criteria.where(idColumnName).is(id));
.withProjection(Collections.singletonList(idProperty)) //
.withCriteria(Criteria.where(idProperty).is(id));
PreparedOperation<?> operation = mapper.getMappedObject(selectSpec);
@@ -217,12 +218,12 @@ public class SimpleR2dbcRepository<T, ID> implements ReactiveCrudRepository<T, I
}
List<String> columns = this.accessStrategy.getAllColumns(this.entity.getJavaType());
String idColumnName = getIdColumnName();
String idProperty = getIdProperty().getName();
StatementMapper mapper = this.accessStrategy.getStatementMapper().forType(this.entity.getJavaType());
StatementMapper.SelectSpec selectSpec = mapper.createSelect(this.entity.getTableName()) //
.withProjection(columns) //
.withCriteria(Criteria.where(idColumnName).in(ids));
.withCriteria(Criteria.where(idProperty).in(ids));
PreparedOperation<?> operation = mapper.getMappedObject(selectSpec);
@@ -238,7 +239,7 @@ public class SimpleR2dbcRepository<T, ID> implements ReactiveCrudRepository<T, I
Table table = Table.create(this.entity.getTableName());
Select select = StatementBuilder //
.select(Functions.count(table.column(getIdColumnName()))) //
.select(Functions.count(table.column(getIdProperty().getColumnName()))) //
.from(table) //
.build();
@@ -260,7 +261,7 @@ public class SimpleR2dbcRepository<T, ID> implements ReactiveCrudRepository<T, I
return this.databaseClient.delete() //
.from(this.entity.getJavaType()) //
.table(this.entity.getTableName()) //
.matching(Criteria.where(getIdColumnName()).is(id)) //
.matching(Criteria.where(getIdProperty().getName()).is(id)) //
.fetch() //
.rowsUpdated() //
.then();
@@ -285,7 +286,7 @@ public class SimpleR2dbcRepository<T, ID> implements ReactiveCrudRepository<T, I
return this.databaseClient.delete() //
.from(this.entity.getJavaType()) //
.table(this.entity.getTableName()) //
.matching(Criteria.where(getIdColumnName()).in(ids)) //
.matching(Criteria.where(getIdProperty().getName()).in(ids)) //
.fetch() //
.rowsUpdated();
}).then();
@@ -339,12 +340,11 @@ public class SimpleR2dbcRepository<T, ID> implements ReactiveCrudRepository<T, I
return this.databaseClient.delete().from(this.entity.getTableName()).then();
}
private String getIdColumnName() {
private RelationalPersistentProperty getIdProperty() {
return this.converter //
.getMappingContext() //
.getRequiredPersistentEntity(this.entity.getJavaType()) //
.getRequiredIdProperty() //
.getColumnName();
.getRequiredIdProperty();
}
}