Skip to content

Commit 6372e4e

Browse files
committed
Fixed some more antlr4 issues
1 parent f02382f commit 6372e4e

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,9 @@ JSON_TRUE : 'true';
385385

386386
// Tokens
387387

388-
IDENTIFIER: (LETTER | UNDERSCORE) (LETTER | UNDERSCORE | DEC_DIGIT)*
388+
IDENTIFIER:
389+
(LETTER | UNDERSCORE) (LETTER | UNDERSCORE | DEC_DIGIT)*
390+
| DEC_DIGIT+ (LETTER | UNDERSCORE) (LETTER | UNDERSCORE | DEC_DIGIT)*
389391
| BACKQUOTE ( ~([\\`]) | (BACKSLASH .) | (BACKQUOTE BACKQUOTE))* BACKQUOTE
390392
| QUOTE_DOUBLE (~([\\"]) | (BACKSLASH .) | (QUOTE_DOUBLE QUOTE_DOUBLE))* QUOTE_DOUBLE
391393
;

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -510,6 +510,7 @@ topClause
510510

511511
fromClause
512512
: FROM joinExpr
513+
| FROM tableIdentifier
513514
| FROM identifier LPAREN JDBC_PARAM_PLACEHOLDER RPAREN
514515
| FROM selectStmt
515516
| FROM identifier LPAREN viewParam (COMMA viewParam)? RPAREN
@@ -661,7 +662,7 @@ exchangeStmt
661662
// SET statement
662663

663664
setStmt
664-
: SET settingExprList
665+
: SET IDENTIFIER EQ_SINGLE literal
665666
;
666667

667668
// SET ROLE statement

0 commit comments

Comments
 (0)