From 028c9afce4823cb5f909d7ed695498b7a565eda4 Mon Sep 17 00:00:00 2001 From: Sergey Chernov Date: Fri, 26 Jun 2026 16:03:28 -0700 Subject: [PATCH 1/2] added keep-alive < server 30 seconds to make test stable --- .../test/java/com/clickhouse/client/metrics/MetricsTest.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/client-v2/src/test/java/com/clickhouse/client/metrics/MetricsTest.java b/client-v2/src/test/java/com/clickhouse/client/metrics/MetricsTest.java index 249dc8874..f83f97db0 100644 --- a/client-v2/src/test/java/com/clickhouse/client/metrics/MetricsTest.java +++ b/client-v2/src/test/java/com/clickhouse/client/metrics/MetricsTest.java @@ -54,6 +54,7 @@ public void testRegisterMetrics() throws Exception { .serverSetting(ServerSettings.ASYNC_INSERT, "0") .serverSetting(ServerSettings.WAIT_END_OF_QUERY, "1") .registerClientMetrics(meterRegistry, "pool-test") + .setKeepAliveTimeout(10, ChronoUnit.SECONDS) // enforce connection cleanup .build()) { client.ping(); @@ -67,7 +68,11 @@ public void testRegisterMetrics() throws Exception { Assert.assertEquals((int) leased.value(), 0); Runnable task = () -> { + final long maxDelay = 15; + long t1 = System.currentTimeMillis(); try (QueryResponse response = client.query("SELECT 1").get()) { + long t = System.currentTimeMillis() - t1; + Assert.assertTrue(t < maxDelay, "Unexpected delay (t = " + t + ", but expected < " + maxDelay + " ms)"); Assert.assertEquals((int) available.value(), 0); Assert.assertEquals((int) leased.value(), 1); } catch (Exception e) { From 15951a38b16fa048cc28403b139ad39e40ec6ce0 Mon Sep 17 00:00:00 2001 From: Sergey Chernov Date: Fri, 26 Jun 2026 16:29:15 -0700 Subject: [PATCH 2/2] jdbc-v2: updated keywords --- .../jdbc/internal/parser/javacc/ClickHouseSqlUtils.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/jdbc-v2/src/main/java/com/clickhouse/jdbc/internal/parser/javacc/ClickHouseSqlUtils.java b/jdbc-v2/src/main/java/com/clickhouse/jdbc/internal/parser/javacc/ClickHouseSqlUtils.java index 58605e8fb..c6e5f1fca 100644 --- a/jdbc-v2/src/main/java/com/clickhouse/jdbc/internal/parser/javacc/ClickHouseSqlUtils.java +++ b/jdbc-v2/src/main/java/com/clickhouse/jdbc/internal/parser/javacc/ClickHouseSqlUtils.java @@ -69,7 +69,9 @@ private static Set initAllowedKeywordAliases() { // Appended 05/27/2026 "CURSOR", "DETERMINISTIC", "ESCAPE", "SAMPLES", "STREAM", "UNKNOWN", // Appended 06/10/2026 - "IPV4_PREFIX_BITS", "IPV6_PREFIX_BITS", "TIMEZONE_HOUR", "TIMEZONE_MINUTE" + "IPV4_PREFIX_BITS", "IPV6_PREFIX_BITS", "TIMEZONE_HOUR", "TIMEZONE_MINUTE", + // Appended 06/26/2026 + "ENUM", "HYPOTHETICAL", "WHATIF" ); }