Skip to content

Commit 542efd8

Browse files
chernserchernser
committed
Added new keywords from HEAD
1 parent 1e4fddd commit 542efd8

File tree

5 files changed

+38
-8
lines changed

5 files changed

+38
-8
lines changed

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ lexer grammar ClickHouseLexer;
1111

1212

1313

14+
ABI : A B I;
1415
ACCESS : A C C E S S;
1516
ADD : A D D;
1617
ADMIN : A D M I N;
@@ -23,6 +24,7 @@ AND : A N D;
2324
ANTI : A N T I;
2425
ANY : A N Y;
2526
ARBITRARY : A R B I T R A R Y ;
27+
ARGUMENTS : A R G U M E N T S;
2628
ARRAY : A R R A Y;
2729
AS : A S;
2830
ASCENDING : A S C | A S C E N D I N G;
@@ -94,6 +96,7 @@ DNS : D N S ;
9496
DOUBLE_SHA1_HASH : D O U B L E '_' S H A '1' '_' H A S H;
9597
DOUBLE_SHA1_PASSWORD : D O U B L E '_' S H A '1' '_' P A S S W O R D;
9698
DROP : D R O P;
99+
DRY : D R Y;
97100
ELSE : E L S E;
98101
EMBEDDED : E M B E D D E D ;
99102
ENABLED : E N A B L E D;
@@ -171,6 +174,7 @@ KEYED : K E Y E D;
171174
KEY : K E Y;
172175
KEYS : K E Y S;
173176
KILL : K I L L;
177+
LANGUAGE : L A N G U A G E;
174178
LAST : L A S T;
175179
LAYOUT : L A Y O U T;
176180
LDAP : L D A P;
@@ -282,13 +286,15 @@ RESOURCE : R E S O U R C E ;
282286
RESTART : R E S T A R T;
283287
RESTORE : R E S T O R E ;
284288
RESTRICTIVE : R E S T R I C T I V E;
289+
RETURNS : R E T U R N S;
285290
REVOKE : R E V O K E;
286291
RIGHT : R I G H T;
287292
ROLE : R O L E;
288293
ROLES : R O L E S ;
289294
ROLLUP : R O L L U P;
290295
ROW : R O W;
291296
ROWS : R O W S;
297+
RUN : R U N;
292298
S3 : S '3';
293299
SAMPLE : S A M P L E;
294300
SCHEMA : S C H E M A;

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

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1217,7 +1217,8 @@ interval
12171217
;
12181218

12191219
keyword
1220-
: ACCESS
1220+
: ABI
1221+
| ACCESS
12211222
| ADD
12221223
| ADMIN
12231224
| AFTER
@@ -1227,6 +1228,7 @@ keyword
12271228
| AND
12281229
| ANTI
12291230
| ANY
1231+
| ARGUMENTS
12301232
| ARRAY
12311233
| AS
12321234
| ASCENDING
@@ -1289,6 +1291,7 @@ keyword
12891291
| DOUBLE_SHA1_HASH
12901292
| DOUBLE_SHA1_PASSWORD
12911293
| DROP
1294+
| DRY
12921295
| ELSE
12931296
| ENABLED
12941297
| END
@@ -1357,6 +1360,7 @@ keyword
13571360
| KEYED
13581361
| KEYS
13591362
| KILL
1363+
| LANGUAGE
13601364
| LAST
13611365
| LAYOUT
13621366
| LDAP
@@ -1438,13 +1442,15 @@ keyword
14381442
| RESOURCE
14391443
| RESTORE
14401444
| RESTRICTIVE
1445+
| RETURNS
14411446
| REVOKE
14421447
| RIGHT
14431448
| ROLE
14441449
| ROLES
14451450
| ROLLUP
14461451
| ROW
14471452
| ROWS
1453+
| RUN
14481454
| S3
14491455
| SAMPLE
14501456
| SCRAM_SHA256_HASH
@@ -1525,13 +1531,15 @@ keyword
15251531
;
15261532

15271533
keywordForAlias
1528-
: ACCESS
1534+
: ABI
1535+
| ACCESS
15291536
| ADD
15301537
| ADMIN
15311538
| AFTER
15321539
| ALIAS
15331540
| ALTER
15341541
| AND
1542+
| ARGUMENTS
15351543
| ASCENDING
15361544
| AST
15371545
| ASYNC
@@ -1587,6 +1595,7 @@ keywordForAlias
15871595
| DOUBLE_SHA1_HASH
15881596
| DOUBLE_SHA1_PASSWORD
15891597
| DROP
1598+
| DRY
15901599
| ENABLED
15911600
| END
15921601
| ENGINE
@@ -1637,6 +1646,7 @@ keywordForAlias
16371646
| KEYED
16381647
| KEYS
16391648
| KILL
1649+
| LANGUAGE
16401650
| LAST
16411651
| LAYOUT
16421652
| LDAP
@@ -1703,12 +1713,14 @@ keywordForAlias
17031713
| RESOURCE
17041714
| RESTORE
17051715
| RESTRICTIVE
1716+
| RETURNS
17061717
| REVOKE
17071718
| ROLE
17081719
| ROLES
17091720
| ROLLUP
17101721
| ROW
17111722
| ROWS
1723+
| RUN
17121724
| S3
17131725
| SCRAM_SHA256_HASH
17141726
| SCRAM_SHA256_PASSWORD

‎jdbc-v2/src/main/java/com/clickhouse/jdbc/internal/parser/javacc/ClickHouseSqlUtils.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ public final class ClickHouseSqlUtils {
1111

1212
private static Set<String> initAllowedKeywordAliases() {
1313
return buildKeywordSet(
14-
"ACCESS", "ACTION", "ADD", "ADMIN", "AFTER", "ALGORITHM", "ALIAS", "ALLOWED_LATENESS", "ALTER",
15-
"AND", "APPEND", "APPLY", "ASC", "ASCENDING", "ASSUME", "AST", "ASYNC", "ATTACH",
14+
"ABI", "ACCESS", "ACTION", "ADD", "ADMIN", "AFTER", "ALGORITHM", "ALIAS", "ALLOWED_LATENESS", "ALTER",
15+
"AND", "APPEND", "APPLY", "ARGUMENTS", "ASC", "ASCENDING", "ASSUME", "AST", "ASYNC", "ATTACH",
1616
"AUTHENTICATION", "AUTO_INCREMENT", "AZURE", "BACKUP", "BAGEXPANSION", "BASE_BACKUP",
1717
"BCRYPT_HASH", "BCRYPT_PASSWORD", "BEGIN", "BIDIRECTIONAL", "BOTH", "BY", "CACHE", "CACHES",
1818
"CASCADE", "CASE", "CAST", "CHANGE", "CHANGEABLE_IN_READONLY", "CHANGED", "CHAR", "CHARACTER",
@@ -22,7 +22,7 @@ private static Set<String> initAllowedKeywordAliases() {
2222
"D", "DATA", "DATABASE", "DATABASES", "DATE", "DAY", "DAYS", "DD", "DDL", "DEALLOCATE",
2323
"DEDUPLICATE", "DEFAULT", "DEFINER", "DELAY", "DELETE", "DELETED", "DEPENDS", "DESC",
2424
"DESCENDING", "DESCRIBE", "DETACH", "DETACHED", "DICTIONARIES", "DICTIONARY", "DISK", "DISTINCT",
25-
"DIV", "DOUBLE_SHA1_HASH", "DOUBLE_SHA1_PASSWORD", "DROP", "EMPTY", "ENABLED", "END", "ENFORCED",
25+
"DIV", "DOUBLE_SHA1_HASH", "DOUBLE_SHA1_PASSWORD", "DROP", "DRY", "EMPTY", "ENABLED", "END", "ENFORCED",
2626
"ENGINE", "ENGINES", "EPHEMERAL", "ESTIMATE", "EVENT", "EVENTS", "EVERY", "EXCHANGE", "EXECUTE",
2727
"EXISTS", "EXPLAIN", "EXPRESSION", "EXTENDED", "EXTERNAL", "FAKE", "FALSE", "FETCH", "FIELDS",
2828
"FILE", "FILES", "FILESYSTEM", "FILL", "FILTER", "FIRST", "FOLLOWING", "FOR", "FORCE", "FOREIGN",
@@ -31,7 +31,7 @@ private static Set<String> initAllowedKeywordAliases() {
3131
"HOURS", "HTTP", "ID", "IDENTIFIED", "IF", "IGNORE", "IMPLICIT", "IN", "INDEX", "INDEXES",
3232
"INDICES", "INFILE", "INHERIT", "INJECTIVE", "INSERT", "INTERPOLATE", "INTERVAL", "INVISIBLE",
3333
"INVOKER", "IP", "IS", "IS_OBJECT_ID", "JWT", "KERBEROS", "KEY", "KEYED", "KEYS", "KILL", "KIND",
34-
"LARGE", "LAST", "LAYOUT", "LDAP", "LEADING", "LESS", "LEVEL", "LIFETIME", "LIGHTWEIGHT",
34+
"LANGUAGE", "LARGE", "LAST", "LAYOUT", "LDAP", "LEADING", "LESS", "LEVEL", "LIFETIME", "LIGHTWEIGHT",
3535
"LIMITS", "LINEAR", "LIST", "LIVE", "LOCAL", "M", "MASK", "MASKING", "MASTER", "MATCH",
3636
"MATERIALIZE", "MATERIALIZED", "MAX", "MCS", "MEMORY", "MERGES", "METHODS", "METRICS", "MI",
3737
"MICROSECOND", "MICROSECONDS", "MILLISECOND", "MILLISECONDS", "MIN", "MINUTE", "MINUTES", "MM",
@@ -45,8 +45,8 @@ private static Set<String> initAllowedKeywordAliases() {
4545
"PROTOBUF", "PULL", "Q", "QQ", "QUARTER", "QUARTERS", "QUERY", "QUOTA", "RANDOMIZE",
4646
"RANDOMIZED", "RANGE", "READ", "READONLY", "REALM", "RECOMPRESS", "RECURSIVE", "REFERENCES",
4747
"REFRESH", "REGEXP", "REMOVE", "RENAME", "REPLACE", "REPLICATED", "RESET", "RESOURCE", "RESPECT",
48-
"RESTORE", "RESTRICT", "RESTRICTIVE", "RESUME", "REVOKE", "REWRITE", "ROLE", "ROLES", "ROLLBACK",
49-
"ROLLUP", "ROW", "ROWS", "S", "S3", "SALT", "SAN", "SCHEME", "SCRAM_SHA256_HASH",
48+
"RESTORE", "RESTRICT", "RESTRICTIVE", "RESUME", "RETURNS", "REVOKE", "REWRITE", "ROLE", "ROLES",
49+
"ROLLBACK", "ROLLUP", "ROW", "ROWS", "RUN", "S", "S3", "SALT", "SAN", "SCHEME", "SCRAM_SHA256_HASH",
5050
"SCRAM_SHA256_PASSWORD", "SECOND", "SECONDS", "SECURITY", "SELECT", "SEQUENTIAL", "SERVER",
5151
"SET", "SETS", "SETTING", "SHA256_HASH", "SHA256_PASSWORD", "SHARD", "SHOW", "SIGNED", "SIMPLE",
5252
"SKIP", "SNAPSHOT", "SOURCE", "SPATIAL", "SQL", "SQL_TSI_DAY", "SQL_TSI_HOUR",

‎jdbc-v2/src/test/resources/allowed_keyword_tablenames.txt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
ABI
12
ACCESS
23
ACTION
34
ADD
@@ -13,6 +14,7 @@ ANTI
1314
ANY
1415
APPEND
1516
APPLY
17+
ARGUMENTS
1618
ARRAY
1719
AS
1820
ASC
@@ -96,6 +98,7 @@ DIV
9698
DOUBLE_SHA1_HASH
9799
DOUBLE_SHA1_PASSWORD
98100
DROP
101+
DRY
99102
ELSE
100103
EMPTY
101104
ENABLED
@@ -186,6 +189,7 @@ KEYED
186189
KEYS
187190
KILL
188191
KIND
192+
LANGUAGE
189193
LARGE
190194
LAST
191195
LAYOUT
@@ -309,6 +313,7 @@ RESTORE
309313
RESTRICT
310314
RESTRICTIVE
311315
RESUME
316+
RETURNS
312317
REVOKE
313318
REWRITE
314319
RIGHT
@@ -318,6 +323,7 @@ ROLLBACK
318323
ROLLUP
319324
ROW
320325
ROWS
326+
RUN
321327
S3
322328
SALT
323329
SAMPLE

‎jdbc-v2/src/test/resources/sql-keywords.txt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
# Source: https://clickhouse.joesstuff.co.uk/keywords.html
33
# Individual keywords extracted and deduplicated from system.keywords table
44

5+
ABI
56
ACCESS
67
ACTION
78
ADD
@@ -17,6 +18,7 @@ ANTI
1718
ANY
1819
APPEND
1920
APPLY
21+
ARGUMENTS
2022
ARRAY
2123
AS
2224
ASC
@@ -105,6 +107,7 @@ DIV
105107
DOUBLE_SHA1_HASH
106108
DOUBLE_SHA1_PASSWORD
107109
DROP
110+
DRY
108111
ELSE
109112
EMPTY
110113
ENABLED
@@ -198,6 +201,7 @@ KEYED
198201
KEYS
199202
KILL
200203
KIND
204+
LANGUAGE
201205
LARGE
202206
LAST
203207
LAYOUT
@@ -334,6 +338,7 @@ RESTORE
334338
RESTRICT
335339
RESTRICTIVE
336340
RESUME
341+
RETURNS
337342
REVOKE
338343
REWRITE
339344
RIGHT
@@ -343,6 +348,7 @@ ROLLBACK
343348
ROLLUP
344349
ROW
345350
ROWS
351+
RUN
346352
S
347353
S3
348354
SALT

0 commit comments

Comments
 (0)