Simplify multi insert statement rendering

Author: jeffgbutler

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

@@ -35,7 +35,7 @@ private BatchInsertRenderer(Builder<T> builder) {
     }
 
     public BatchInsert<T> render() {
-        ValuePhraseVisitor visitor = new ValuePhraseVisitor(renderingStrategy);
+        ValuePhraseVisitor visitor = new ValuePhraseVisitor(renderingStrategy, "record"); //$NON-NLS-1$
         FieldAndValueCollector collector = model.mapColumnMappings(toFieldAndValue(visitor))
                 .collect(FieldAndValueCollector.collect());
 

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

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2016-2017 the original author or authors.
+ *    Copyright 2016-2019 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.
@@ -34,6 +34,10 @@ 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/FieldAndMultipleValuesCollector.java

@@ -19,6 +19,7 @@
 import java.util.List;
 import java.util.stream.Collector;
 import java.util.stream.Collectors;
+import java.util.stream.IntStream;
 
 public class FieldAndValueCollector {
 
@@ -49,6 +50,18 @@ public String valuesPhrase() {
                 .collect(Collectors.joining(", ", "values (", ")")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
     }
 
+    public String multiRowInsertValuesPhrase(int rowCount) {
+        return IntStream.range(0, rowCount)
+                .mapToObj(this::toSingleRowOfValues)
+                .collect(Collectors.joining(", ", "values ", "")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    }
+    
+    private String toSingleRowOfValues(int row) {
+        return fieldsAndValue.stream()
+                .map(fmv -> fmv.valuePhrase(row))
+                .collect(Collectors.joining(", ", "(", ")")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+    }
+    
     public static Collector<FieldAndValue, FieldAndValueCollector, FieldAndValueCollector> collect() {
         return Collector.of(FieldAndValueCollector::new,
                 FieldAndValueCollector::add,

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

@@ -35,7 +35,7 @@ private InsertRenderer(Builder<T> builder) {
     }
 
     public InsertStatementProvider<T> render() {
-        ValuePhraseVisitor visitor = new ValuePhraseVisitor(renderingStrategy);
+        ValuePhraseVisitor visitor = new ValuePhraseVisitor(renderingStrategy, "record"); //$NON-NLS-1$
         FieldAndValueCollector collector = model.mapColumnMappings(toFieldAndValue(visitor))
                 .collect(FieldAndValueCollector.collect());
 

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

@@ -35,31 +35,28 @@ private MultiRowInsertRenderer(Builder<T> builder) {
     }
 
     public MultiRowInsertStatementProvider<T> render() {
-        MultiRowInsertValuePhraseVisitor visitor =
-                new MultiRowInsertValuePhraseVisitor(renderingStrategy, model.recordCount());
-        FieldAndMultipleValuesCollector collector = model.mapColumnMappings(toFieldAndMultipleValues(visitor))
-                .collect(FieldAndMultipleValuesCollector.collect());
+        ValuePhraseVisitor visitor = new ValuePhraseVisitor(renderingStrategy, "records[%s]"); //$NON-NLS-1$
+        FieldAndValueCollector collector = model.mapColumnMappings(toFieldAndValue(visitor))
+                .collect(FieldAndValueCollector.collect());
 
         return new DefaultMultiRowInsertStatementProvider.Builder<T>().withRecords(model.records())
                 .withInsertStatement(calculateInsertStatement(collector))
                 .build();
     }
 
-    private Function<InsertMapping, FieldAndMultipleValues> toFieldAndMultipleValues(
-            MultiRowInsertValuePhraseVisitor visitor) {
+    private Function<InsertMapping, FieldAndValue> toFieldAndValue(ValuePhraseVisitor visitor) {
         return insertMapping -> toFieldAndValue(visitor, insertMapping);
     }
 
-    private FieldAndMultipleValues toFieldAndValue(MultiRowInsertValuePhraseVisitor visitor,
-            InsertMapping insertMapping) {
+    private FieldAndValue toFieldAndValue(ValuePhraseVisitor visitor, InsertMapping insertMapping) {
         return insertMapping.accept(visitor);
     }
 
-    private String calculateInsertStatement(FieldAndMultipleValuesCollector collector) {
+    private String calculateInsertStatement(FieldAndValueCollector collector) {
         return "insert into" //$NON-NLS-1$
                 + spaceBefore(model.table().tableNameAtRuntime())
                 + spaceBefore(collector.columnsPhrase())
-                + spaceBefore(collector.valuesPhrase());
+                + spaceBefore(collector.multiRowInsertValuesPhrase(model.recordCount()));
     }
 
     public static <T> Builder<T> withMultiRowInsertModel(MultiRowInsertModel<T> model) {

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

@@ -1,5 +1,5 @@
 /**
- *    Copyright 2016-2017 the original author or authors.
+ *    Copyright 2016-2019 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.
@@ -28,9 +28,11 @@
 public class ValuePhraseVisitor implements InsertMappingVisitor<FieldAndValue> {
 
     private RenderingStrategy renderingStrategy;
+    private String prefix;
 
-    public ValuePhraseVisitor(RenderingStrategy renderingStrategy) {
+    public ValuePhraseVisitor(RenderingStrategy renderingStrategy, String prefix) {
         this.renderingStrategy = renderingStrategy;
+        this.prefix = prefix;
     }
 
     @Override
@@ -62,6 +64,6 @@ public FieldAndValue visit(PropertyMapping mapping) {
     }
 
     private Function<SqlColumn<?>, String> toJdbcPlaceholder(String parameterName) {
-        return column -> renderingStrategy.getFormattedJdbcPlaceholder(column, "record", parameterName); //$NON-NLS-1$
+        return column -> renderingStrategy.getFormattedJdbcPlaceholder(column, prefix, parameterName);
     }
 }