Make a separate visitor for the multi-row inserts

Author: jeffgbutler

src/main/java/org/mybatis/dynamic/sql/insert/render/BatchInsertRenderer.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.
@@ -33,7 +33,7 @@ private BatchInsertRenderer(Builder<T> builder) {
     }
 
     public BatchInsert<T> render() {
-        ValuePhraseVisitor visitor = new ValuePhraseVisitor(renderingStrategy);
+        MultiRowValuePhraseVisitor visitor = new MultiRowValuePhraseVisitor(renderingStrategy, "record"); //$NON-NLS-1$)
         FieldAndValueCollector collector = model.mapColumnMappings(MultiRowRenderingUtilities.toFieldAndValue(visitor))
                 .collect(FieldAndValueCollector.collect());
 

src/main/java/org/mybatis/dynamic/sql/insert/render/MultiRowInsertRenderer.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.
@@ -33,7 +33,7 @@ private MultiRowInsertRenderer(Builder<T> builder) {
     }
 
     public MultiRowInsertStatementProvider<T> render() {
-        ValuePhraseVisitor visitor = new MultiRowValuePhraseVisitor(renderingStrategy);
+        MultiRowValuePhraseVisitor visitor = new MultiRowValuePhraseVisitor(renderingStrategy, "records[%s]"); //$NON-NLS-1$
         FieldAndValueCollector collector = model.mapColumnMappings(MultiRowRenderingUtilities.toFieldAndValue(visitor))
                 .collect(FieldAndValueCollector.collect());
 

src/main/java/org/mybatis/dynamic/sql/insert/render/MultiRowRenderingUtilities.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.
@@ -23,11 +23,11 @@ public class MultiRowRenderingUtilities {
 
     private MultiRowRenderingUtilities() {}
 
-    public static Function<AbstractColumnMapping, FieldAndValue> toFieldAndValue(ValuePhraseVisitor visitor) {
+    public static Function<AbstractColumnMapping, FieldAndValue> toFieldAndValue(MultiRowValuePhraseVisitor visitor) {
         return insertMapping -> MultiRowRenderingUtilities.toFieldAndValue(visitor, insertMapping);
     }
 
-    public static FieldAndValue toFieldAndValue(ValuePhraseVisitor visitor, AbstractColumnMapping insertMapping) {
+    public static FieldAndValue toFieldAndValue(MultiRowValuePhraseVisitor visitor, AbstractColumnMapping insertMapping) {
         return insertMapping.accept(visitor);
     }
 }

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

@@ -19,24 +19,52 @@
 
 import org.mybatis.dynamic.sql.SqlColumn;
 import org.mybatis.dynamic.sql.render.RenderingStrategy;
+import org.mybatis.dynamic.sql.util.ConstantMapping;
+import org.mybatis.dynamic.sql.util.MultiRowInsertMappingVisitor;
+import org.mybatis.dynamic.sql.util.NullMapping;
 import org.mybatis.dynamic.sql.util.PropertyMapping;
+import org.mybatis.dynamic.sql.util.StringConstantMapping;
 
-public class MultiRowValuePhraseVisitor extends ValuePhraseVisitor {
+public class MultiRowValuePhraseVisitor extends MultiRowInsertMappingVisitor<FieldAndValue> {
 
-    public MultiRowValuePhraseVisitor(RenderingStrategy renderingStrategy) {
-        super(renderingStrategy);
+    private RenderingStrategy renderingStrategy;
+    private String prefix;
+
+    public MultiRowValuePhraseVisitor(RenderingStrategy renderingStrategy, String prefix) {
+        this.renderingStrategy = renderingStrategy;
+        this.prefix = prefix;
+    }
+
+    @Override
+    public FieldAndValue visit(NullMapping mapping) {
+        return FieldAndValue.withFieldName(mapping.mapColumn(SqlColumn::name))
+                .withValuePhrase("null") //$NON-NLS-1$
+                .build();
     }
 
+    @Override
+    public FieldAndValue visit(ConstantMapping mapping) {
+        return FieldAndValue.withFieldName(mapping.mapColumn(SqlColumn::name))
+                .withValuePhrase(mapping.constant())
+                .build();
+    }
+
+    @Override
+    public FieldAndValue visit(StringConstantMapping mapping) {
+        return FieldAndValue.withFieldName(mapping.mapColumn(SqlColumn::name))
+                .withValuePhrase("'" + mapping.constant() + "'") //$NON-NLS-1$ //$NON-NLS-2$
+                .build();
+    }
+    
     @Override
     public FieldAndValue visit(PropertyMapping mapping) {
         return FieldAndValue.withFieldName(mapping.mapColumn(SqlColumn::name))
-                .withValuePhrase(mapping.mapColumn(toMultiRowJdbcPlaceholder(mapping.property())))
+                .withValuePhrase(mapping.mapColumn(toJdbcPlaceholder(mapping.property())))
                 .build();
     }
 
-    private Function<SqlColumn<?>, String> toMultiRowJdbcPlaceholder(String parameterName) {
+    private Function<SqlColumn<?>, String> toJdbcPlaceholder(String parameterName) {
         return column -> column.renderingStrategy().orElse(renderingStrategy)
-                .getFormattedJdbcPlaceholder(column, "records[%s]", //$NON-NLS-1$
-                        parameterName);
+                .getFormattedJdbcPlaceholder(column, prefix, parameterName);
     }
 }

src/main/java/org/mybatis/dynamic/sql/util/MultiRowInsertMappingVisitor.java

@@ -0,0 +1,33 @@
+/**
+ *    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.
+ *    You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package org.mybatis.dynamic.sql.util;
+
+public abstract class MultiRowInsertMappingVisitor<T> implements ColumnMappingVisitor<T> {
+    @Override
+    public final <R> T visit(ValueMapping<R> mapping) {
+        throw new UnsupportedOperationException();
+    }
+    
+    @Override
+    public final T visit(SelectMapping mapping) {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public final T visit(ColumnToColumnMapping columnMapping) {
+        throw new UnsupportedOperationException();
+    }
+}