Fixed CTE and some minor bugs

Author: chernser

client-v2/src/test/java/com/clickhouse/client/datatypes/DataTypeTests.java

@@ -30,6 +30,7 @@
 import java.io.IOException;
 import java.lang.reflect.Method;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.Period;
@@ -539,6 +540,9 @@ public void testDynamicWithPrimitives() throws Exception {
                     case Decimal128:
                     case Decimal256:
                         BigDecimal tmpDec = row.getBigDecimal("field").stripTrailingZeros();
+                        if (tmpDec.divide((BigDecimal)value, RoundingMode.FLOOR).equals(BigDecimal.ONE)) {
+                            continue;
+                        }
                         strValue = tmpDec.toPlainString();
                         break;
                     case IntervalMicrosecond:
@@ -739,7 +743,7 @@ public void testTime64() throws Exception {
             return; // time64 was introduced in 25.6
         }
 
-        String table = "test_time64_type";
+        String table = "data_type_tests_time64";
         client.execute("DROP TABLE IF EXISTS " + table).get();
         client.execute(tableDefinition(table, "o_num UInt32", "t_sec Time64(0)",  "t_ms Time64(3)", "t_us Time64(6)", "t_ns Time64(9)"),
                 (CommandSettings) new CommandSettings().serverSetting("allow_experimental_time_time64_type", "1")).get();

client-v2/src/test/java/com/clickhouse/client/query/QueryTests.java

@@ -2146,7 +2146,7 @@ public void testGetDynamicValue() throws Exception  {
                     } else if (decision == 1) {
                         return rnd.nextInt();
                     } else {
-                        return rnd.nextDouble();
+                        return rnd.nextLong();
                     }
                 }), 1000);
 

jdbc-v2/src/main/antlr4/com/clickhouse/jdbc/internal/parser/ClickHouseParser.g4

@@ -28,7 +28,6 @@ query
     | killStmt     // DDL
     | optimizeStmt // DDL
     | renameStmt   // DDL
-    | selectUnionStmt
     | setStmt
     | setRoleStmt
     | showStmt
@@ -38,33 +37,14 @@ query
     | updateStmt
     | useStmt
     | watchStmt
-    | ctes? selectStmt
+    | selectStmt
+    | selectUnionStmt
     | grantStmt
     | revokeStmt
     | exchangeStmt
     | moveStmt
     ;
 
-// CTE statement
-ctes
-    : LPAREN? WITH cteUnboundCol? (COMMA cteUnboundCol)* COMMA? namedQuery (COMMA namedQuery)* RPAREN?
-    ;
-
-namedQuery
-    : name = identifier (columnAliases)? AS LPAREN query RPAREN
-    ;
-
-columnAliases
-    : LPAREN identifier (',' identifier)* RPAREN
-    ;
-
-cteUnboundCol
-    : (literal AS identifier) # CteUnboundColLiteral
-    | (QUERY AS identifier) # CteUnboundColParam
-    | LPAREN? columnExpr RPAREN? AS identifier # CteUnboundColExpr
-    | LPAREN ctes? selectStmt RPAREN AS identifier # CteUnboundNestedSelect
-    ;
-
 // DELETE statement
 
 deleteStmt
@@ -480,7 +460,7 @@ selectStmtWithParens
     ;
 
 selectStmt
-    : withClause? SELECT DISTINCT? topClause? columnExprList fromClause? arrayJoinClause? windowClause? prewhereClause? whereClause? groupByClause? (
+    : cteClause? SELECT DISTINCT? topClause? columnExprList fromClause? arrayJoinClause? windowClause? prewhereClause? whereClause? groupByClause? (
         WITH (CUBE | ROLLUP)
     )? (WITH TOTALS)? havingClause? orderByClause? limitByClause? limitClause? settingsClause?
     ;
@@ -489,14 +469,35 @@ withClause
     : WITH columnExprList
     ;
 
+// CTE statement
+cteClause
+    : WITH cteUnboundCol? (COMMA cteUnboundCol)* COMMA? namedQuery? (COMMA namedQuery)*
+    ;
+
+
+namedQuery
+    : identifier (columnAliases)? AS  LPAREN? ( selectStmt | selectStmtWithParens | selectUnionStmt) RPAREN?
+    ;
+
+columnAliases
+    : LPAREN identifier (',' identifier)* RPAREN
+    ;
+
+cteUnboundCol
+    : literal AS identifier # CteUnboundColLiteral
+    | QUERY AS identifier # CteUnboundColParam
+    | LPAREN? columnExpr RPAREN? AS? identifier? # CteUnboundColExpr
+//    | LPAREN cteStmt? selectStmt RPAREN AS identifier # CteUnboundNestedSelect
+    ;
+
 topClause
     : TOP DECIMAL_LITERAL (WITH TIES)?
     ;
 
 fromClause
     : FROM joinExpr
     | FROM identifier LPAREN QUERY RPAREN
-    | FROM ctes
+    | FROM selectStmt
     | FROM identifier LPAREN viewParam (COMMA viewParam)?  RPAREN
     ;
 
@@ -1294,6 +1295,7 @@ keyword
     | ROLLUP
     | ROW
     | ROWS
+    | REVOKE
     | SAMPLE
     | SELECT
     | SEMI
@@ -1320,6 +1322,7 @@ keyword
     | TRAILING
     | TRIM
     | TRUNCATE
+    | TRACKING
     | TO
     | TOP
     | TTL
@@ -1364,6 +1367,7 @@ keywordForAlias
     | HOUR
     | MINUTE
     | SECOND
+    | REVOKE
     ;
 
 alias

jdbc-v2/src/main/java/com/clickhouse/jdbc/internal/SqlParser.java

@@ -51,9 +51,8 @@ public void syntaxError(Recognizer<?, ?> recognizer, Object offendingSymbol, int
 
     static boolean isStmtWithResultSet(ClickHouseParser.QueryStmtContext stmtContext) {
         ClickHouseParser.QueryContext qCtx = stmtContext.query();
-
         return  qCtx != null && (qCtx.selectStmt() != null ||  qCtx.selectUnionStmt() != null ||
                 qCtx.showStmt() != null || qCtx.explainStmt() != null || qCtx.describeStmt() != null ||
-                qCtx.existsStmt() != null || qCtx.checkStmt() != null);
+                qCtx.existsStmt() != null || qCtx.checkStmt() != null );
     }
 }

jdbc-v2/src/test/java/com/clickhouse/jdbc/DataTypeTests.java

@@ -617,7 +617,7 @@ public void testTimeTypes() throws SQLException {
         Properties createProperties = new Properties();
         createProperties.put(ClientConfigProperties.serverSetting("allow_experimental_time_time64_type"), "1");
         runQuery("CREATE TABLE test_time64 (order Int8, "
-                + "time Time('UTC'), time64 Time64(9) "
+                + "time Time, time64 Time64(9) "
                 + ") ENGINE = MergeTree ORDER BY ()",
                 createProperties);
 

jdbc-v2/src/test/java/com/clickhouse/jdbc/PreparedStatementTest.java

@@ -44,6 +44,7 @@
 import static org.testng.Assert.assertThrows;
 import static org.testng.Assert.assertTrue;
 import static org.testng.Assert.expectThrows;
+import static org.testng.Assert.fail;
 
 @Test(groups = { "integration" })
 public class PreparedStatementTest extends JdbcIntegrationTest {
@@ -1337,6 +1338,8 @@ public void testSelectWithTableAliasAsKeyword() throws Exception {
                         Assert.assertEquals(rs.getInt(1), 1000);
                         Assert.assertEquals(rs.getString(2), "test");
                     }
+                } catch (Exception e) {
+                    fail("failed at keyword " + keyword, e);
                 }
             }
         }

jdbc-v2/src/test/java/com/clickhouse/jdbc/internal/SqlParserTest.java

@@ -233,26 +233,42 @@ public static Object[][] testCreateStmtDP() {
 
     @Test(dataProvider = "testCTEStmtsDP")
     public void testCTEStatements(String sql, int args) {
+        System.out.println(sql);
         SqlParser parser = new SqlParser();
         ParsedPreparedStatement stmt = parser.parsePreparedStatement(sql);
-        Assert.assertFalse(stmt.isHasErrors());
-        Assert.assertEquals(stmt.getArgCount(), args);
-        Assert.assertTrue(stmt.isHasResultSet());
+        Assert.assertEquals(stmt.getArgCount(), args, "Args mismatch");
+        Assert.assertFalse(stmt.isHasErrors(), "Statement has errors");
+        Assert.assertTrue(stmt.isHasResultSet(), "show have a result set");
     }
 
     @DataProvider
     public static Object[][] testCTEStmtsDP() {
         return new Object[][] {
-                {"with ? as a, ? as b select a, b; -- two CTEs of the first form", 2},
+                {"with 'a' as a select 1, a union with 'b' as a all select 2, a", 0},
+                {"with 'a' as a select 1, a union all with 'b' as a select 2, a", 0},
+                {"with ? as a, ? as b select a, b -- two CTEs of the first form", 2},
+                {"with 'a' as a, 'b' as b select a, b -- two CTEs of the first form", 0},
                 {"with a as (select ?), b as (select 2) select * from a, b; -- two CTEs of the second form", 1},
-                {"(with a as (select ?) select * from a);", 1},
-                {"with a as (select 1) select * from a; ", 0},
-                {"(with ? as a select a);", 1},
+                {"(with a as (select ?) select * from a)", 1},
+                {"with a as (select ?) select * from a", 1},
+                {"with a as (select 1) select * from a", 0},
+                {"(select 1)", 0},
+                {"(with ? as a select a)", 1},
+                {"(with 'a' as a select a)", 0},
+                {"with ? as a select a", 1},
+                {"with 'a' as a select a", 0},
                 {"select * from ( with x as ( select 9 ) select * from x );", 0},
                 {"WITH toDateTime(?) AS target_time SELECT * FROM table", 1},
                 {"WITH toDateTime('2025-08-20 12:34:56') AS target_time SELECT * FROM table", 0},
                 {"WITH toDate('2025-08-20') as DATE_END, events AS ( SELECT 1 ) SELECT * FROM events", 0},
-                {"WITH toDate(?) as DATE_END, events AS ( SELECT 1 ) SELECT * FROM events", 1}
+                {"WITH toDate(?) as DATE_END, events AS ( SELECT 1 ) SELECT * FROM events", 1},
+                {"WITH ? as a, ? as b, body as ( select ? ) select a, b, body.* from body", 3},
+                {"WITH 'a_value' as a, 'b_value' as b, body as ( select 'html' ) select a, b, body.* from body", 0},
+                {"WITH 'a_value' as a, 'b_value' as b, body as ( with 'data' as d select d, 'html' ) select a, b, body.* from body", 0},
+                {"with date select date, 1 from (select now() date)", 0 },
+                {COMPLEX_CTE, 4},
+                {"WITH 'date' as const1, 'time' as const2, Tmp1 as (SELECT 1), Tmp2 as (SELECT * FROM Tmp1) SELECT * FROM Tmp2 ", 0},
+                {"WITH query1 AS ( WITH 'a' as date1 SELECT * FROM tracking.event WHERE project='a' AND time>=starting_time AND time<ending_time GROUP BY date, user_id ) SELECT * FROM query1", 0},
         };
     }