Skip to content

[JDBC-V2] Added new keywords from HEAD #2761

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
chernser merged 1 commit into from
Feb 27, 2026
Merged

[JDBC-V2] Added new keywords from HEAD #2761

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
6 changes: 6 additions & 0 deletions jdbc-v2/src/main/antlr4/com/clickhouse/jdbc/internal/parser/antlr4/ClickHouseLexer.g4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ lexer grammar ClickHouseLexer;



ABI : A B I;
ACCESS : A C C E S S;
ADD : A D D;
ADMIN : A D M I N;
Expand All @@ -23,6 +24,7 @@ AND : A N D;
ANTI : A N T I;
ANY : A N Y;
ARBITRARY : A R B I T R A R Y ;
ARGUMENTS : A R G U M E N T S;
ARRAY : A R R A Y;
AS : A S;
ASCENDING : A S C | A S C E N D I N G;
Expand Down Expand Up @@ -94,6 +96,7 @@ DNS : D N S ;
DOUBLE_SHA1_HASH : D O U B L E '_' S H A '1' '_' H A S H;
DOUBLE_SHA1_PASSWORD : D O U B L E '_' S H A '1' '_' P A S S W O R D;
DROP : D R O P;
DRY : D R Y;
ELSE : E L S E;
EMBEDDED : E M B E D D E D ;
ENABLED : E N A B L E D;
Expand Down Expand Up @@ -171,6 +174,7 @@ KEYED : K E Y E D;
KEY : K E Y;
KEYS : K E Y S;
KILL : K I L L;
LANGUAGE : L A N G U A G E;
LAST : L A S T;
LAYOUT : L A Y O U T;
LDAP : L D A P;
Expand Down Expand Up @@ -282,13 +286,15 @@ RESOURCE : R E S O U R C E ;
RESTART : R E S T A R T;
RESTORE : R E S T O R E ;
RESTRICTIVE : R E S T R I C T I V E;
RETURNS : R E T U R N S;
REVOKE : R E V O K E;
RIGHT : R I G H T;
ROLE : R O L E;
ROLES : R O L E S ;
ROLLUP : R O L L U P;
ROW : R O W;
ROWS : R O W S;
RUN : R U N;
S3 : S '3';
SAMPLE : S A M P L E;
SCHEMA : S C H E M A;
Expand Down
16 changes: 14 additions & 2 deletions jdbc-v2/src/main/antlr4/com/clickhouse/jdbc/internal/parser/antlr4/ClickHouseParser.g4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1217,7 +1217,8 @@ interval
;

keyword
: ACCESS
: ABI
| ACCESS
| ADD
| ADMIN
| AFTER
Expand All @@ -1227,6 +1228,7 @@ keyword
| AND
| ANTI
| ANY
| ARGUMENTS
| ARRAY
| AS
| ASCENDING
Expand Down Expand Up @@ -1289,6 +1291,7 @@ keyword
| DOUBLE_SHA1_HASH
| DOUBLE_SHA1_PASSWORD
| DROP
| DRY
| ELSE
| ENABLED
| END
Expand Down Expand Up @@ -1357,6 +1360,7 @@ keyword
| KEYED
| KEYS
| KILL
| LANGUAGE
| LAST
| LAYOUT
| LDAP
Expand Down Expand Up @@ -1438,13 +1442,15 @@ keyword
| RESOURCE
| RESTORE
| RESTRICTIVE
| RETURNS
| REVOKE
| RIGHT
| ROLE
| ROLES
| ROLLUP
| ROW
| ROWS
| RUN
| S3
| SAMPLE
| SCRAM_SHA256_HASH
Expand Down Expand Up @@ -1525,13 +1531,15 @@ keyword
;

keywordForAlias
: ACCESS
: ABI
| ACCESS
| ADD
| ADMIN
| AFTER
| ALIAS
| ALTER
| AND
| ARGUMENTS
| ASCENDING
| AST
| ASYNC
Expand Down Expand Up @@ -1587,6 +1595,7 @@ keywordForAlias
| DOUBLE_SHA1_HASH
| DOUBLE_SHA1_PASSWORD
| DROP
| DRY
| ENABLED
| END
| ENGINE
Expand Down Expand Up @@ -1637,6 +1646,7 @@ keywordForAlias
| KEYED
| KEYS
| KILL
| LANGUAGE
| LAST
| LAYOUT
| LDAP
Expand Down Expand Up @@ -1703,12 +1713,14 @@ keywordForAlias
| RESOURCE
| RESTORE
| RESTRICTIVE
| RETURNS
| REVOKE
| ROLE
| ROLES
| ROLLUP
| ROW
| ROWS
| RUN
| S3
| SCRAM_SHA256_HASH
| SCRAM_SHA256_PASSWORD
Expand Down
12 changes: 6 additions & 6 deletions jdbc-v2/src/main/java/com/clickhouse/jdbc/internal/parser/javacc/ClickHouseSqlUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ public final class ClickHouseSqlUtils {

private static Set<String> initAllowedKeywordAliases() {
return buildKeywordSet(
"ACCESS", "ACTION", "ADD", "ADMIN", "AFTER", "ALGORITHM", "ALIAS", "ALLOWED_LATENESS", "ALTER",
"AND", "APPEND", "APPLY", "ASC", "ASCENDING", "ASSUME", "AST", "ASYNC", "ATTACH",
"ABI", "ACCESS", "ACTION", "ADD", "ADMIN", "AFTER", "ALGORITHM", "ALIAS", "ALLOWED_LATENESS", "ALTER",
"AND", "APPEND", "APPLY", "ARGUMENTS", "ASC", "ASCENDING", "ASSUME", "AST", "ASYNC", "ATTACH",
"AUTHENTICATION", "AUTO_INCREMENT", "AZURE", "BACKUP", "BAGEXPANSION", "BASE_BACKUP",
"BCRYPT_HASH", "BCRYPT_PASSWORD", "BEGIN", "BIDIRECTIONAL", "BOTH", "BY", "CACHE", "CACHES",
"CASCADE", "CASE", "CAST", "CHANGE", "CHANGEABLE_IN_READONLY", "CHANGED", "CHAR", "CHARACTER",
Expand All @@ -22,7 +22,7 @@ private static Set<String> initAllowedKeywordAliases() {
"D", "DATA", "DATABASE", "DATABASES", "DATE", "DAY", "DAYS", "DD", "DDL", "DEALLOCATE",
"DEDUPLICATE", "DEFAULT", "DEFINER", "DELAY", "DELETE", "DELETED", "DEPENDS", "DESC",
"DESCENDING", "DESCRIBE", "DETACH", "DETACHED", "DICTIONARIES", "DICTIONARY", "DISK", "DISTINCT",
"DIV", "DOUBLE_SHA1_HASH", "DOUBLE_SHA1_PASSWORD", "DROP", "EMPTY", "ENABLED", "END", "ENFORCED",
"DIV", "DOUBLE_SHA1_HASH", "DOUBLE_SHA1_PASSWORD", "DROP", "DRY", "EMPTY", "ENABLED", "END", "ENFORCED",
"ENGINE", "ENGINES", "EPHEMERAL", "ESTIMATE", "EVENT", "EVENTS", "EVERY", "EXCHANGE", "EXECUTE",
"EXISTS", "EXPLAIN", "EXPRESSION", "EXTENDED", "EXTERNAL", "FAKE", "FALSE", "FETCH", "FIELDS",
"FILE", "FILES", "FILESYSTEM", "FILL", "FILTER", "FIRST", "FOLLOWING", "FOR", "FORCE", "FOREIGN",
Expand All @@ -31,7 +31,7 @@ private static Set<String> initAllowedKeywordAliases() {
"HOURS", "HTTP", "ID", "IDENTIFIED", "IF", "IGNORE", "IMPLICIT", "IN", "INDEX", "INDEXES",
"INDICES", "INFILE", "INHERIT", "INJECTIVE", "INSERT", "INTERPOLATE", "INTERVAL", "INVISIBLE",
"INVOKER", "IP", "IS", "IS_OBJECT_ID", "JWT", "KERBEROS", "KEY", "KEYED", "KEYS", "KILL", "KIND",
"LARGE", "LAST", "LAYOUT", "LDAP", "LEADING", "LESS", "LEVEL", "LIFETIME", "LIGHTWEIGHT",
"LANGUAGE", "LARGE", "LAST", "LAYOUT", "LDAP", "LEADING", "LESS", "LEVEL", "LIFETIME", "LIGHTWEIGHT",
"LIMITS", "LINEAR", "LIST", "LIVE", "LOCAL", "M", "MASK", "MASKING", "MASTER", "MATCH",
"MATERIALIZE", "MATERIALIZED", "MAX", "MCS", "MEMORY", "MERGES", "METHODS", "METRICS", "MI",
"MICROSECOND", "MICROSECONDS", "MILLISECOND", "MILLISECONDS", "MIN", "MINUTE", "MINUTES", "MM",
Expand All @@ -45,8 +45,8 @@ private static Set<String> initAllowedKeywordAliases() {
"PROTOBUF", "PULL", "Q", "QQ", "QUARTER", "QUARTERS", "QUERY", "QUOTA", "RANDOMIZE",
"RANDOMIZED", "RANGE", "READ", "READONLY", "REALM", "RECOMPRESS", "RECURSIVE", "REFERENCES",
"REFRESH", "REGEXP", "REMOVE", "RENAME", "REPLACE", "REPLICATED", "RESET", "RESOURCE", "RESPECT",
"RESTORE", "RESTRICT", "RESTRICTIVE", "RESUME", "REVOKE", "REWRITE", "ROLE", "ROLES", "ROLLBACK",
"ROLLUP", "ROW", "ROWS", "S", "S3", "SALT", "SAN", "SCHEME", "SCRAM_SHA256_HASH",
"RESTORE", "RESTRICT", "RESTRICTIVE", "RESUME", "RETURNS", "REVOKE", "REWRITE", "ROLE", "ROLES",
"ROLLBACK", "ROLLUP", "ROW", "ROWS", "RUN", "S", "S3", "SALT", "SAN", "SCHEME", "SCRAM_SHA256_HASH",
"SCRAM_SHA256_PASSWORD", "SECOND", "SECONDS", "SECURITY", "SELECT", "SEQUENTIAL", "SERVER",
"SET", "SETS", "SETTING", "SHA256_HASH", "SHA256_PASSWORD", "SHARD", "SHOW", "SIGNED", "SIMPLE",
"SKIP", "SNAPSHOT", "SOURCE", "SPATIAL", "SQL", "SQL_TSI_DAY", "SQL_TSI_HOUR",
Expand Down
6 changes: 6 additions & 0 deletions jdbc-v2/src/test/resources/allowed_keyword_tablenames.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
ABI
ACCESS
ACTION
ADD
Expand All @@ -13,6 +14,7 @@ ANTI
ANY
APPEND
APPLY
ARGUMENTS
ARRAY
AS
ASC
Expand Down Expand Up @@ -96,6 +98,7 @@ DIV
DOUBLE_SHA1_HASH
DOUBLE_SHA1_PASSWORD
DROP
DRY
ELSE
EMPTY
ENABLED
Expand Down Expand Up @@ -186,6 +189,7 @@ KEYED
KEYS
KILL
KIND
LANGUAGE
LARGE
LAST
LAYOUT
Expand Down Expand Up @@ -309,6 +313,7 @@ RESTORE
RESTRICT
RESTRICTIVE
RESUME
RETURNS
REVOKE
REWRITE
RIGHT
Expand All @@ -318,6 +323,7 @@ ROLLBACK
ROLLUP
ROW
ROWS
RUN
S3
SALT
SAMPLE
Expand Down
6 changes: 6 additions & 0 deletions jdbc-v2/src/test/resources/sql-keywords.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
# Source: https://clickhouse.joesstuff.co.uk/keywords.html
# Individual keywords extracted and deduplicated from system.keywords table

ABI
ACCESS
ACTION
ADD
Expand All @@ -17,6 +18,7 @@ ANTI
ANY
APPEND
APPLY
ARGUMENTS
ARRAY
AS
ASC
Expand Down Expand Up @@ -105,6 +107,7 @@ DIV
DOUBLE_SHA1_HASH
DOUBLE_SHA1_PASSWORD
DROP
DRY
ELSE
EMPTY
ENABLED
Expand Down Expand Up @@ -198,6 +201,7 @@ KEYED
KEYS
KILL
KIND
LANGUAGE
LARGE
LAST
LAYOUT
Expand Down Expand Up @@ -334,6 +338,7 @@ RESTORE
RESTRICT
RESTRICTIVE
RESUME
RETURNS
REVOKE
REWRITE
RIGHT
Expand All @@ -343,6 +348,7 @@ ROLLBACK
ROLLUP
ROW
ROWS
RUN
S
S3
SALT
Expand Down
Loading