From 0944c9bbb624c331965df69c6f63b61e35b07787 Mon Sep 17 00:00:00 2001
From: Sergey Chernov <sergey.chernov@clickhouse.com>
Date: Tue, 10 Jun 2025 21:02:21 -0700
Subject: [PATCH] added CTE to FROM clause

---
 .../main/antlr4/com/clickhouse/jdbc/internal/ClickHouseParser.g4 | 1 +
 .../test/java/com/clickhouse/jdbc/internal/SqlParserTest.java    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/jdbc-v2/src/main/antlr4/com/clickhouse/jdbc/internal/ClickHouseParser.g4 b/jdbc-v2/src/main/antlr4/com/clickhouse/jdbc/internal/ClickHouseParser.g4
index 1353a5e83..c6cbc6fe6 100644
--- a/jdbc-v2/src/main/antlr4/com/clickhouse/jdbc/internal/ClickHouseParser.g4
+++ b/jdbc-v2/src/main/antlr4/com/clickhouse/jdbc/internal/ClickHouseParser.g4
@@ -427,6 +427,7 @@ topClause
 fromClause
     : FROM joinExpr
     | FROM identifier LPAREN QUERY RPAREN
+    | FROM ctes
     ;
 
 arrayJoinClause
diff --git a/jdbc-v2/src/test/java/com/clickhouse/jdbc/internal/SqlParserTest.java b/jdbc-v2/src/test/java/com/clickhouse/jdbc/internal/SqlParserTest.java
index 2b4c14754..33bfb5b8b 100644
--- a/jdbc-v2/src/test/java/com/clickhouse/jdbc/internal/SqlParserTest.java
+++ b/jdbc-v2/src/test/java/com/clickhouse/jdbc/internal/SqlParserTest.java
@@ -264,6 +264,7 @@ public static Object[][] testCTEStmtsDP() {
                 {"(with a as (select ?) select * from a);", 1},
                 {"with a as (select 1) select * from a; ", 0},
                 {"(with ? as a select a);", 1},
+                {"select * from ( with x as ( select 9 ) select * from x );", 0}
 
         };
     }