Browse Source

Avoid noop update for Id only aggregates.

Closes #1309
pull/1564/head
Jens Schauder 3 years ago
parent
commit
d95b5592a7
No known key found for this signature in database
GPG Key ID: 45CC872F17423DBF
  1. 7
      spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/DefaultDataAccessStrategy.java
  2. 4
      spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/SqlIdentifierParameterSource.java
  3. 10
      spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/JdbcAggregateTemplateIntegrationTests.java

7
spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/DefaultDataAccessStrategy.java

@ -139,7 +139,12 @@ public class DefaultDataAccessStrategy implements DataAccessStrategy { @@ -139,7 +139,12 @@ public class DefaultDataAccessStrategy implements DataAccessStrategy {
*/
@Override
public <S> boolean update(S instance, Class<S> domainType) {
return operations.update(sql(domainType).getUpdate(), sqlParametersFactory.forUpdate(instance, domainType)) != 0;
SqlIdentifierParameterSource parameterSource = sqlParametersFactory.forUpdate(instance, domainType);
if (parameterSource.size() <= 1) {
return true; // returning true, because conceptually the one row was correctly updated
}
return operations.update(sql(domainType).getUpdate(), parameterSource) != 0;
}
/*

4
spring-data-jdbc/src/main/java/org/springframework/data/jdbc/core/convert/SqlIdentifierParameterSource.java

@ -81,4 +81,8 @@ class SqlIdentifierParameterSource extends AbstractSqlParameterSource { @@ -81,4 +81,8 @@ class SqlIdentifierParameterSource extends AbstractSqlParameterSource {
addValue(identifier, others.getValue(name), others.getSqlType(name));
}
}
int size() {
return namesToValues.size();
}
}

10
spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/JdbcAggregateTemplateIntegrationTests.java

@ -983,6 +983,16 @@ class JdbcAggregateTemplateIntegrationTests { @@ -983,6 +983,16 @@ class JdbcAggregateTemplateIntegrationTests {
assertThat(template.save(entity).id).isNotNull();
}
@Test // GH-1309
void updateIdOnlyAggregate() {
WithIdOnly entity = new WithIdOnly();
assertThat(template.save(entity).id).isNotNull();
template.save(entity);
}
@Test // GH-1232
@EnabledOnFeature(IS_HSQL)
void beforeSaveCallbackEffectsAreVisibleForInsert() {

Loading…
Cancel
Save