Browse Source

Avoid calling executeBatch() with an empty batch

See gh-27154
pull/31121/head
Li0n13 3 years ago committed by Stephane Nicoll
parent
commit
2d7bf83d8d
  1. 2
      spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcTemplate.java
  2. 28
      spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateTests.java

2
spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcTemplate.java

@ -1050,7 +1050,7 @@ public class JdbcTemplate extends JdbcAccessor implements JdbcOperations { @@ -1050,7 +1050,7 @@ public class JdbcTemplate extends JdbcAccessor implements JdbcOperations {
}
ps.addBatch();
}
return ps.executeBatch();
return batchSize > 0 ? ps.executeBatch() : new int[] {};
}
else {
List<Integer> rowsAffected = new ArrayList<>();

28
spring-jdbc/src/test/java/org/springframework/jdbc/core/JdbcTemplateTests.java

@ -505,6 +505,34 @@ public class JdbcTemplateTests { @@ -505,6 +505,34 @@ public class JdbcTemplateTests {
verify(this.connection, atLeastOnce()).close();
}
@Test
public void testBatchUpdateWithPreparedStatementWithEmptyData() throws Exception {
final String sql = "UPDATE NOSUCHTABLE SET DATE_DISPATCHED = SYSDATE WHERE ID = ?";
final int[] ids = new int[] {};
final int[] rowsAffected = new int[] {};
given(this.preparedStatement.executeBatch()).willReturn(rowsAffected);
mockDatabaseMetaData(true);
BatchPreparedStatementSetter setter = new BatchPreparedStatementSetter() {
@Override
public void setValues(PreparedStatement ps, int i) throws SQLException {
ps.setInt(1, ids[i]);
}
@Override
public int getBatchSize() {
return ids.length;
}
};
JdbcTemplate template = new JdbcTemplate(this.dataSource, false);
int[] actualRowsAffected = template.batchUpdate(sql, setter);
assertThat(actualRowsAffected.length == 0).as("executed 0 updates").isTrue();
verify(this.preparedStatement, never()).executeBatch();
}
@Test
public void testInterruptibleBatchUpdate() throws Exception {
final String sql = "UPDATE NOSUCHTABLE SET DATE_DISPATCHED = SYSDATE WHERE ID = ?";

Loading…
Cancel
Save