Skip to content

fix(jdbc-v2): Correctly parse mixed-order CTEs in SqlParser #2611

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
AVMusorin wants to merge 1 commit into from
Closed

fix(jdbc-v2): Correctly parse mixed-order CTEs in SqlParser #2611

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion jdbc-v2/src/main/antlr4/com/clickhouse/jdbc/internal/ClickHouseParser.g4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,12 @@ query

// CTE statement
ctes
: LPAREN? WITH cteUnboundCol? (COMMA cteUnboundCol)* COMMA? namedQuery (COMMA namedQuery)* RPAREN?
: LPAREN? WITH cte (COMMA cte)* RPAREN?
;

cte
: namedQuery
| cteUnboundCol
;

namedQuery
Expand Down
41 changes: 40 additions & 1 deletion jdbc-v2/src/test/java/com/clickhouse/jdbc/internal/SqlParserTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,26 @@ public static Object[][] testCTEStmtsDP() {
};
}

@Test(dataProvider = "testMixedCTEStmtsDP")
public void testMixedCTEStatements(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[][] testMixedCTEStmtsDP() {
return new Object[][] {
{ "with a as (select ?), (select 2) as b select * from a, b;", 1 },
{ "with (select 2) as b, a as (select ?) select * from a, b;", 1 },
{ "with a as (select ?), (select 2) as b, c as (select ?) select * from a, b, c;", 2 },
{ "with (select 2) as b, a as (select ?), (select 3) as c select * from a, b, c;", 1 },
{ "with (select ?) as a select * from a", 1 },
{ MULTI_PARAMS, 8 },
};
}

@Test(dataProvider = "testMiscStmtDp")
public void testMiscStatements(String sql, int args) {
SqlParser parser = new SqlParser();
Expand Down Expand Up @@ -329,6 +349,25 @@ public Object[][] testMiscStmtDp() {
};
}


private static final String MULTI_PARAMS = "with brands as (" +
" select" +
" report_date," +
" language_code" +
" from brands" +
" where domain = ?" +
" and domain_hash = xxHash64(?)" +
" and location_id = ?" +
" and language_code = ?" +
" ), (select max(report_date) as max_report_date from brands) as max_date " +
"select name " +
"from brands " +
"where domain = ?" +
" and domain_hash = xxHash64(?)" +
" and location_id = ?" +
" and language_code = ?" +
" and report_date = max_date";

private static final String INSERT_INLINE_DATA =
"INSERT INTO `interval_15_XUTLZWBLKMNZZPRZSKRF`.`checkins` (`timestamp`, `id`) " +
"VALUES ((`now64`(9) + INTERVAL -225 second), 1)";
Expand Down Expand Up @@ -412,4 +451,4 @@ public Object[][] testMiscStmtDp() {
"WHERE\n" +
" EventDate = toDate(?) AND\n" +
" EventTime <= ts_upper_bound;";
}
}
Loading