Merge branch 'main' into 06/22/26/extract_request_logic

Author: chernser

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) {

jdbc-v2/src/main/java/com/clickhouse/jdbc/internal/parser/javacc/ClickHouseSqlUtils.java

@@ -69,7 +69,9 @@ private static Set<String> 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"
             );
     }