Polishing

Author: jeffgbutler

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

@@ -48,11 +48,17 @@ public BatchInsert<T> render() {
     private String calculateInsertStatement(List<FieldAndValue> fieldsAndValues) {
         return "insert into" //$NON-NLS-1$
                 + spaceBefore(model.table().tableNameAtRuntime())
-                + spaceBefore(MultiRowRenderingUtilities.calculateColumnsPhrase(fieldsAndValues))
-                + spaceBefore(calculateVluesPhrase(fieldsAndValues));
+                + spaceBefore(calculateColumnsPhrase(fieldsAndValues))
+                + spaceBefore(calculateValuesPhrase(fieldsAndValues));
     }
 
-    private String calculateVluesPhrase(List<FieldAndValue> fieldsAndValues) {
+    private String calculateColumnsPhrase(List<FieldAndValue> fieldsAndValues) {
+        return fieldsAndValues.stream()
+                .map(FieldAndValue::fieldName)
+                .collect(Collectors.joining(", ", "(", ")")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    }
+    
+    private String calculateValuesPhrase(List<FieldAndValue> fieldsAndValues) {
         return fieldsAndValues.stream()
                 .map(FieldAndValue::valuePhrase)
                 .collect(Collectors.joining(", ", "values (", ")")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$

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

@@ -35,10 +35,6 @@ public String valuePhrase() {
         return valuePhrase;
     }
 
-    public String valuePhrase(int row) {
-        return String.format(valuePhrase, row);
-    }
-
     public static Builder withFieldName(String fieldName) {
         return new Builder().withFieldName(fieldName);
     }

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

@@ -36,6 +36,7 @@ private MultiRowInsertRenderer(Builder<T> builder) {
     }
 
     public MultiRowInsertStatementProvider<T> render() {
+        // the prefix is a generic format that will be resolved below with String.format(...)
         MultiRowValuePhraseVisitor visitor =
                 new MultiRowValuePhraseVisitor(renderingStrategy, "records[%s]"); //$NON-NLS-1$
         List<FieldAndValue> fieldsAndValues = model
@@ -50,10 +51,16 @@ public MultiRowInsertStatementProvider<T> render() {
     private String calculateInsertStatement(List<FieldAndValue> fieldsAndValues) {
         return "insert into" //$NON-NLS-1$
                 + spaceBefore(model.table().tableNameAtRuntime())
-                + spaceBefore(MultiRowRenderingUtilities.calculateColumnsPhrase(fieldsAndValues))
+                + spaceBefore(calculateColumnsPhrase(fieldsAndValues))
                 + spaceBefore(calculateMultiRowInsertValuesPhrase(fieldsAndValues, model.recordCount()));
     }
 
+    private String calculateColumnsPhrase(List<FieldAndValue> fieldsAndValues) {
+        return fieldsAndValues.stream()
+                .map(FieldAndValue::fieldName)
+                .collect(Collectors.joining(", ", "(", ")")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    }
+    
     private String calculateMultiRowInsertValuesPhrase(List<FieldAndValue> fieldsAndValues, int rowCount) {
         return IntStream.range(0, rowCount)
                 .mapToObj(i -> toSingleRowOfValues(fieldsAndValues, i))
@@ -62,7 +69,8 @@ private String calculateMultiRowInsertValuesPhrase(List<FieldAndValue> fieldsAnd
 
     private String toSingleRowOfValues(List<FieldAndValue> fieldsAndValues, int row) {
         return fieldsAndValues.stream()
-                .map(fmv -> fmv.valuePhrase(row))
+                .map(FieldAndValue::valuePhrase)
+                .map(s -> String.format(s, row))
                 .collect(Collectors.joining(", ", "(", ")")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     }
 

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

@@ -150,7 +150,6 @@ void testInsertSelectWithMultipleRecords() {
 
             rows = mapper.insertSelect(insertSelectStatement, keys);
             assertThat(rows).isEqualTo(2);
-            System.out.println(keys);
             assertThat(keys.get(0).getKey()).isEqualTo(24);
             assertThat(keys.get(1).getKey()).isEqualTo(25);
 

src/test/java/examples/generated/always/mybatis/PersonMapperTest.java

@@ -28,6 +28,7 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mybatis.dynamic.sql.delete.DeleteModel;
+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;
@@ -281,6 +282,47 @@ record = new PersonRecord();
         assertThat(rows).isEqualTo(2);
     }
 
+    @Test
+    void testInsertBatch() {
+        
+        List<PersonRecord> records = new ArrayList<>();
+        
+        PersonRecord record = new PersonRecord();
+        record.setId(100);
+        record.setFirstName("Joe");
+        record.setLastName(LastName.of("Jones"));
+        record.setBirthDate(new Date());
+        record.setEmployed(true);
+        record.setOccupation("Developer");
+        record.setAddressId(1);
+        records.add(record);
+        
+        record = new PersonRecord();
+        record.setId(101);
+        record.setFirstName("Sarah");
+        record.setLastName(LastName.of("Smith"));
+        record.setBirthDate(new Date());
+        record.setEmployed(true);
+        record.setOccupation("Architect");
+        record.setAddressId(2);
+        records.add(record);
+
+        Buildable<BatchInsertModel<PersonRecord>> insertStatement = insert(records).into(person)
+                .map(id).toProperty("id")
+                .map(firstName).toProperty("firstName")
+                .map(lastName).toProperty("lastNameAsString")
+                .map(birthDate).toProperty("birthDate")
+                .map(employed).toProperty("employedAsString")
+                .map(occupation).toProperty("occupation")
+                .map(addressId).toProperty("addressId");
+        
+        int[] rows = template.insertBatch(insertStatement);
+        
+        assertThat(rows).hasSize(2);
+        assertThat(rows[0]).isEqualTo(1);
+        assertThat(rows[1]).isEqualTo(1);
+    }
+
     @Test
     void testInsertSelective() {
         PersonRecord record = new PersonRecord();