Merge branch 'master' of https://github.com/sivdead/mybatis-3 into sivdead-master

Author: kazuki43zoo

src/main/java/org/apache/ibatis/jdbc/AbstractSQL.java

@@ -61,8 +61,8 @@ public T INSERT_INTO(String tableName) {
   }
 
   public T VALUES(String columns, String values) {
-    sql().columns.add(columns);
-    sql().values.add(values);
+    INTO_COLUMNS(columns);
+    INTO_VALUES(values);
     return getSelf();
   }
 
@@ -78,7 +78,10 @@ public T INTO_COLUMNS(String... columns) {
    * @since 3.4.2
    */
   public T INTO_VALUES(String... values) {
-    sql().values.addAll(Arrays.asList(values));
+    List<String> list = sql().valuesList.get(sql().valuesList.size() - 1);
+    for (String value : values) {
+      list.add(value);
+    }
     return getSelf();
   }
 
@@ -310,6 +313,16 @@ public T OFFSET(long value) {
     return getSelf();
   }
 
+  /**
+   * used to add a new inserted row while do multi-row insert.
+   *
+   * @since 3.5.2
+   */
+  public T ADD_ROW() {
+    sql().valuesList.add(new ArrayList<>());
+    return getSelf();
+  }
+
   private SQLStatement sql() {
     return sql;
   }
@@ -360,27 +373,28 @@ public enum StatementType {
     }
 
     StatementType statementType;
-    List<String> sets = new ArrayList<>();
-    List<String> select = new ArrayList<>();
-    List<String> tables = new ArrayList<>();
-    List<String> join = new ArrayList<>();
-    List<String> innerJoin = new ArrayList<>();
-    List<String> outerJoin = new ArrayList<>();
-    List<String> leftOuterJoin = new ArrayList<>();
-    List<String> rightOuterJoin = new ArrayList<>();
-    List<String> where = new ArrayList<>();
-    List<String> having = new ArrayList<>();
-    List<String> groupBy = new ArrayList<>();
-    List<String> orderBy = new ArrayList<>();
-    List<String> lastList = new ArrayList<>();
-    List<String> columns = new ArrayList<>();
-    List<String> values = new ArrayList<>();
+    List<String> sets = new ArrayList<String>();
+    List<String> select = new ArrayList<String>();
+    List<String> tables = new ArrayList<String>();
+    List<String> join = new ArrayList<String>();
+    List<String> innerJoin = new ArrayList<String>();
+    List<String> outerJoin = new ArrayList<String>();
+    List<String> leftOuterJoin = new ArrayList<String>();
+    List<String> rightOuterJoin = new ArrayList<String>();
+    List<String> where = new ArrayList<String>();
+    List<String> having = new ArrayList<String>();
+    List<String> groupBy = new ArrayList<String>();
+    List<String> orderBy = new ArrayList<String>();
+    List<String> lastList = new ArrayList<String>();
+    List<String> columns = new ArrayList<String>();
+    List<List<String>> valuesList = new ArrayList<>();
     boolean distinct;
     String offset;
     String limit;
 
     public SQLStatement() {
-        // Prevent Synthetic Access
+      // Prevent Synthetic Access
+      valuesList.add(new ArrayList<>());
     }
 
     private void sqlClause(SafeAppendable builder, String keyword, List<String> parts, String open, String close,
@@ -438,7 +452,9 @@ private void joins(SafeAppendable builder) {
     private String insertSQL(SafeAppendable builder) {
       sqlClause(builder, "INSERT INTO", tables, "", "", "");
       sqlClause(builder, "", columns, "(", ")", ", ");
-      sqlClause(builder, "VALUES", values, "(", ")", ", ");
+      for (int i = 0; i < valuesList.size(); i++) {
+        sqlClause(builder, i > 0 ? "," : "VALUES", valuesList.get(i), "(", ")", ", ");
+      }
       return builder.toString();
     }
 
@@ -494,4 +510,4 @@ public String sql(Appendable a) {
       return answer;
     }
   }
-}
+}

src/test/java/org/apache/ibatis/jdbc/SQLTest.java

@@ -347,4 +347,62 @@ void deleteUsingLimit() {
     assertEquals("DELETE FROM test\nWHERE (status = #{status}) LIMIT 20", sql);
   }
 
+  @Test
+  void supportBatchInsert(){
+    final String sql =  new SQL(){{
+      INSERT_INTO("table1 a");
+      INTO_COLUMNS("col1,col2");
+      INTO_VALUES("val1","val2");
+      ADD_ROW();
+      INTO_VALUES("val1","val2");
+    }}.toString();
+
+    assertThat(sql).isEqualToIgnoringWhitespace("INSERT INTO table1 a (col1,col2) VALUES (val1,val2), (val1,val2)");
+  }
+
+  @Test
+  void singleInsert() {
+    final String sql = new SQL() {{
+      INSERT_INTO("table1 a");
+      INTO_COLUMNS("col1,col2");
+      INTO_VALUES("val1", "val2");
+    }}.toString();
+
+    assertThat(sql).isEqualToIgnoringWhitespace("INSERT INTO table1 a (col1,col2) VALUES (val1,val2)");
+  }
+
+  @Test
+  void singleInsertWithMultipleInsertValues() {
+    final String sql = new SQL() {{
+      INSERT_INTO("TABLE_A").INTO_COLUMNS("a", "b").INTO_VALUES("#{a}").INTO_VALUES("#{b}");
+    }}.toString();
+
+    assertThat(sql).isEqualToIgnoringWhitespace("INSERT INTO TABLE_A (a, b) VALUES (#{a}, #{b})");
+  }
+
+  @Test
+  void batchInsertWithMultipleInsertValues() {
+    final String sql = new SQL() {{
+      INSERT_INTO("TABLE_A");
+      INTO_COLUMNS("a", "b");
+      INTO_VALUES("#{a1}");
+      INTO_VALUES("#{b1}");
+      ADD_ROW();
+      INTO_VALUES("#{a2}");
+      INTO_VALUES("#{b2}");
+    }}.toString();
+
+    assertThat(sql).isEqualToIgnoringWhitespace("INSERT INTO TABLE_A (a, b) VALUES (#{a1}, #{b1}), (#{a2}, #{b2})");
+  }
+
+  @Test
+  void testValues() {
+    final String sql = new SQL() {{
+      INSERT_INTO("PERSON");
+      VALUES("ID, FIRST_NAME", "#{id}, #{firstName}");
+      VALUES("LAST_NAME", "#{lastName}");
+    }}.toString();
+
+    assertThat(sql).isEqualToIgnoringWhitespace("INSERT INTO PERSON (ID, FIRST_NAME, LAST_NAME) VALUES (#{id}, #{firstName}, #{lastName})");
+  }
 }