support Clickhouse 21.8 in tests

.github/workflows/benchmark.yml

@@ -62,7 +62,7 @@ jobs:
           mvn --batch-mode --update-snapshots -q -DskipTests install
           cd clickhouse-benchmark
           mvn --batch-mode --update-snapshots install
-          java -DclickhouseVersion="21.3" -jar target/benchmarks.jar -rf text -p client=clickhouse-jdbc Basic
+          java -DclickhouseVersion="21.8" -jar target/benchmarks.jar -rf text -p client=clickhouse-jdbc Basic
           echo "BENCHMARK_REPORT<<EOF" >> $GITHUB_ENV
           cat jmh-result.text >> $GITHUB_ENV
           echo "EOF" >> $GITHUB_ENV
@@ -110,7 +110,7 @@ jobs:
         run: |
           mvn --batch-mode --update-snapshots -DskipTests -pl clickhouse-benchmark -am package
           cd clickhouse-benchmark
-          java -DclickhouseVersion="21.3" -jar target/benchmarks.jar -rf json ${{ github.event.inputs.options }} > output.txt
+          java -DclickhouseVersion="21.8" -jar target/benchmarks.jar -rf json ${{ github.event.inputs.options }} > output.txt
           echo "BENCHMARK_REPORT<<EOF" >> $GITHUB_ENV
           tail -n +$(grep -n '^REMEMBER:' output.txt | tail -1 | awk -F: '{print $1+6}') output.txt | head -n -2 | grep -v ':·' >> $GITHUB_ENV
           echo "EOF" >> $GITHUB_ENV

.github/workflows/build.yml

@@ -34,7 +34,7 @@ jobs:
       matrix:
         java: [8, 11, 15]
         # most recent LTS releases as well as latest stable builds
-        clickhouse: ["20.8", "21.3", "latest"]
+        clickhouse: ["21.3", "21.8", "latest"]
       fail-fast: false
     name: Build using JDK ${{ matrix.java }} against ClickHouse ${{ matrix.clickhouse }}
     steps:

.github/workflows/timezone.yml

@@ -59,5 +59,5 @@ jobs:
           find . -type f -name "pom.xml" -exec sed -i -e 's|.*argLine.*timezone=.*||g' '{}' \;
           mvn --batch-mode --update-snapshots \
             -DclickhouseTimezone=${{ matrix.serverTz }} \
-            -DclickhouseVersion=21.3 \
+            -DclickhouseVersion=21.8 \
             -Duser.timezone=${{ matrix.clientTz }} verify

clickhouse-jdbc/src/test/java/ru/yandex/clickhouse/integration/ClickHouseMapTest.java

@@ -76,12 +76,17 @@ public void testMapSupport() throws SQLException {
             return;
         }
 
+
         String testSql = "create table if not exists system.test_map_support(m Map(UInt8, String)) engine=Memory;"
                 + "drop table if exists system.test_map_support;";
-        try (Connection conn = ClickHouseContainerForTest.newDataSource().getConnection();
+        try (ClickHouseConnection conn = ClickHouseContainerForTest.newDataSource().getConnection();
                 Statement s = conn.createStatement()) {
             s.execute("set allow_experimental_map_type=0;" + testSql);
-            fail("Should fail without enabling map support");
+
+            String version = conn.getServerVersion();
+            if (version.compareTo("21.8") < 0) {
+                fail("Should fail without enabling map support");
+            }
         } catch (SQLException e) {
             assertEquals(e.getErrorCode(), 44);
         }
@@ -99,7 +104,10 @@ public void testMapSupport() throws SQLException {
 
             params.put(ClickHouseQueryParam.ALLOW_EXPERIMENTAL_MAP_TYPE, "0");
             s.executeQuery(testSql, params);
-            fail("Should fail without enabling map support");
+            String version = conn.getServerVersion();
+            if (version.compareTo("21.8") < 0) {
+                fail("Should fail without enabling map support");
+            }
         } catch (SQLException e) {
             assertEquals(e.getErrorCode(), 44);
         }