Add a new visitor so we don't need to pass a weird string value

jeffgbutler · jeffgbutler · commit 5dc34dd5c1f1 · 2019-07-15T16:15:56.000-04:00
diff --git a/src/main/java/org/mybatis/dynamic/sql/insert/render/BatchInsertRenderer.java b/src/main/java/org/mybatis/dynamic/sql/insert/render/BatchInsertRenderer.java
@@ -33,7 +33,7 @@ private BatchInsertRenderer(Builder<T> builder) {
     }
     
     public BatchInsert<T> render() {
-        ValuePhraseVisitor visitor = new ValuePhraseVisitor(renderingStrategy, "record"); //$NON-NLS-1$
+        ValuePhraseVisitor visitor = new ValuePhraseVisitor(renderingStrategy);
         FieldAndValueCollector collector = model.mapColumnMappings(MultiRowRenderingUtilities.toFieldAndValue(visitor))
                 .collect(FieldAndValueCollector.collect());
         
diff --git a/src/main/java/org/mybatis/dynamic/sql/insert/render/InsertRenderer.java b/src/main/java/org/mybatis/dynamic/sql/insert/render/InsertRenderer.java
@@ -35,7 +35,7 @@ private InsertRenderer(Builder<T> builder) {
     }
     
     public InsertStatementProvider<T> render() {
-        ValuePhraseVisitor visitor = new ValuePhraseVisitor(renderingStrategy, "record"); //$NON-NLS-1$
+        ValuePhraseVisitor visitor = new ValuePhraseVisitor(renderingStrategy);
         FieldAndValueCollector collector = model.mapColumnMappings(toFieldAndValue(visitor))
                 .collect(FieldAndValueCollector.collect());
         
diff --git a/src/main/java/org/mybatis/dynamic/sql/insert/render/MultiRowInsertRenderer.java b/src/main/java/org/mybatis/dynamic/sql/insert/render/MultiRowInsertRenderer.java
@@ -33,7 +33,7 @@ private MultiRowInsertRenderer(Builder<T> builder) {
     }
     
     public MultiRowInsertStatementProvider<T> render() {
-        ValuePhraseVisitor visitor = new ValuePhraseVisitor(renderingStrategy, "records[%s]"); //$NON-NLS-1$
+        ValuePhraseVisitor visitor = new MultiRowValuePhraseVisitor(renderingStrategy);
         FieldAndValueCollector collector = model.mapColumnMappings(MultiRowRenderingUtilities.toFieldAndValue(visitor))
                 .collect(FieldAndValueCollector.collect());
         
diff --git a/src/main/java/org/mybatis/dynamic/sql/insert/render/MultiRowValuePhraseVisitor.java b/src/main/java/org/mybatis/dynamic/sql/insert/render/MultiRowValuePhraseVisitor.java
@@ -0,0 +1,41 @@
+/**
+ *    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.
+ *    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.insert.render;
+
+import java.util.function.Function;
+
+import org.mybatis.dynamic.sql.SqlColumn;
+import org.mybatis.dynamic.sql.render.RenderingStrategy;
+import org.mybatis.dynamic.sql.util.PropertyMapping;
+
+public class MultiRowValuePhraseVisitor extends ValuePhraseVisitor {
+
+    public MultiRowValuePhraseVisitor(RenderingStrategy renderingStrategy) {
+        super(renderingStrategy);
+    }
+
+    @Override
+    public FieldAndValue visit(PropertyMapping mapping) {
+        return FieldAndValue.withFieldName(mapping.mapColumn(SqlColumn::name))
+                .withValuePhrase(mapping.mapColumn(toMultiRowJdbcPlaceholder(mapping.property())))
+                .build();
+    }
+
+    private Function<SqlColumn<?>, String> toMultiRowJdbcPlaceholder(String parameterName) {
+        return column -> renderingStrategy.getFormattedJdbcPlaceholder(column, "records[%s]", //$NON-NLS-1$
+                parameterName);
+    }
+}
diff --git a/src/main/java/org/mybatis/dynamic/sql/insert/render/ValuePhraseVisitor.java b/src/main/java/org/mybatis/dynamic/sql/insert/render/ValuePhraseVisitor.java
@@ -27,12 +27,10 @@
 
 public class ValuePhraseVisitor implements InsertMappingVisitor<FieldAndValue> {
     
-    private RenderingStrategy renderingStrategy;
-    private String prefix;
+    protected RenderingStrategy renderingStrategy;
     
-    public ValuePhraseVisitor(RenderingStrategy renderingStrategy, String prefix) {
+    public ValuePhraseVisitor(RenderingStrategy renderingStrategy) {
         this.renderingStrategy = renderingStrategy;
-        this.prefix = prefix;
     }
 
     @Override
@@ -64,6 +62,6 @@ public FieldAndValue visit(PropertyMapping mapping) {
     }
     
     private Function<SqlColumn<?>, String> toJdbcPlaceholder(String parameterName) {
-        return column -> renderingStrategy.getFormattedJdbcPlaceholder(column, prefix, parameterName);
+        return column -> renderingStrategy.getFormattedJdbcPlaceholder(column, "record", parameterName); //$NON-NLS-1$
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ private BatchInsertRenderer(Builder<T> builder) {`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`public BatchInsert<T> render() {`
`36`		`- ValuePhraseVisitor visitor = new ValuePhraseVisitor(renderingStrategy, "record"); //$NON-NLS-1$`
	`36`	`+ ValuePhraseVisitor visitor = new ValuePhraseVisitor(renderingStrategy);`
`37`	`37`	`FieldAndValueCollector collector = model.mapColumnMappings(MultiRowRenderingUtilities.toFieldAndValue(visitor))`
`38`	`38`	`.collect(FieldAndValueCollector.collect());`
`39`	`39`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ private InsertRenderer(Builder<T> builder) {`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`public InsertStatementProvider<T> render() {`
`38`		`- ValuePhraseVisitor visitor = new ValuePhraseVisitor(renderingStrategy, "record"); //$NON-NLS-1$`
	`38`	`+ ValuePhraseVisitor visitor = new ValuePhraseVisitor(renderingStrategy);`
`39`	`39`	`FieldAndValueCollector collector = model.mapColumnMappings(toFieldAndValue(visitor))`
`40`	`40`	`.collect(FieldAndValueCollector.collect());`
`41`	`41`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ private MultiRowInsertRenderer(Builder<T> builder) {`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`public MultiRowInsertStatementProvider<T> render() {`
`36`		`- ValuePhraseVisitor visitor = new ValuePhraseVisitor(renderingStrategy, "records[%s]"); //$NON-NLS-1$`
	`36`	`+ ValuePhraseVisitor visitor = new MultiRowValuePhraseVisitor(renderingStrategy);`
`37`	`37`	`FieldAndValueCollector collector = model.mapColumnMappings(MultiRowRenderingUtilities.toFieldAndValue(visitor))`
`38`	`38`	`.collect(FieldAndValueCollector.collect());`
`39`	`39`
Original file line number	Diff line number	Diff line change
`@@ -27,12 +27,10 @@`
`27`	`27`
`28`	`28`	`public class ValuePhraseVisitor implements InsertMappingVisitor<FieldAndValue> {`
`29`	`29`
`30`		`- private RenderingStrategy renderingStrategy;`
`31`		`- private String prefix;`
	`30`	`+ protected RenderingStrategy renderingStrategy;`
`32`	`31`
`33`		`- public ValuePhraseVisitor(RenderingStrategy renderingStrategy, String prefix) {`
	`32`	`+ public ValuePhraseVisitor(RenderingStrategy renderingStrategy) {`
`34`	`33`	`this.renderingStrategy = renderingStrategy;`
`35`		`- this.prefix = prefix;`
`36`	`34`	`}`
`37`	`35`
`38`	`36`	`@Override`
`@@ -64,6 +62,6 @@ public FieldAndValue visit(PropertyMapping mapping) {`
`64`	`62`	`}`
`65`	`63`
`66`	`64`	`private Function<SqlColumn<?>, String> toJdbcPlaceholder(String parameterName) {`
`67`		`- return column -> renderingStrategy.getFormattedJdbcPlaceholder(column, prefix, parameterName);`
	`65`	`+ return column -> renderingStrategy.getFormattedJdbcPlaceholder(column, "record", parameterName); //$NON-NLS-1$`
`68`	`66`	`}`
`69`	`67`	`}`