Fixed parser issues

Author: chernser

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

@@ -41,15 +41,20 @@ query
 
 // CTE statement
 ctes
-    : LPAREN? WITH namedQuery (',' namedQuery)* RPAREN?
+    : LPAREN? WITH (cteUnboundCol COMMA)* namedQuery (COMMA namedQuery)* RPAREN?
     ;
 
 namedQuery
-    : name = identifier (columnAliases)? AS '(' query ')'
+    : name = identifier (columnAliases)? AS LPAREN query RPAREN
     ;
 
 columnAliases
-    : '(' identifier (',' identifier)* ')'
+    : LPAREN? identifier (',' identifier)* RPAREN?
+    ;
+
+cteUnboundCol
+    : (literal AS identifier) # CteUnboundColLiteral
+    | (QUERY AS identifier) # CteUnboundColParam
     ;
 
 // ALTER statement
@@ -407,7 +412,7 @@ projectionSelectStmt
 // SELECT statement
 
 selectUnionStmt
-    : selectStmtWithParens (UNION ALL selectStmtWithParens)*
+    : selectStmtWithParens (UNION (ALL|DISTINCT)? selectStmtWithParens)*
     ;
 
 selectStmtWithParens
@@ -1228,6 +1233,12 @@ keywordForAlias
     | VIEW
     | PRIMARY
     | GRANT
+    | YEAR
+    | DAY
+    | MONTH
+    | HOUR
+    | MINUTE
+    | SECOND
     ;
 
 alias

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

@@ -172,6 +172,11 @@ public void enterColumnExprPrecedence3(ClickHouseParser.ColumnExprPrecedence3Con
         super.enterColumnExprPrecedence3(ctx);
     }
 
+    @Override
+    public void enterCteUnboundColParam(ClickHouseParser.CteUnboundColParamContext ctx) {
+        appendParameter(ctx.start.getStartIndex());
+    }
+
     @Override
     public void visitErrorNode(ErrorNode node) {
         setHasErrors(true);

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

@@ -1120,4 +1120,41 @@ public void testSelectWithTableAliasAsKeyword() throws Exception {
             }
         }
     }
+
+    @Test(groups = {"integration"})
+    public void testCTEWithUnboundCol() throws Exception {
+
+        try (Connection conn = getJdbcConnection()) {
+            String cte = "with ? as text, numz as (select text, number from system.numbers limit 10) select * from numz";
+            try (PreparedStatement stmt = conn.prepareStatement(cte)) {
+                stmt.setString(1, "1000");
+
+                ResultSet rs = stmt.executeQuery();
+                assertTrue(rs.next());
+                assertEquals(rs.getString(1), "1000");
+                assertEquals(rs.getString(2), "0");
+            }
+        }
+    }
+
+    @Test(groups = {"integration"})
+    public void testWithInClause() throws Exception {
+
+        try (Connection conn = getJdbcConnection()) {
+            String cte = "select number from system.numbers where number in (?) limit 10";
+            Long[] filter =  new Long[]{2L, 4L, 6L};
+            try (PreparedStatement stmt = conn.prepareStatement(cte)) {
+                stmt.setArray(1, conn.createArrayOf("Int64", filter));
+                ResultSet rs = stmt.executeQuery();
+
+                for (Long filterValue : filter) {
+                    assertTrue(rs.next());
+                    assertEquals(rs.getLong(1), filterValue);
+                }
+                Assert.assertFalse(rs.next());
+            }
+        }
+    }
+
+
 }

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

@@ -307,31 +307,30 @@ public Object[][] testMiscStmtDp() {
             {"SELECT * FROM `test_data`.`categories` WHERE id = cast(1 as String) or id = ?", 1},
             {"select * from test_data.categories WHERE test_data.categories.name = ? limit 4", 1},
             {INSERT_INLINE_DATA, 0},
-                {"select sum(value) from `uuid_filter_db`.`uuid_filter_table` WHERE `uuid_filter_db`.`uuid_filter_table`.`uuid` IN (CAST('36f7f85c-d7f4-49e2-af05-f45d5f6636ad' AS UUID))", 0},
-                {"SELECT DISTINCT ON (column) FROM table WHER column > ?", 1},
-                {"SELECT * FROM test_table \nUNION\n DISTINCT SELECT * FROM test_table", 0},
-                {"SELECT * FROM test_table1 \nUNION\n SELECT * FROM test_table2 WHERE test_table2.column1 = ?", 1},
-            {PARAMETRIZED_VIEW, 0},
-            {COMPLEX_CTE, 0},
+            {"select sum(value) from `uuid_filter_db`.`uuid_filter_table` WHERE `uuid_filter_db`.`uuid_filter_table`.`uuid` IN (CAST('36f7f85c-d7f4-49e2-af05-f45d5f6636ad' AS UUID))", 0},
+            {"SELECT DISTINCT ON (column) FROM table WHERE column > ?", 1},
+            {"SELECT * FROM test_table \nUNION\n DISTINCT SELECT * FROM test_table", 0},
+            {"SELECT * FROM test_table \nUNION\n ALL SELECT * FROM test_table", 0},
+            {"SELECT * FROM test_table1 \nUNION\n SELECT * FROM test_table2 WHERE test_table2.column1 = ?", 1},
+            {COMPLEX_CTE, 4},
+            {SIMPLE_CTE, 0},
+            {CTE_CONSTANT_AS_VARIABLE, 1},
             {"select toYear(dt) year from test WHERE val=?", 1},
+            {"select 1 year, 2 hour, 3 minute, 4 second", 0},
             {"select toYear(dt) AS year from test WHERE val=?", 1},
             {"select toYear(dt) AS yearx from test WHERE val=?", 1},
+            {"SELECT v FROM t WHERE f in (?)", 1},
+            {"SELECT v FROM t WHERE a > 10 AND event NOT IN (?)", 1},
+            {"SELECT v FROM t WHERE f in (1, 2, 3)", 0},
+            {"with ? as val1, numz as (select val1, number from system.numbers limit 10) select * from numz", 1}
         };
     }
 
     private static final String INSERT_INLINE_DATA =
             "INSERT INTO `interval_15_XUTLZWBLKMNZZPRZSKRF`.`checkins` (`timestamp`, `id`) " +
                     "VALUES ((`now64`(9) + INTERVAL -225 second), 1)";
 
-    private static final String PARAMETRIZED_VIEW = "CREATE VIEW default.test\n" +
-            "AS \n" +
-            "WITH    \n" +
-            "    toDateTime({from:String}, 'Asia/Seoul') AS FROM,    \n" +
-            "    date_add(FROM, INTERVAL 1 MINUTE) AS TO,    \n" +
-            "    {target_id:String} AS TARGET_ID \n" +
-            "SELECT FROM, TO, TARGET_ID";
-
-    private static final String COMPLEX_CTE = "WITH ? AS starting_time, ? AS ending_time, ? AS session_timeout, ? AS starting_event, ? AS ending_event, SessionData AS (\n" +
+    private static final String COMPLEX_CTE = "WITH ? AS starting_time, ? AS ending_time, 0 AS session_timeout, '{start}' AS starting_event, '{end}' AS ending_event, SessionData AS (\n" +
             "    WITH\n" +
             "        date,\n" +
             "        arraySort(\n" +
@@ -373,7 +372,7 @@ public Object[][] testMiscStmtDp() {
             "    FROM tracking.event\n" +
             "    WHERE\n" +
             "        project=? AND time>=starting_time AND time<ending_time\n" +
-            "        AND event NOT IN (?, ?, ?, ?)\n" +
+            "        AND event NOT IN (?)\n" +
             "    GROUP BY\n" +
             "        date,\n" +
             "        user_id\n" +
@@ -391,4 +390,23 @@ public Object[][] testMiscStmtDp() {
             "    SessionOverallInfo\n" +
             "ORDER BY\n" +
             "    SessionOverallInfo.date";
+
+    private static final String SIMPLE_CTE = "WITH cte_numbers AS\n" +
+            "(\n" +
+            "    SELECT\n" +
+            "        num\n" +
+            "    FROM generateRandom('num UInt64', NULL)\n" +
+            "    LIMIT 1000000\n" +
+            ")\n" +
+            "SELECT\n" +
+            "    count()\n" +
+            "FROM cte_numbers\n" +
+            "WHERE num IN (SELECT num FROM cte_numbers)";
+
+    private static final String CTE_CONSTANT_AS_VARIABLE = "WITH '2019-08-01 15:23:00' AS ts_upper_bound\n" +
+            "SELECT *\n" +
+            "FROM hits\n" +
+            "WHERE\n" +
+            "    EventDate = toDate(?) AND\n" +
+            "    EventTime <= ts_upper_bound;";
 }