Add utility support for batch inserts

Author: jeffgbutler

src/main/java/org/mybatis/dynamic/sql/insert/BatchInsertDSL.java

@@ -23,12 +23,13 @@
 import org.mybatis.dynamic.sql.SqlColumn;
 import org.mybatis.dynamic.sql.SqlTable;
 import org.mybatis.dynamic.sql.util.AbstractColumnMapping;
+import org.mybatis.dynamic.sql.util.Buildable;
 import org.mybatis.dynamic.sql.util.ConstantMapping;
 import org.mybatis.dynamic.sql.util.NullMapping;
 import org.mybatis.dynamic.sql.util.PropertyMapping;
 import org.mybatis.dynamic.sql.util.StringConstantMapping;
 
-public class BatchInsertDSL<T> {
+public class BatchInsertDSL<T> implements Buildable<BatchInsertModel<T>> {
 
     private Collection<T> records;
     private SqlTable table;
@@ -43,6 +44,7 @@ public <F> ColumnMappingFinisher<F> map(SqlColumn<F> column) {
         return new ColumnMappingFinisher<>(column);
     }
 
+    @Override
     public BatchInsertModel<T> build() {
         return BatchInsertModel.withRecords(records)
                 .withTable(table)

src/main/java/org/mybatis/dynamic/sql/insert/render/BatchInsert.java

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2016-2019 the original author or authors.
+ *    Copyright 2016-2020 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -56,6 +56,10 @@ public String getInsertStatementSQL() {
         return insertStatement;
     }
 
+    public List<T> getRecords() {
+        return Collections.unmodifiableList(records);
+    }
+    
     public static <T> Builder<T> withRecords(List<T> records) {
         return new Builder<T>().withRecords(records);
     }

src/main/java/org/mybatis/dynamic/sql/util/spring/NamedParameterJdbcTemplateExtensions.java

@@ -21,9 +21,11 @@
 
 import org.mybatis.dynamic.sql.delete.DeleteModel;
 import org.mybatis.dynamic.sql.delete.render.DeleteStatementProvider;
+import org.mybatis.dynamic.sql.insert.BatchInsertModel;
 import org.mybatis.dynamic.sql.insert.GeneralInsertModel;
 import org.mybatis.dynamic.sql.insert.InsertModel;
 import org.mybatis.dynamic.sql.insert.MultiRowInsertModel;
+import org.mybatis.dynamic.sql.insert.render.BatchInsert;
 import org.mybatis.dynamic.sql.insert.render.GeneralInsertStatementProvider;
 import org.mybatis.dynamic.sql.insert.render.InsertStatementProvider;
 import org.mybatis.dynamic.sql.insert.render.MultiRowInsertStatementProvider;
@@ -37,8 +39,11 @@
 import org.springframework.jdbc.core.namedparam.BeanPropertySqlParameterSource;
 import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
+import org.springframework.jdbc.core.namedparam.SqlParameterSource;
+import org.springframework.jdbc.core.namedparam.SqlParameterSourceUtils;
 import org.springframework.jdbc.support.KeyHolder;
 
+
 public class NamedParameterJdbcTemplateExtensions {
     private NamedParameterJdbcTemplate template;
 
@@ -97,6 +102,15 @@ public <T> int insert(InsertStatementProvider<T> insertStatement, KeyHolder keyH
                 new BeanPropertySqlParameterSource(insertStatement.getRecord()), keyHolder);
     }
 
+    public <T> int[] insertBatch(Buildable<BatchInsertModel<T>> insertStatement) {
+        return insertBatch(SpringUtils.buildBatchInsert(insertStatement));
+    }
+
+    public <T> int[] insertBatch(BatchInsert<T> insertStatement) {
+        SqlParameterSource[] batch = SqlParameterSourceUtils.createBatch(insertStatement.getRecords());
+        return template.batchUpdate(insertStatement.getInsertStatementSQL(), batch);
+    }
+
     public <T> int insertMultiple(Buildable<MultiRowInsertModel<T>> insertStatement) {
         return insertMultiple(SpringUtils.buildMultiRowInsert(insertStatement));
     }

src/main/java/org/mybatis/dynamic/sql/util/spring/SpringUtils.java

@@ -17,9 +17,11 @@
 
 import org.mybatis.dynamic.sql.delete.DeleteModel;
 import org.mybatis.dynamic.sql.delete.render.DeleteStatementProvider;
+import org.mybatis.dynamic.sql.insert.BatchInsertModel;
 import org.mybatis.dynamic.sql.insert.GeneralInsertModel;
 import org.mybatis.dynamic.sql.insert.InsertModel;
 import org.mybatis.dynamic.sql.insert.MultiRowInsertModel;
+import org.mybatis.dynamic.sql.insert.render.BatchInsert;
 import org.mybatis.dynamic.sql.insert.render.GeneralInsertStatementProvider;
 import org.mybatis.dynamic.sql.insert.render.InsertStatementProvider;
 import org.mybatis.dynamic.sql.insert.render.MultiRowInsertStatementProvider;
@@ -37,6 +39,10 @@ public static DeleteStatementProvider buildDelete(Buildable<DeleteModel> deleteS
         return deleteStatement.build().render(RenderingStrategies.SPRING_NAMED_PARAMETER);
     }
 
+    public static <T> BatchInsert<T> buildBatchInsert(Buildable<BatchInsertModel<T>> insertStatement) {
+        return insertStatement.build().render(RenderingStrategies.SPRING_NAMED_PARAMETER);
+    }
+    
     public static GeneralInsertStatementProvider buildGeneralInsert(Buildable<GeneralInsertModel> insertStatement) {
         return insertStatement.build().render(RenderingStrategies.SPRING_NAMED_PARAMETER);
     }

src/test/java/examples/generated/always/spring/SpringTest.java

@@ -26,6 +26,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mybatis.dynamic.sql.delete.render.DeleteStatementProvider;
+import org.mybatis.dynamic.sql.insert.BatchInsertModel;
 import org.mybatis.dynamic.sql.insert.GeneralInsertModel;
 import org.mybatis.dynamic.sql.insert.InsertModel;
 import org.mybatis.dynamic.sql.insert.MultiRowInsertModel;
@@ -240,7 +241,7 @@ record = new GeneratedAlwaysRecord();
         record.setLastName("Smith");
         records.add(record);
 
-        SqlParameterSource[] batch = SqlParameterSourceUtils.createBatch(records.toArray());
+        SqlParameterSource[] batch = SqlParameterSourceUtils.createBatch(records);
 
         BatchInsert<GeneratedAlwaysRecord> batchInsert = insert(records)
                 .into(generatedAlways)
@@ -257,6 +258,36 @@ record = new GeneratedAlwaysRecord();
         assertThat(updateCounts[1]).isEqualTo(1);
     }
 
+    @Test
+    void testInsertBatchWithExtensions() {
+        NamedParameterJdbcTemplateExtensions extensions = new NamedParameterJdbcTemplateExtensions(template);
+
+        List<GeneratedAlwaysRecord> records = new ArrayList<>();
+        GeneratedAlwaysRecord record = new GeneratedAlwaysRecord();
+        record.setId(100);
+        record.setFirstName("Bob");
+        record.setLastName("Jones");
+        records.add(record);
+        
+        record = new GeneratedAlwaysRecord();
+        record.setId(101);
+        record.setFirstName("Jim");
+        record.setLastName("Smith");
+        records.add(record);
+
+        Buildable<BatchInsertModel<GeneratedAlwaysRecord>> insertStatement = insert(records)
+                .into(generatedAlways)
+                .map(id).toProperty("id")
+                .map(firstName).toProperty("firstName")
+                .map(lastName).toProperty("lastName");
+        
+        int[] updateCounts = extensions.insertBatch(insertStatement);
+        
+        assertThat(updateCounts).hasSize(2);
+        assertThat(updateCounts[0]).isEqualTo(1);
+        assertThat(updateCounts[1]).isEqualTo(1);
+    }
+
     @Test
     void testMultiRowInsert() {
         NamedParameterJdbcTemplateExtensions extensions = new NamedParameterJdbcTemplateExtensions(template);