Merge branch 'master' into support-fetch-first

Author: kazuki43zoo

src/main/java/org/apache/ibatis/datasource/pooled/PooledDataSource.java

@@ -585,19 +585,23 @@ public static Connection unwrapConnection(Connection conn) {
     return conn;
   }
 
+  @Override
   protected void finalize() throws Throwable {
     forceCloseAll();
     super.finalize();
   }
 
+  @Override
   public <T> T unwrap(Class<T> iface) throws SQLException {
     throw new SQLException(getClass().getName() + " is not a wrapper.");
   }
 
+  @Override
   public boolean isWrapperFor(Class<?> iface) {
     return false;
   }
 
+  @Override
   public Logger getParentLogger() {
     return Logger.getLogger(Logger.GLOBAL_LOGGER_NAME);
   }

src/main/java/org/apache/ibatis/datasource/unpooled/UnpooledDataSource.java

@@ -292,7 +292,7 @@ public boolean jdbcCompliant() {
       return this.driver.jdbcCompliant();
     }
 
-    // @Override only valid jdk7+
+    @Override
     public Logger getParentLogger() {
       return Logger.getLogger(Logger.GLOBAL_LOGGER_NAME);
     }
@@ -308,7 +308,7 @@ public boolean isWrapperFor(Class<?> iface) throws SQLException {
     return false;
   }
 
-  // @Override only valid jdk7+
+  @Override
   public Logger getParentLogger() {
     // requires JDK version 1.6
     return Logger.getLogger(Logger.GLOBAL_LOGGER_NAME);

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();
   }
 
@@ -366,6 +369,16 @@ public T OFFSET_ROWS(long value) {
     return OFFSET_ROWS(String.valueOf(value));
   }
 
+  /*
+   * 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;
   }
@@ -464,14 +477,15 @@ protected void appendClause(SafeAppendable builder, String offset, String limit)
     List<String> orderBy = new ArrayList<>();
     List<String> lastList = new ArrayList<>();
     List<String> columns = new ArrayList<>();
-    List<String> values = new ArrayList<>();
+    List<List<String>> valuesList = new ArrayList<>();
     boolean distinct;
     String offset;
     String limit;
     LimitingRowsStrategy limitingRowsStrategy = LimitingRowsStrategy.NOP;
 
     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,
@@ -524,7 +538,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();
     }
 

src/main/java/org/apache/ibatis/session/Configuration.java

@@ -923,6 +923,7 @@ public StrictMap<V> conflictMessageProducer(BiFunction<V, V, String> conflictMes
       return this;
     }
 
+    @Override
     @SuppressWarnings("unchecked")
     public V put(String key, V value) {
       if (containsKey(key)) {
@@ -940,6 +941,7 @@ public V put(String key, V value) {
       return super.put(key, value);
     }
 
+    @Override
     public V get(Object key) {
       V value = super.get(key);
       if (value == null) {

src/test/java/org/apache/ibatis/autoconstructor/ExtensiveSubject.java

@@ -64,4 +64,4 @@ public ExtensiveSubject(final byte aByte,
     public enum TestEnum {
         AVALUE, BVALUE, CVALUE;
     }
-}
+}

src/test/java/org/apache/ibatis/binding/BindingTest.java

@@ -180,7 +180,7 @@ void shouldInsertAuthorWithSelectKeyAndDynamicParams() {
       Author author = new Author(-1, "cbegin", "******", "[email protected]", "N/A", Section.NEWS);
       int rows = mapper.insertAuthorDynamic(author);
       assertEquals(1, rows);
-      assertFalse(-1 == author.getId()); // id must be autogenerated
+      assertNotEquals(-1, author.getId()); // id must be autogenerated
       Author author2 = mapper.selectAuthor(author.getId());
       assertNotNull(author2);
       assertEquals(author.getEmail(), author2.getEmail());

src/test/java/org/apache/ibatis/cache/BaseCacheTest.java

@@ -32,11 +32,11 @@ class BaseCacheTest {
   @Test
   void shouldDemonstrateEqualsAndHashCodeForVariousCacheTypes() {
     PerpetualCache cache = new PerpetualCache("test_cache");
-    assertTrue(cache.equals(cache));
-    assertTrue(cache.equals(new SynchronizedCache(cache)));
-    assertTrue(cache.equals(new SerializedCache(cache)));
-    assertTrue(cache.equals(new LoggingCache(cache)));
-    assertTrue(cache.equals(new ScheduledCache(cache)));
+    assertEquals(cache, cache);
+    assertEquals(cache, new SynchronizedCache(cache));
+    assertEquals(cache, new SerializedCache(cache));
+    assertEquals(cache, new LoggingCache(cache));
+    assertEquals(cache, new ScheduledCache(cache));
 
     assertEquals(cache.hashCode(), new SynchronizedCache(cache).hashCode());
     assertEquals(cache.hashCode(), new SerializedCache(cache).hashCode());

src/test/java/org/apache/ibatis/cache/CacheKeyTest.java

@@ -34,32 +34,32 @@ void shouldTestCacheKeysEqual() {
     Date date = new Date();
     CacheKey key1 = new CacheKey(new Object[] { 1, "hello", null, new Date(date.getTime()) });
     CacheKey key2 = new CacheKey(new Object[] { 1, "hello", null, new Date(date.getTime()) });
-    assertTrue(key1.equals(key2));
-    assertTrue(key2.equals(key1));
-    assertTrue(key1.hashCode() == key2.hashCode());
-    assertTrue(key1.toString().equals(key2.toString()));
+    assertEquals(key1, key2);
+    assertEquals(key2, key1);
+    assertEquals(key1.hashCode(), key2.hashCode());
+    assertEquals(key1.toString(), key2.toString());
   }
 
   @Test
   void shouldTestCacheKeysNotEqualDueToDateDifference() throws Exception {
     CacheKey key1 = new CacheKey(new Object[] { 1, "hello", null, new Date() });
     Thread.sleep(1000);
     CacheKey key2 = new CacheKey(new Object[] { 1, "hello", null, new Date() });
-    assertFalse(key1.equals(key2));
-    assertFalse(key2.equals(key1));
-    assertFalse(key1.hashCode() == key2.hashCode());
-    assertFalse(key1.toString().equals(key2.toString()));
+    assertNotEquals(key1, key2);
+    assertNotEquals(key2, key1);
+    assertNotEquals(key1.hashCode(), key2.hashCode());
+    assertNotEquals(key1.toString(), key2.toString());
   }
 
   @Test
   void shouldTestCacheKeysNotEqualDueToOrder() throws Exception {
     CacheKey key1 = new CacheKey(new Object[] { 1, "hello", null });
     Thread.sleep(1000);
     CacheKey key2 = new CacheKey(new Object[] { 1, null, "hello" });
-    assertFalse(key1.equals(key2));
-    assertFalse(key2.equals(key1));
-    assertFalse(key1.hashCode() == key2.hashCode());
-    assertFalse(key1.toString().equals(key2.toString()));
+    assertNotEquals(key1, key2);
+    assertNotEquals(key2, key1);
+    assertNotEquals(key1.hashCode(), key2.hashCode());
+    assertNotEquals(key1.toString(), key2.toString());
   }
 
   @Test
@@ -84,7 +84,7 @@ void shouldTestCacheKeysWithBinaryArrays() {
     byte[] array2 = new byte[] { 1 };
     CacheKey key1 = new CacheKey(new Object[] { array1 });
     CacheKey key2 = new CacheKey(new Object[] { array2 });
-    assertTrue(key1.equals(key2));
+    assertEquals(key1, key2);
   }
 
   @Test

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

@@ -374,4 +374,62 @@ void selectUsingOffsetRowsAndFetchFirstRowsOnly() {
     assertEquals("SELECT *\nFROM test\nORDER BY id OFFSET 100 ROWS FETCH FIRST 20 ROWS ONLY", 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})");
+  }
 }

src/test/java/org/apache/ibatis/submitted/blocking_cache/PersonMapper.java

@@ -24,5 +24,5 @@
 public interface PersonMapper {
 
   @Select("select id, firstname, lastname from person")
-  public List<Person> findAll();
+  List<Person> findAll();
 }