Skip a few more tests on 21.3

Author: zhicwu

clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/ClickHousePreparedStatementTest.java

@@ -36,6 +36,7 @@
 import com.clickhouse.jdbc.internal.SqlBasedPreparedStatement;
 
 import org.testng.Assert;
+import org.testng.SkipException;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
@@ -1015,8 +1016,9 @@ public void testInsertDefaultValue(String columnType, String defaultExpr, String
         String tableName = "test_insert_default_value_" + columnType.split("\\(")[0].trim().toLowerCase();
         try (ClickHouseConnection conn = newConnection(props); Statement s = conn.createStatement()) {
             if (conn.getUri().toString().contains(":grpc:")) {
-                // skip gRPC tests
-                return;
+                throw new SkipException("Skip gRPC test");
+            } else if (!conn.getServerVersion().check("[21.8,)")) {
+                throw new SkipException("Skip test when ClickHouse is older than 21.8");
             }
             s.execute(String.format("drop table if exists %s; ", tableName)
                     + String.format("create table %s(id Int8, v %s DEFAULT %s)engine=Memory", tableName, columnType,
@@ -1053,8 +1055,8 @@ public void testInsertDefaultValue(String columnType, String defaultExpr, String
             }
             Assert.assertEquals(rowCount, 3);
         } catch (SQLException e) {
-            // 'Unknown data type family' or 'Missing columns'
-            if (e.getErrorCode() == 50 || e.getErrorCode() == 47) {
+            // 'Unknown data type family', 'Missing columns' or 'Cannot create table column'
+            if (e.getErrorCode() == 50 || e.getErrorCode() == 47 || e.getErrorCode() == 44) {
                 return;
             }
             throw e;

clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/ClickHouseResultSetTest.java

@@ -22,6 +22,7 @@
 import com.clickhouse.client.data.ClickHouseOffsetDateTimeValue;
 
 import org.testng.Assert;
+import org.testng.SkipException;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
@@ -176,6 +177,10 @@ public void testIpAddress() throws SQLException {
     public void testMap() throws SQLException {
         try (ClickHouseConnection conn = newConnection(new Properties());
                 Statement stmt = conn.createStatement()) {
+            if (!conn.getServerVersion().check("[21.8,)")) {
+                throw new SkipException("Skip test when ClickHouse version is older than 21.8");
+            }
+
             stmt.execute("drop table if exists test_map_of_array; "
                     + "create table test_map_of_array(id Int8, m0 Map(String, Array(Nullable(DateTime64(3)))), m1 Map(String, Array(Nullable(DateTime64(3, 'Asia/Shanghai'))))) ENGINE = Memory; "
                     + "insert into test_map_of_array values(1, { 'a' : [], 'b' : [ '2022-03-30 00:00:00.123', null ] }, { 'a' : [], 'b' : [ '2022-03-30 00:00:00.123', null ] })");