Complete work on a general insert statement and test everything

Author: jeffgbutler

src/main/java/org/mybatis/dynamic/sql/SqlBuilder.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.
@@ -24,11 +24,9 @@
 import org.mybatis.dynamic.sql.delete.DeleteModel;
 import org.mybatis.dynamic.sql.insert.BatchInsertDSL;
 import org.mybatis.dynamic.sql.insert.GeneralInsertDSL;
-import org.mybatis.dynamic.sql.insert.GeneralInsertDSL.SetClauseFinisher;
 import org.mybatis.dynamic.sql.insert.InsertDSL;
 import org.mybatis.dynamic.sql.insert.InsertSelectDSL;
 import org.mybatis.dynamic.sql.insert.MultiRowInsertDSL;
-import org.mybatis.dynamic.sql.insert.InsertSelectDSL.SelectGatherer;
 import org.mybatis.dynamic.sql.select.CountDSL;
 import org.mybatis.dynamic.sql.select.QueryExpressionDSL.FromGatherer;
 import org.mybatis.dynamic.sql.select.SelectDSL;
@@ -641,25 +639,25 @@ static SortSpecification sortColumn(String name) {
         return SimpleSortSpecification.of(name);
     }
 
-    public static class InsertIntoNextStep {
+    class InsertIntoNextStep {
 
         private SqlTable table;
-        
+
         private InsertIntoNextStep(SqlTable table) {
             this.table = Objects.requireNonNull(table);
         }
-        
+
         public InsertSelectDSL withSelectStatement(Buildable<SelectModel> selectModelBuilder) {
             return InsertSelectDSL.insertInto(table)
                     .withSelectStatement(selectModelBuilder);
         }
 
-        public SelectGatherer withColumnList(SqlColumn<?>...columns) {
+        public InsertSelectDSL.SelectGatherer withColumnList(SqlColumn<?>...columns) {
             return InsertSelectDSL.insertInto(table)
                     .withColumnList(columns);
         }
 
-        public <T> SetClauseFinisher<T> set(SqlColumn<T> column) {
+        public <T> GeneralInsertDSL.SetClauseFinisher<T> set(SqlColumn<T> column) {
             return GeneralInsertDSL.insertInto(table)
                     .set(column);
         }

src/main/java/org/mybatis/dynamic/sql/insert/GeneralInsertDSL.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.
@@ -22,12 +22,9 @@
 
 import org.mybatis.dynamic.sql.SqlColumn;
 import org.mybatis.dynamic.sql.SqlTable;
-import org.mybatis.dynamic.sql.select.SelectModel;
 import org.mybatis.dynamic.sql.util.AbstractColumnMapping;
-import org.mybatis.dynamic.sql.util.Buildable;
 import org.mybatis.dynamic.sql.util.ConstantMapping;
 import org.mybatis.dynamic.sql.util.NullMapping;
-import org.mybatis.dynamic.sql.util.SelectMapping;
 import org.mybatis.dynamic.sql.util.StringConstantMapping;
 import org.mybatis.dynamic.sql.util.ValueMapping;
 
@@ -86,11 +83,6 @@ public GeneralInsertDSL equalTo(Supplier<T> valueSupplier) {
             return GeneralInsertDSL.this;
         }
 
-        public GeneralInsertDSL equalTo(Buildable<SelectModel> buildable) {
-            insertMappings.add(SelectMapping.of(column, buildable));
-            return GeneralInsertDSL.this;
-        }
-
         public GeneralInsertDSL equalToWhenPresent(T value) {
             return equalToWhenPresent(() -> value);
         }

src/main/java/org/mybatis/dynamic/sql/insert/render/FieldAndValueAndParameters.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.
@@ -66,11 +66,6 @@ public Builder withParameter(String key, Object value) {
             return this;
         }
 
-        public Builder withParameters(Map<String, Object> parameters) {
-            this.parameters.putAll(parameters);
-            return this;
-        }
-        
         public FieldAndValueAndParameters build() {
             return new FieldAndValueAndParameters(this);
         }

src/main/java/org/mybatis/dynamic/sql/insert/render/GeneralInsertValuePhraseVisitor.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.
@@ -20,12 +20,9 @@
 
 import org.mybatis.dynamic.sql.SqlColumn;
 import org.mybatis.dynamic.sql.render.RenderingStrategy;
-import org.mybatis.dynamic.sql.select.render.SelectRenderer;
-import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
 import org.mybatis.dynamic.sql.util.ColumnMappingVisitor;
 import org.mybatis.dynamic.sql.util.ConstantMapping;
 import org.mybatis.dynamic.sql.util.NullMapping;
-import org.mybatis.dynamic.sql.util.SelectMapping;
 import org.mybatis.dynamic.sql.util.StringConstantMapping;
 import org.mybatis.dynamic.sql.util.ValueMapping;
 
@@ -71,25 +68,6 @@ public <R> FieldAndValueAndParameters visit(ValueMapping<R> mapping) {
                 .build();
     }
 
-    @Override
-    public FieldAndValueAndParameters visit(SelectMapping mapping) {
-        SelectStatementProvider selectStatement = SelectRenderer.withSelectModel(mapping.selectModel())
-                .withRenderingStrategy(renderingStrategy)
-                .withSequence(sequence)
-                .build()
-                .render();
-        
-        String fragment = mapping.mapColumn(SqlColumn::name)
-                + " = (" //$NON-NLS-1$
-                + selectStatement.getSelectStatement()
-                + ")"; //$NON-NLS-1$
-        
-        return FieldAndValueAndParameters.withFieldName(mapping.mapColumn(SqlColumn::name))
-                .withValuePhrase(fragment)
-                .withParameters(selectStatement.getParameters())
-                .build();
-    }
-
     private Function<SqlColumn<?>, String> toJdbcPlaceholder(String parameterName) {
         return column -> renderingStrategy
                 .getFormattedJdbcPlaceholder(column, RenderingStrategy.DEFAULT_PARAMETER_PREFIX, parameterName);

src/main/java/org/mybatis/dynamic/sql/util/mybatis3/MyBatis3Utils.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.
@@ -27,8 +27,10 @@
 import org.mybatis.dynamic.sql.SqlTable;
 import org.mybatis.dynamic.sql.delete.DeleteDSLCompleter;
 import org.mybatis.dynamic.sql.delete.render.DeleteStatementProvider;
+import org.mybatis.dynamic.sql.insert.GeneralInsertDSL;
 import org.mybatis.dynamic.sql.insert.InsertDSL;
 import org.mybatis.dynamic.sql.insert.MultiRowInsertDSL;
+import org.mybatis.dynamic.sql.insert.render.GeneralInsertStatementProvider;
 import org.mybatis.dynamic.sql.insert.render.InsertStatementProvider;
 import org.mybatis.dynamic.sql.insert.render.MultiRowInsertStatementProvider;
 import org.mybatis.dynamic.sql.render.RenderingStrategies;
@@ -93,6 +95,18 @@ public static <R> int insert(ToIntFunction<InsertStatementProvider<R>> mapper, R
         return mapper.applyAsInt(insert(record, table, completer));
     }
 
+    public static GeneralInsertStatementProvider insert(SqlTable table,
+            UnaryOperator<GeneralInsertDSL> completer) {
+        return completer.apply(GeneralInsertDSL.insertInto(table))
+                .build()
+                .render(RenderingStrategies.MYBATIS3);
+    }
+
+    public static int insert(ToIntFunction<GeneralInsertStatementProvider> mapper, 
+            SqlTable table, UnaryOperator<GeneralInsertDSL> completer) {
+        return mapper.applyAsInt(insert(table, completer));
+    }
+    
     public static <R> MultiRowInsertStatementProvider<R> insertMultiple(Collection<R> records, SqlTable table,
             UnaryOperator<MultiRowInsertDSL<R>> completer) {
         return completer.apply(SqlBuilder.insertMultiple(records).into(table))

src/main/kotlin/org/mybatis/dynamic/sql/util/kotlin/KotlinUpdateBuilder.kt

@@ -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.
@@ -16,21 +16,24 @@
 package org.mybatis.dynamic.sql.util.kotlin
 
 import org.mybatis.dynamic.sql.SqlColumn
+import org.mybatis.dynamic.sql.insert.GeneralInsertDSL
 import org.mybatis.dynamic.sql.insert.InsertDSL
 import org.mybatis.dynamic.sql.insert.MultiRowInsertDSL
 import org.mybatis.dynamic.sql.update.UpdateDSL
 import org.mybatis.dynamic.sql.update.UpdateModel
 import org.mybatis.dynamic.sql.util.Buildable
 
 // insert completers are here because sonar doesn't see them as covered if they are in a file by themselves
+typealias GeneralInsertCompleter = GeneralInsertDSL.() -> GeneralInsertDSL
+
 typealias InsertCompleter<T> = InsertDSL<T>.() -> InsertDSL<T>
 
 typealias MultiRowInsertCompleter<T> = MultiRowInsertDSL<T>.() -> MultiRowInsertDSL<T>
 
 typealias UpdateCompleter = KotlinUpdateBuilder.() -> Buildable<UpdateModel>
 
 class KotlinUpdateBuilder(private val dsl: UpdateDSL<UpdateModel>) :
-        KotlinBaseBuilder<UpdateModel, UpdateDSL<UpdateModel>.UpdateWhereBuilder, KotlinUpdateBuilder>() {
+    KotlinBaseBuilder<UpdateModel, UpdateDSL<UpdateModel>.UpdateWhereBuilder, KotlinUpdateBuilder>() {
 
     fun <T> set(column: SqlColumn<T>): UpdateDSL<UpdateModel>.SetClauseFinisher<T> = dsl.set(column)
 

src/main/kotlin/org/mybatis/dynamic/sql/util/kotlin/mybatis3/MapperSupportFunctions.kt

@@ -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.
@@ -19,6 +19,7 @@ import org.mybatis.dynamic.sql.BasicColumn
 import org.mybatis.dynamic.sql.SqlBuilder
 import org.mybatis.dynamic.sql.SqlTable
 import org.mybatis.dynamic.sql.delete.render.DeleteStatementProvider
+import org.mybatis.dynamic.sql.insert.render.GeneralInsertStatementProvider
 import org.mybatis.dynamic.sql.insert.render.InsertStatementProvider
 import org.mybatis.dynamic.sql.insert.render.MultiRowInsertStatementProvider
 import org.mybatis.dynamic.sql.select.QueryExpressionDSL
@@ -36,22 +37,53 @@ fun deleteFrom(mapper: (DeleteStatementProvider) -> Int, table: SqlTable, comple
 fun <T> insert(mapper: (InsertStatementProvider<T>) -> Int, record: T, table: SqlTable, completer: InsertCompleter<T>) =
     mapper(SqlBuilder.insert(record).into(table, completer))
 
-fun <T> insertMultiple(mapper: (MultiRowInsertStatementProvider<T>) -> Int, records: Collection<T>, table: SqlTable, completer: MultiRowInsertCompleter<T>) =
+fun insertInto(mapper: (GeneralInsertStatementProvider) -> Int, table: SqlTable, completer: GeneralInsertCompleter) =
+    mapper(insertInto(table, completer))
+
+fun <T> insertMultiple(
+    mapper: (MultiRowInsertStatementProvider<T>) -> Int,
+    records: Collection<T>,
+    table: SqlTable,
+    completer: MultiRowInsertCompleter<T>
+) =
     mapper(SqlBuilder.insertMultiple(records).into(table, completer))
 
-fun <T> selectDistinct(mapper: (SelectStatementProvider) -> List<T>, selectList: List<BasicColumn>, table: SqlTable, completer: SelectCompleter) =
+fun <T> selectDistinct(
+    mapper: (SelectStatementProvider) -> List<T>,
+    selectList: List<BasicColumn>,
+    table: SqlTable,
+    completer: SelectCompleter
+) =
     mapper(SqlBuilder.selectDistinct(selectList).from(table, completer))
 
-fun <T> selectList(mapper: (SelectStatementProvider) -> List<T>, selectList: List<BasicColumn>, table: SqlTable, completer: SelectCompleter) =
+fun <T> selectList(
+    mapper: (SelectStatementProvider) -> List<T>,
+    selectList: List<BasicColumn>,
+    table: SqlTable,
+    completer: SelectCompleter
+) =
     mapper(SqlBuilder.select(selectList).from(table, completer))
 
-fun <T> selectList(mapper: (SelectStatementProvider) -> List<T>, start: QueryExpressionDSL<SelectModel>, completer: SelectCompleter) =
+fun <T> selectList(
+    mapper: (SelectStatementProvider) -> List<T>,
+    start: QueryExpressionDSL<SelectModel>,
+    completer: SelectCompleter
+) =
     mapper(select(start, completer))
 
-fun <T> selectOne(mapper: (SelectStatementProvider) -> T?, selectList: List<BasicColumn>, table: SqlTable, completer: SelectCompleter) =
+fun <T> selectOne(
+    mapper: (SelectStatementProvider) -> T?,
+    selectList: List<BasicColumn>,
+    table: SqlTable,
+    completer: SelectCompleter
+) =
     mapper(SqlBuilder.select(selectList).from(table, completer))
 
-fun <T> selectOne(mapper: (SelectStatementProvider) -> T?, start: QueryExpressionDSL<SelectModel>, completer: SelectCompleter) =
+fun <T> selectOne(
+    mapper: (SelectStatementProvider) -> T?,
+    start: QueryExpressionDSL<SelectModel>,
+    completer: SelectCompleter
+) =
     mapper(select(start, completer))
 
 fun update(mapper: (UpdateStatementProvider) -> Int, table: SqlTable, completer: UpdateCompleter) =

src/main/kotlin/org/mybatis/dynamic/sql/util/kotlin/mybatis3/ProviderBuilderFunctions.kt

@@ -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.
@@ -18,8 +18,10 @@ package org.mybatis.dynamic.sql.util.kotlin.mybatis3
 import org.mybatis.dynamic.sql.SqlBuilder
 import org.mybatis.dynamic.sql.SqlTable
 import org.mybatis.dynamic.sql.delete.render.DeleteStatementProvider
+import org.mybatis.dynamic.sql.insert.GeneralInsertDSL
 import org.mybatis.dynamic.sql.insert.InsertDSL
 import org.mybatis.dynamic.sql.insert.MultiRowInsertDSL
+import org.mybatis.dynamic.sql.insert.render.GeneralInsertStatementProvider
 import org.mybatis.dynamic.sql.insert.render.InsertStatementProvider
 import org.mybatis.dynamic.sql.insert.render.MultiRowInsertStatementProvider
 import org.mybatis.dynamic.sql.render.RenderingStrategies
@@ -42,18 +44,28 @@ fun deleteFrom(table: SqlTable, completer: DeleteCompleter): DeleteStatementProv
 }
 
 fun <T> InsertDSL.IntoGatherer<T>.into(table: SqlTable, completer: InsertCompleter<T>): InsertStatementProvider<T> =
-        completer(into(table)).build().render(RenderingStrategies.MYBATIS3)
+    completer(into(table)).build().render(RenderingStrategies.MYBATIS3)
 
-fun <T> MultiRowInsertDSL.IntoGatherer<T>.into(table: SqlTable, completer: MultiRowInsertCompleter<T>): MultiRowInsertStatementProvider<T> =
-        completer(into(table)).build().render(RenderingStrategies.MYBATIS3)
+fun <T> MultiRowInsertDSL.IntoGatherer<T>.into(
+    table: SqlTable,
+    completer: MultiRowInsertCompleter<T>
+): MultiRowInsertStatementProvider<T> =
+    completer(into(table)).build().render(RenderingStrategies.MYBATIS3)
 
-fun QueryExpressionDSL.FromGatherer<SelectModel>.from(table: SqlTable, completer: SelectCompleter): SelectStatementProvider {
+fun QueryExpressionDSL.FromGatherer<SelectModel>.from(
+    table: SqlTable,
+    completer: SelectCompleter
+): SelectStatementProvider {
     val builder = KotlinQueryBuilder(from(table))
     completer(builder)
     return builder.build().render(RenderingStrategies.MYBATIS3)
 }
 
-fun QueryExpressionDSL.FromGatherer<SelectModel>.from(table: SqlTable, alias: String, completer: SelectCompleter): SelectStatementProvider {
+fun QueryExpressionDSL.FromGatherer<SelectModel>.from(
+    table: SqlTable,
+    alias: String,
+    completer: SelectCompleter
+): SelectStatementProvider {
     val builder = KotlinQueryBuilder(from(table, alias))
     completer(builder)
     return builder.build().render(RenderingStrategies.MYBATIS3)
@@ -70,3 +82,6 @@ fun update(table: SqlTable, completer: UpdateCompleter): UpdateStatementProvider
     completer(builder)
     return builder.build().render(RenderingStrategies.MYBATIS3)
 }
+
+fun insertInto(table: SqlTable, completer: GeneralInsertCompleter): GeneralInsertStatementProvider =
+    completer(GeneralInsertDSL.insertInto(table)).build().render(RenderingStrategies.MYBATIS3)