Updates after merge

jeffgbutler · jeffgbutler · commit c4a9b91d5838 · 2023-04-20T14:10:54.000-04:00
diff --git a/src/main/java/org/mybatis/dynamic/sql/insert/render/AbstractMultiRowValuePhraseVisitor.java b/src/main/java/org/mybatis/dynamic/sql/insert/render/AbstractMultiRowValuePhraseVisitor.java
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
@@ -31,7 +31,7 @@ private BatchInsertRenderer(Builder<T> builder) {
     }
 
     public BatchInsert<T> render() {
-        BatchValuePhraseVisitor visitor = new BatchValuePhraseVisitor(renderingStrategy, "row"); //$NON-NLS-1$)
+        MultiRowValuePhraseVisitor visitor = new MultiRowValuePhraseVisitor(renderingStrategy, "row"); //$NON-NLS-1$)
         FieldAndValueCollector collector = model.mapColumnMappings(m -> m.accept(visitor))
                 .collect(FieldAndValueCollector.collect());
 
diff --git a/src/main/java/org/mybatis/dynamic/sql/insert/render/BatchValuePhraseVisitor.java b/src/main/java/org/mybatis/dynamic/sql/insert/render/BatchValuePhraseVisitor.java
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
@@ -17,15 +17,63 @@
 
 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.RowMapping;
+import org.mybatis.dynamic.sql.util.StringConstantMapping;
 
-public class MultiRowValuePhraseVisitor extends AbstractMultiRowValuePhraseVisitor {
+public class MultiRowValuePhraseVisitor extends MultiRowInsertMappingVisitor<FieldAndValueAndParameters> {
+    protected final RenderingStrategy renderingStrategy;
+    protected final String prefix;
 
-    public MultiRowValuePhraseVisitor(RenderingStrategy renderingStrategy, String prefix) {
-        super(renderingStrategy, prefix);
+    protected MultiRowValuePhraseVisitor(RenderingStrategy renderingStrategy, String prefix) {
+        this.renderingStrategy = renderingStrategy;
+        this.prefix = prefix;
     }
 
     @Override
-    String calculateJdbcPlaceholder(SqlColumn<?> column) {
-        return column.renderingStrategy().orElse(renderingStrategy).getMultiRowFormattedJdbcPlaceholder(column, prefix);
+    public FieldAndValueAndParameters visit(NullMapping mapping) {
+        return FieldAndValueAndParameters.withFieldName(mapping.columnName())
+                .withValuePhrase("null") //$NON-NLS-1$
+                .build();
+    }
+
+    @Override
+    public FieldAndValueAndParameters visit(ConstantMapping mapping) {
+        return FieldAndValueAndParameters.withFieldName(mapping.columnName())
+                .withValuePhrase(mapping.constant())
+                .build();
+    }
+
+    @Override
+    public FieldAndValueAndParameters visit(StringConstantMapping mapping) {
+        return FieldAndValueAndParameters.withFieldName(mapping.columnName())
+                .withValuePhrase("'" + mapping.constant() + "'") //$NON-NLS-1$ //$NON-NLS-2$
+                .build();
+    }
+
+    @Override
+    public FieldAndValueAndParameters visit(PropertyMapping mapping) {
+        return FieldAndValueAndParameters.withFieldName(mapping.columnName())
+                .withValuePhrase(mapping.mapColumn(c -> calculateJdbcPlaceholder(c, mapping.property())))
+                .build();
+    }
+
+    @Override
+    public FieldAndValueAndParameters visit(RowMapping mapping) {
+        return FieldAndValueAndParameters.withFieldName(mapping.columnName())
+                .withValuePhrase(mapping.mapColumn(this::calculateJdbcPlaceholder))
+                .build();
+    }
+
+    private String calculateJdbcPlaceholder(SqlColumn<?> column) {
+        return column.renderingStrategy().orElse(renderingStrategy).getRecordBasedInsertBinding(column, prefix);
+    }
+
+    private String calculateJdbcPlaceholder(SqlColumn<?> column, String parameterName) {
+        return column.renderingStrategy().orElse(renderingStrategy)
+                .getRecordBasedInsertBinding(column, prefix, 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
@@ -21,7 +21,6 @@
 import org.mybatis.dynamic.sql.render.RenderingStrategy;
 import org.mybatis.dynamic.sql.util.ConstantMapping;
 import org.mybatis.dynamic.sql.util.InsertMappingVisitor;
-import org.mybatis.dynamic.sql.util.Messages;
 import org.mybatis.dynamic.sql.util.NullMapping;
 import org.mybatis.dynamic.sql.util.PropertyMapping;
 import org.mybatis.dynamic.sql.util.PropertyWhenPresentMapping;
@@ -73,6 +72,18 @@ public Optional<FieldAndValueAndParameters> visit(PropertyWhenPresentMapping map
         }
     }
 
+    @Override
+    public Optional<FieldAndValueAndParameters> visit(RowMapping mapping) {
+        return FieldAndValueAndParameters.withFieldName(mapping.columnName())
+                .withValuePhrase(mapping.mapColumn(this::calculateJdbcPlaceholder))
+                .buildOptional();
+    }
+
+    private String calculateJdbcPlaceholder(SqlColumn<?> column) {
+        return column.renderingStrategy().orElse(renderingStrategy)
+                .getRecordBasedInsertBinding(column, "row"); //$NON-NLS-1$
+    }
+
     private String calculateJdbcPlaceholder(SqlColumn<?> column, String parameterName) {
         return column.renderingStrategy().orElse(renderingStrategy)
                 .getRecordBasedInsertBinding(column, "row", parameterName); //$NON-NLS-1$
diff --git a/src/main/java/org/mybatis/dynamic/sql/render/MyBatis3RenderingStrategy.java b/src/main/java/org/mybatis/dynamic/sql/render/MyBatis3RenderingStrategy.java
@@ -40,7 +40,7 @@ public String getFormattedJdbcPlaceholder(BindableColumn<?> column, String prefi
     }
 
     @Override
-    public String getFormattedJdbcPlaceholder(BindableColumn<?> column, String parameterName) {
+    public String getRecordBasedInsertBinding(BindableColumn<?> column, String parameterName) {
         return "#{" //$NON-NLS-1$
                 + parameterName
                 + renderJdbcType(column)
diff --git a/src/main/java/org/mybatis/dynamic/sql/render/RenderingStrategy.java b/src/main/java/org/mybatis/dynamic/sql/render/RenderingStrategy.java
@@ -92,16 +92,14 @@ public String formatParameterMapKey(AtomicInteger sequence) {
      *
      * @param column column definition used for generating type details in a MyBatis binding. Ignored for Spring.
      * @param prefix parameter prefix used for locating the parameters in a SQL provider object. Typically, will be
-     *     {@link RenderingStrategy#DEFAULT_PARAMETER_PREFIX}. This is ignored for Spring.
-     * @param parameterName name of the parameter. Typically generated by calling
-     *     {@link RenderingStrategy#formatParameterMapKey(AtomicInteger)}
+     *     either "row" or "records[x]" to match the properties of the generated statement object class.
+     * @param parameterName name of the parameter. Typically, this is a property in the row class associated with the
+     *     insert statement.
      * @return the generated binding
      */
     public String getRecordBasedInsertBinding(BindableColumn<?> column, String prefix, String parameterName) {
         return getFormattedJdbcPlaceholder(column, prefix, parameterName);
     }
 
-    public String getMultiRowFormattedJdbcPlaceholder(BindableColumn<?> column, String parameterName) {
-        return getFormattedJdbcPlaceholder(column, parameterName);
-    }
+    public abstract String getRecordBasedInsertBinding(BindableColumn<?> column, String parameterName);
 }
diff --git a/src/main/java/org/mybatis/dynamic/sql/render/SpringNamedParameterRenderingStrategy.java b/src/main/java/org/mybatis/dynamic/sql/render/SpringNamedParameterRenderingStrategy.java
@@ -24,11 +24,6 @@ public String getFormattedJdbcPlaceholder(BindableColumn<?> column, String prefi
         return getFormattedJdbcPlaceholder(prefix, parameterName);
     }
 
-    @Override
-    public String getFormattedJdbcPlaceholder(BindableColumn<?> column, String parameterName) {
-        return ":" + parameterName; //$NON-NLS-1$
-    }
-
     @Override
     public String getFormattedJdbcPlaceholder(String prefix, String parameterName) {
         return ":" + parameterName; //$NON-NLS-1$
@@ -40,7 +35,7 @@ public String getRecordBasedInsertBinding(BindableColumn<?> column, String prefi
     }
 
     @Override
-    public String getMultiRowFormattedJdbcPlaceholder(BindableColumn<?> column, String parameterName) {
+    public String getRecordBasedInsertBinding(BindableColumn<?> column, String parameterName) {
         return ":" + parameterName; //$NON-NLS-1$
     }
 }
diff --git a/src/main/java/org/mybatis/dynamic/sql/util/GeneralInsertMappingVisitor.java b/src/main/java/org/mybatis/dynamic/sql/util/GeneralInsertMappingVisitor.java
@@ -38,7 +38,6 @@ public final R visit(ColumnToColumnMapping columnMapping) {
 
     @Override
     public final R visit(RowMapping mapping) {
-        // TODO - fix error number
-        throw new UnsupportedOperationException(Messages.getInternalErrorString(99));
+        throw new UnsupportedOperationException(Messages.getInternalErrorString(InternalError.INTERNAL_ERROR_14));
     }
 }
diff --git a/src/main/java/org/mybatis/dynamic/sql/util/InsertMappingVisitor.java b/src/main/java/org/mybatis/dynamic/sql/util/InsertMappingVisitor.java
@@ -15,10 +15,6 @@
  */
 package org.mybatis.dynamic.sql.util;
 
-import org.mybatis.dynamic.sql.insert.render.FieldAndValueAndParameters;
-
-import java.util.Optional;
-
 public abstract class InsertMappingVisitor<R> implements ColumnMappingVisitor<R> {
     @Override
     public final <T> R visit(ValueMapping<T> mapping) {
@@ -44,10 +40,4 @@ public final R visit(SelectMapping mapping) {
     public final R visit(ColumnToColumnMapping columnMapping) {
         throw new UnsupportedOperationException(Messages.getInternalErrorString(InternalError.INTERNAL_ERROR_9));
     }
-
-    @Override
-    public R visit(RowMapping mapping) {
-        // TODO - fix error number
-        throw new UnsupportedOperationException(Messages.getInternalErrorString(99));
-    }
 }
diff --git a/src/main/java/org/mybatis/dynamic/sql/util/InternalError.java b/src/main/java/org/mybatis/dynamic/sql/util/InternalError.java
@@ -31,7 +31,9 @@ public enum InternalError {
     INTERNAL_ERROR_10(10),
     INTERNAL_ERROR_11(11),
     INTERNAL_ERROR_12(12),
-    INTERNAL_ERROR_13(13);
+    INTERNAL_ERROR_13(13),
+    INTERNAL_ERROR_14(14),
+    INTERNAL_ERROR_15(15);
 
     private final int number;
 
diff --git a/src/main/java/org/mybatis/dynamic/sql/util/UpdateMappingVisitor.java b/src/main/java/org/mybatis/dynamic/sql/util/UpdateMappingVisitor.java
@@ -28,7 +28,6 @@ public final R visit(PropertyWhenPresentMapping mapping) {
 
     @Override
     public final R visit(RowMapping mapping) {
-        // TODO - fix error number
-        throw new UnsupportedOperationException(Messages.getInternalErrorString(99));
+        throw new UnsupportedOperationException(Messages.getInternalErrorString(InternalError.INTERNAL_ERROR_15));
     }
 }
diff --git a/src/test/java/org/mybatis/dynamic/sql/insert/MapToRowTest.java b/src/test/java/org/mybatis/dynamic/sql/insert/MapToRowTest.java
@@ -124,7 +124,7 @@ void testBatchInsertWithSpring() {
                 .build()
                 .render(RenderingStrategies.SPRING_NAMED_PARAMETER);
 
-        String expected = "insert into foo (id1, id2) values (22, :id2)";
+        String expected = "insert into foo (id1, id2) values (22, :row.id2)";
         assertThat(batchInsert.getInsertStatementSQL()).isEqualTo(expected);
     }
 
diff --git a/src/test/java/org/mybatis/dynamic/sql/util/ColumnMappingVisitorTest.java b/src/test/java/org/mybatis/dynamic/sql/util/ColumnMappingVisitorTest.java
@@ -253,6 +253,11 @@ public String visit(PropertyMapping mapping) {
         public String visit(PropertyWhenPresentMapping mapping) {
             return "Property When Present Mapping";
         }
+
+        @Override
+        public String visit(RowMapping mapping) {
+            return "Row Mapping";
+        }
     }
 
     private static class UpdateVisitor extends UpdateMappingVisitor<String> {
@@ -319,5 +324,10 @@ public String visit(PropertyMapping mapping) {
             return "Property Mapping";
         }
 
+        @Override
+        public String visit(RowMapping mapping) {
+            return "Row Mapping";
+        }
+
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ private BatchInsertRenderer(Builder<T> builder) {`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`public BatchInsert<T> render() {`
`34`		`- BatchValuePhraseVisitor visitor = new BatchValuePhraseVisitor(renderingStrategy, "row"); //$NON-NLS-1$)`
	`34`	`+ MultiRowValuePhraseVisitor visitor = new MultiRowValuePhraseVisitor(renderingStrategy, "row"); //$NON-NLS-1$)`
`35`	`35`	`FieldAndValueCollector collector = model.mapColumnMappings(m -> m.accept(visitor))`
`36`	`36`	`.collect(FieldAndValueCollector.collect());`
`37`	`37`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public String getFormattedJdbcPlaceholder(BindableColumn<?> column, String prefi`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`@Override`
`43`		`- public String getFormattedJdbcPlaceholder(BindableColumn<?> column, String parameterName) {`
	`43`	`+ public String getRecordBasedInsertBinding(BindableColumn<?> column, String parameterName) {`
`44`	`44`	`return "#{" //$NON-NLS-1$`
`45`	`45`	`+ parameterName`
`46`	`46`	`+ renderJdbcType(column)`
Original file line number	Diff line number	Diff line change
`@@ -24,11 +24,6 @@ public String getFormattedJdbcPlaceholder(BindableColumn<?> column, String prefi`
`24`	`24`	`return getFormattedJdbcPlaceholder(prefix, parameterName);`
`25`	`25`	`}`
`26`	`26`
`27`		`- @Override`
`28`		`- public String getFormattedJdbcPlaceholder(BindableColumn<?> column, String parameterName) {`
`29`		`- return ":" + parameterName; //$NON-NLS-1$`
`30`		`- }`
`31`		`-`
`32`	`27`	`@Override`
`33`	`28`	`public String getFormattedJdbcPlaceholder(String prefix, String parameterName) {`
`34`	`29`	`return ":" + parameterName; //$NON-NLS-1$`
`@@ -40,7 +35,7 @@ public String getRecordBasedInsertBinding(BindableColumn<?> column, String prefi`
`40`	`35`	`}`
`41`	`36`
`42`	`37`	`@Override`
`43`		`- public String getMultiRowFormattedJdbcPlaceholder(BindableColumn<?> column, String parameterName) {`
	`38`	`+ public String getRecordBasedInsertBinding(BindableColumn<?> column, String parameterName) {`
`44`	`39`	`return ":" + parameterName; //$NON-NLS-1$`
`45`	`40`	`}`
`46`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,6 @@ public final R visit(ColumnToColumnMapping columnMapping) {`
`38`	`38`
`39`	`39`	`@Override`
`40`	`40`	`public final R visit(RowMapping mapping) {`
`41`		`- // TODO - fix error number`
`42`		`- throw new UnsupportedOperationException(Messages.getInternalErrorString(99));`
	`41`	`+ throw new UnsupportedOperationException(Messages.getInternalErrorString(InternalError.INTERNAL_ERROR_14));`
`43`	`42`	`}`
`44`	`43`	`}`