[DBTOOLS-1772] Improved ClickHouse parser

Author: baslo2

src/main/antlr4/org/pgcodekeeper/core/parsers/antlr/ch/generated/CHLexer.g4

@@ -13,9 +13,14 @@ import org.pgcodekeeper.core.parsers.antlr.base.CodeUnitLexer;
 
 
 // case sensitive data types
-
+ADDRESS_TO_LINE      options { caseInsensitive = false; } : 'addressToLine';
+ADDRESS_TO_LINE_WITH_IN_LINES options { caseInsensitive = false; } : 'addressToLineWithInlines';
+ADDRESS_TO_SYMBOL  options { caseInsensitive = false; } : 'addressToSymbol';
 AGGREGATE_FUNCTION options { caseInsensitive = false; } : 'Simple'? 'AggregateFunction';
 // ARRAY_TYPE: 'Array';
+DEMANGLE           options { caseInsensitive = false; } : 'demangle';
+DICTGET            options { caseInsensitive = false; } : 'dictGet';
+DISPLAY_SECRETS_IN_SHOW_AND_SELECT options { caseInsensitive = false; } : 'displaySecretsInShowAndSelect';
 ENUM               options { caseInsensitive = false; } : 'Enum' ('8'|'16') | [eE] [nN] [uU] [mM];
 FIXED_STRING       options { caseInsensitive = false; } : 'FixedString';
 FLOAT              options { caseInsensitive = false; } : 'Float' ('32' | '64') | [fF] [lL] [oO] [aA] [tT];
@@ -102,6 +107,7 @@ CN: 'CN';
 CODEC: 'CODEC';
 COLLATE: 'COLLATE';
 COLLECTION: 'COLLECTION';
+COLLECTIONS: 'COLLECTIONS';
 COLUMN: 'COLUMN';
 COLUMNS: 'COLUMNS';
 COMMENT: 'COMMENT';
@@ -133,7 +139,6 @@ DESCENDING: 'DESCENDING';
 DESCRIBE: 'DESCRIBE';
 DETACH: 'DETACH';
 DETACHED: 'DETACHED';
-DICTGET: 'DICTGET';
 DICTIONARIES: 'DICTIONARIES';
 DICTIONARY: 'DICTIONARY';
 DISK: 'DISK';
@@ -341,6 +346,7 @@ ROW: 'ROW';
 ROWS: 'ROWS';
 SAMPLE: 'SAMPLE';
 SECOND: 'SECOND' 'S'?;
+SECRETS: 'SECRETS';
 SECURITY: 'SECURITY';
 SELECT: 'SELECT';
 SEMI: 'SEMI';
@@ -350,6 +356,7 @@ SET: 'SET';
 SETS: 'SETS';
 SETTING: 'SETTING';
 SETTINGS: 'SETTINGS';
+SHARDS: 'SHARDS';
 SHOW: 'SHOW';
 SHUTDOWN: 'SHUTDOWN';
 SIGNED: 'SIGNED';
@@ -394,6 +401,7 @@ TYPE: 'TYPE';
 UNBOUNDED: 'UNBOUNDED';
 UNFREEZE: 'UNFREEZE';
 UNCOMPRESSED: 'UNCOMPRESSED';
+UNDROP: 'UNDROP';
 UNION: 'UNION';
 UNSIGNED: 'UNSIGNED';
 UNTIL: 'UNTIL';

src/main/antlr4/org/pgcodekeeper/core/parsers/antlr/ch/generated/CHParser.g4

@@ -147,12 +147,13 @@ permission
     | CREATE (object_type | DICTIONARY | FUNCTION | ARBITRARY? TEMPORARY TABLE)?
     | DELETE
     | DICTGET
+    | DISPLAY_SECRETS_IN_SHOW_AND_SELECT
     | DROP (object_type | DICTIONARY | FUNCTION)?
     | source_privilige
     | INSERT
-    | INTROSPECTION
+    | INTROSPECTION (ADDRESS_TO_LINE | ADDRESS_TO_LINE_WITH_IN_LINES | ADDRESS_TO_SYMBOL | DEMANGLE)?
     | KILL (QUERY | TRANSACTION)
-//  | MOVE PARTITION BETWEEN SHARDS
+    | MOVE PARTITION BETWEEN SHARDS
     | NAMED COLLECTION ADMIN?
     | NONE
     | OPTIMIZE
@@ -161,7 +162,7 @@ permission
     | SET DEFINER
     | SHOW (COLUMNS | DATABASES | DICTIONARIES | QUOTAS | ROLES | ROW POLICIES | TABLES | USERS
            | ACCESS | FILESYSTEM CACHES | SETTINGS PROFILES)?
-//  | SHOW NAMED COLLECTIONS SECRETS?
+    | SHOW NAMED COLLECTIONS SECRETS?
     | SOURCES
     | SYSTEM
 //  | SYSTEM CLEANUP
@@ -191,13 +192,8 @@ permission
 //  | SYSTEM VIRTUAL PARTS UPDATE
 //  | SYSTEM WAIT LOADING PARTS
     | TRUNCATE
-//  | UNDROP TABLE
+    | UNDROP TABLE
     | USAGE
-//  | addressToLine
-//  | addressToLineWithInlines
-//  | addressToSymbol
-//  | demangle
-//  | displaySecretsInShowAndSelect
     ;
 
 object_type
@@ -699,7 +695,6 @@ table_column_def
 data_type_expr
     : not_null? table_column_property_expr
     | data_type not_null? table_column_property_expr?
-    | IDENTIFIER NULL table_column_property_expr
     ;
 
 comment_expr
@@ -1291,6 +1286,9 @@ tokens_nonreserved
     : ACCESS
     | ADD
     | ADMIN
+    | ADDRESS_TO_LINE
+    | ADDRESS_TO_LINE_WITH_IN_LINES
+    | ADDRESS_TO_SYMBOL
     | AFTER
     | AGGREGATE_FUNCTION
     | ALIAS
@@ -1333,6 +1331,7 @@ tokens_nonreserved
     | CODEC
     | COLLATE
     | COLLECTION
+    | COLLECTIONS
     | COLUMN
     | COLUMNS
     | COMMENT
@@ -1357,6 +1356,7 @@ tokens_nonreserved
     | DELAY
     | DELETE
     | DELETED
+    | DEMANGLE
     | DESC
     | DESCENDING
     | DESCRIBE
@@ -1554,13 +1554,15 @@ tokens_nonreserved
     | ROLLUP
     | ROW
     | ROWS
+    | SECRETS
     | SECURITY
     | SELECT
     | SENDS
     | SERVER
     | SET
     | SETS
     | SETTING
+    | SHARDS
     | SHOW
     | SHUTDOWN
     | SIGNED
@@ -1607,6 +1609,7 @@ tokens_nonreserved
     | UNBOUNDED
     | UNFREEZE
     | UNCOMPRESSED
+    | UNDROP
     | UNSIGNED
     | UNTIL
     | UPDATE

src/test/resources/org/pgcodekeeper/core/it/parser/ch/ch_privileges.sql

@@ -50,4 +50,10 @@ REVOKE SELECT(c1, c2, c3, c4, c5) ON db1.table1 FROM test_role_01073;
 REVOKE SELECT(col1) ON db.table FROM test_user_01074;
 REVOKE SELECT(col1, col2) ON db.table FROM test_user_01074;
 REVOKE SELECT(col2) ON db4.table FROM test_user_01073;
-GRANT AZURE, BACKUP, FILE, HDFS, HIVE, JDBC, KAFKA, MONGO, MYSQL, NATS, ODBC, POSTGRES, RABBITMQ, REDIS, REMOTE, S3, SQLITE, URL ON *.* TO username;
+GRANT AZURE, BACKUP, FILE, HDFS, HIVE, JDBC, KAFKA, MONGO, MYSQL, NATS, ODBC, POSTGRES, RABBITMQ, REDIS, REMOTE, S3, SQLITE, URL ON *.* TO username;
+GRANT INTROSPECTION addressToLine ON *.* TO userName;
+GRANT INTROSPECTION addressToLineWithInlines ON *.* TO userName;
+GRANT INTROSPECTION addressToSymbol ON *.* TO userName;
+GRANT INTROSPECTION demangle ON *.* TO userName;
+GRANT SHOW, SELECT, INSERT, ALTER, CREATE, DROP, UNDROP TABLE, TRUNCATE, OPTIMIZE, BACKUP, KILL QUERY, KILL TRANSACTION, MOVE PARTITION BETWEEN SHARDS, ACCESS MANAGEMENT, SYSTEM, dictGet, displaySecretsInShowAndSelect, INTROSPECTION, SOURCES, CLUSTER ON *.* TO default WITH GRANT OPTION;
+GRANT ALTER NAMED COLLECTION, CREATE NAMED COLLECTION, DROP NAMED COLLECTION, SHOW NAMED COLLECTIONS SECRETS, NAMED COLLECTION ON * TO default WITH GRANT OPTION;

src/test/resources/org/pgcodekeeper/core/it/parser/ch/ch_privileges_refs.txt

@@ -50,4 +50,10 @@ Reference: action = REVOKE, offset = 2532, line number = 49, charPositionInLine
 Reference: action = REVOKE, offset = 2602, line number = 50, charPositionInLine = 0
 Reference: action = REVOKE, offset = 2656, line number = 51, charPositionInLine = 0
 Reference: action = REVOKE, offset = 2716, line number = 52, charPositionInLine = 0
-Reference: action = GRANT, offset = 2771, line number = 53, charPositionInLine = 0
+Reference: action = GRANT, offset = 2771, line number = 53, charPositionInLine = 0
+Reference: action = GRANT, offset = 2920, line number = 54, charPositionInLine = 0
+Reference: action = GRANT, offset = 2974, line number = 55, charPositionInLine = 0
+Reference: action = GRANT, offset = 3039, line number = 56, charPositionInLine = 0
+Reference: action = GRANT, offset = 3095, line number = 57, charPositionInLine = 0
+Reference: action = GRANT, offset = 3144, line number = 58, charPositionInLine = 0
+Reference: action = GRANT, offset = 3432, line number = 59, charPositionInLine = 0