Skip to content

Backport fix for #614 #617

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

Merged
merged 1 commit into from
Apr 10, 2021
Merged

Backport fix for #614 #617

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
2 changes: 1 addition & 1 deletion src/main/javacc/ClickHouseSqlParser.jj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,7 @@ void deleteStmt(): {} {
// https://clickhouse.tech/docs/en/sql-reference/statements/describe-table/
void describeStmt(): {} {
(<DESCRIBE> | <DESC>) { token_source.table = "columns"; }
(LOOKAHEAD({ getToken(1).kind == TABLE }) <TABLE>)? (LOOKAHEAD(2) tableIdentifier(true) | anyExprList())
(LOOKAHEAD({ getToken(1).kind == TABLE }) <TABLE>)? tableIdentifier(true) (anyExprList())?
}

// https://clickhouse.tech/docs/en/sql-reference/statements/detach/
Expand Down
4 changes: 4 additions & 0 deletions src/test/java/ru/yandex/clickhouse/jdbc/parser/ClickHouseSqlParserTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,10 @@ public void testDescribeStatement() {
checkSingleStatement(parse(sql = "desc table a"), sql, StatementType.DESCRIBE, "system", "columns");
checkSingleStatement(parse(sql = "describe table a.a"), sql, StatementType.DESCRIBE, "a", "columns");
checkSingleStatement(parse(sql = "desc table table"), sql, StatementType.DESCRIBE, "system", "columns");
// fix issue #614
checkSingleStatement(parse(sql = "desc t1 t2"), sql, StatementType.DESCRIBE, "system", "columns");
checkSingleStatement(parse(sql = "desc table t1 t2"), sql, StatementType.DESCRIBE, "system", "columns");
checkSingleStatement(parse(sql = "desc table t1 as `t2`"), sql, StatementType.DESCRIBE, "system", "columns");
}

@Test
Expand Down