Merge pull request #2433 from ClickHouse/jdbc_fix_2431

[jdbc-v2] Fix parser grammar

Author: chernser

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

@@ -40,7 +40,7 @@ query
 
 // CTE statement
 ctes
-    : WITH namedQuery (',' namedQuery)*
+    : LPAREN? WITH namedQuery (',' namedQuery)* RPAREN?
     ;
 
 namedQuery
@@ -644,7 +644,7 @@ columnExpr
     | CAST LPAREN columnExpr AS columnTypeExpr RPAREN                                    # ColumnExprCast
     | DATE STRING_LITERAL                                                                # ColumnExprDate
     | EXTRACT LPAREN interval FROM columnExpr RPAREN                                     # ColumnExprExtract
-    | INTERVAL columnExpr interval                                                       # ColumnExprInterval
+    | INTERVAL columnExpr interval?                                                      # ColumnExprInterval
     | SUBSTRING LPAREN columnExpr FROM columnExpr (FOR columnExpr)? RPAREN               # ColumnExprSubstring
     | TIMESTAMP STRING_LITERAL                                                           # ColumnExprTimestamp
     | TRIM LPAREN (BOTH | LEADING | TRAILING) STRING_LITERAL FROM columnExpr RPAREN      # ColumnExprTrim

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

@@ -166,6 +166,7 @@ public void enterColumnExprParam(ClickHouseParser.ColumnExprParamContext ctx) {
         appendParameter(ctx.start.getStartIndex());
     }
 
+
     @Override
     public void enterColumnExprParamWithCast(ClickHouseParser.ColumnExprParamWithCastContext ctx) {
         appendParameter(ctx.start.getStartIndex());

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

@@ -241,4 +241,40 @@ public static Object[][] testCreateStmtDP() {
                 {"CREATE USER 'user01' IDENTIFIED BY 'qwerty'"},
         };
     }
+
+    @Test(dataProvider = "testCTEStmtsDP")
+    public void testCTEStatements(String sql, int args) {
+        SqlParser parser = new SqlParser();
+        ParsedPreparedStatement stmt = parser.parsePreparedStatement(sql);
+        Assert.assertFalse(stmt.isHasErrors());
+        Assert.assertEquals(stmt.getArgCount(), args);
+    }
+
+    @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 (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},
+
+        };
+    }
+
+    @Test(dataProvider = "testMiscStmtDp")
+    public void testMiscStatements(String sql, int args) {
+        SqlParser parser = new SqlParser();
+        ParsedPreparedStatement stmt = parser.parsePreparedStatement(sql);
+        Assert.assertFalse(stmt.isHasErrors());
+        Assert.assertEquals(stmt.getArgCount(), args);
+    }
+
+    @DataProvider
+    public Object[][] testMiscStmtDp() {
+        return new Object[][] {
+            {"SELECT INTERVAL '1 day'", 0},
+            {"SELECT INTERVAL 1 day", 0},
+        };
+    }
 }