From 81aa311f534bd54f58bca6e8471d5b737ca380ab Mon Sep 17 00:00:00 2001 From: Sergey Chernov Date: Mon, 5 Oct 2026 11:12:48 -0700 Subject: [PATCH] Added keywords and fixed assertion in test to react on 404 not on message --- .../test/java/com/clickhouse/client/HttpTransportTests.java | 3 ++- .../jdbc/internal/parser/javacc/ClickHouseSqlUtils.java | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/client-v2/src/test/java/com/clickhouse/client/HttpTransportTests.java b/client-v2/src/test/java/com/clickhouse/client/HttpTransportTests.java index f33b67e01..d05e0ac68 100644 --- a/client-v2/src/test/java/com/clickhouse/client/HttpTransportTests.java +++ b/client-v2/src/test/java/com/clickhouse/client/HttpTransportTests.java @@ -679,7 +679,8 @@ public void testServerErrorHandling(ClickHouseFormat format, boolean serverCompr client.queryAll("select 1"); fail("Exception expected"); } catch (ClientException e) { - Assert.assertTrue(e.getCause().getMessage().contains("no handle /some-path?")); + Assert.assertTrue(e.getCause() instanceof ServerException, "cause should be " + ServerException.class + " but was " + e.getCause().getClass()); + Assert.assertEquals(((ServerException)e.getCause()).getTransportProtocolCode(), 404, "Transport code should be NOT_FOUND 404"); } } } 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 b642a1586..f73b27bc7 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 @@ -77,7 +77,9 @@ private static Set initAllowedKeywordAliases() { // Appended 09/10/2026 "AGGREGATE", "BOUNDED", "EXTEND", "HANDLER", "IDLE", "PROTOCOL", "RECENT", "TIMEOUT", "UNORDERED", // Appended 09/29/2026 - "FAMILIES", "INCREMENTAL", "METRIC", "PROJECTIONS", "TOKEN" + "FAMILIES", "INCREMENTAL", "METRIC", "PROJECTIONS", "TOKEN", + // Appended 10/05/2026 + "LATERAL", "SIMILAR" ); }