When database does not support batch updates, must retrieve generated keys with every serial update.

Author: ctailor2

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

@@ -85,7 +85,7 @@ int[] batchUpdate(String sql, SqlParameterSource[] batchArgs, KeyHolder generate
 	 * @see org.springframework.jdbc.support.GeneratedKeyHolder
 	 * @since 2.4
 	 */
-	public int[] batchUpdate(String sql, SqlParameterSource[] batchArgs, KeyHolder generatedKeyHolder,
+	int[] batchUpdate(String sql, SqlParameterSource[] batchArgs, KeyHolder generatedKeyHolder,
 			@Nullable String[] keyColumnNames) {
 
 		if (batchArgs.length == 0) {
@@ -118,22 +118,23 @@ public int getBatchSize() {
 		};
 		PreparedStatementCallback<int[]> preparedStatementCallback = ps -> {
 			int batchSize = bpss.getBatchSize();
+			generatedKeyHolder.getKeyList().clear();
 			if (JdbcUtils.supportsBatchUpdates(ps.getConnection())) {
 				for (int i = 0; i < batchSize; i++) {
 					bpss.setValues(ps, i);
 					ps.addBatch();
 				}
 				int[] results = ps.executeBatch();
-				storeGeneratedKeys(generatedKeyHolder).doInPreparedStatement(ps);
+				storeGeneratedKeys(generatedKeyHolder, ps);
 				return results;
 			} else {
 				List<Integer> rowsAffected = new ArrayList<>();
 				for (int i = 0; i < batchSize; i++) {
 					bpss.setValues(ps, i);
 					rowsAffected.add(ps.executeUpdate());
+					storeGeneratedKeys(generatedKeyHolder, ps);
 				}
 				int[] rowsAffectedArray = new int[rowsAffected.size()];
-				storeGeneratedKeys(generatedKeyHolder).doInPreparedStatement(ps);
 				for (int i = 0; i < rowsAffectedArray.length; i++) {
 					rowsAffectedArray[i] = rowsAffected.get(i);
 				}
@@ -145,24 +146,20 @@ public int getBatchSize() {
 		return result;
 	}
 
-	private PreparedStatementCallback<Void> storeGeneratedKeys(KeyHolder generatedKeyHolder) {
+	private void storeGeneratedKeys(KeyHolder generatedKeyHolder, PreparedStatement ps) throws SQLException {
 
-		return ps -> {
-			List<Map<String, Object>> generatedKeys = generatedKeyHolder.getKeyList();
-			generatedKeys.clear();
-			ResultSet keys = ps.getGeneratedKeys();
-			if (keys != null) {
-				try {
-					RowMapperResultSetExtractor<Map<String, Object>> rse =
-							new RowMapperResultSetExtractor<>(new ColumnMapRowMapper(), 1);
-					//noinspection ConstantConditions
-					generatedKeys.addAll(rse.extractData(keys));
-				}
-				finally {
-					JdbcUtils.closeResultSet(keys);
-				}
+		List<Map<String, Object>> generatedKeys = generatedKeyHolder.getKeyList();
+		ResultSet keys = ps.getGeneratedKeys();
+		if (keys != null) {
+			try {
+				RowMapperResultSetExtractor<Map<String, Object>> rse =
+						new RowMapperResultSetExtractor<>(new ColumnMapRowMapper(), 1);
+				//noinspection ConstantConditions
+				generatedKeys.addAll(rse.extractData(keys));
 			}
-			return null;
-		};
+			finally {
+				JdbcUtils.closeResultSet(keys);
+			}
+		}
 	}
 }