DBZ-8270 Remove MariaDB specific grammar from MySQL grammar; Add miss…

…ing grammar to MariaDB
spieps · Dec 18, 2024 · da9e385 · da9e385
1 parent 322c7fa
commit da9e385
Show file tree

Hide file tree

Showing 4 changed files with 116 additions and 307 deletions.
diff --git a/debezium-ddl-parser/src/main/antlr4/io/debezium/ddl/parser/mariadb/generated/MariaDBLexer.g4 b/debezium-ddl-parser/src/main/antlr4/io/debezium/ddl/parser/mariadb/generated/MariaDBLexer.g4
@@ -215,6 +215,7 @@ STACKED                       : 'STACKED';
 STARTING                      : 'STARTING';
 STATEMENT                     : 'STATEMENT';
 STRAIGHT_JOIN                 : 'STRAIGHT_JOIN';
+SYSTEM                        : 'SYSTEM';
 TABLE                         : 'TABLE';
 TERMINATED                    : 'TERMINATED';
 THEN                          : 'THEN';
@@ -232,6 +233,7 @@ USAGE                         : 'USAGE';
 USE                           : 'USE';
 USING                         : 'USING';
 VALUES                        : 'VALUES';
+VERSIONING                    : 'VERSIONING';
 WHEN                          : 'WHEN';
 WHERE                         : 'WHERE';
 WHILE                         : 'WHILE';

diff --git a/...zium-ddl-parser/src/main/antlr4/io/debezium/ddl/parser/mariadb/generated/MariaDBParser.g4 b/...zium-ddl-parser/src/main/antlr4/io/debezium/ddl/parser/mariadb/generated/MariaDBParser.g4
@@ -573,6 +573,7 @@ tableOption
     | tablespaceStorage                                           # tableOptionTablespace
     | TRANSACTIONAL '='? ('0' | '1')                              # tableOptionTransactional
     | UNION '='? '(' tables ')'                                   # tableOptionUnion
+    | WITH SYSTEM VERSIONING                                      # tableOptionWithSystemVersioning // MariaDB-specific only
     ;
 
 tableType
@@ -595,6 +596,19 @@ partitionFunctionDefinition
     | LINEAR? KEY (ALGORITHM '=' algType = ('1' | '2'))? '(' uidList ')' # partitionFunctionKey
     | RANGE ('(' expression ')' | COLUMNS '(' uidList ')')               # partitionFunctionRange
     | LIST ('(' expression ')' | COLUMNS '(' uidList ')')                # partitionFunctionList
+    | SYSTEM_TIME (expression | LIMIT expression) (
+        STARTS (TIMESTAMP timestampValue | timestampValue)
+    )? AUTO? partitionSystemVersionDefinitions? # partitionSystemVersion // MariaDB-specific
+    ;
+
+// MariaDB-specific
+partitionSystemVersionDefinitions
+    : '(' partitionSystemVersionDefinition (',' partitionSystemVersionDefinition)* ')'
+    ;
+
+// MariaDB-specific
+partitionSystemVersionDefinition
+    : PARTITION uid (HISTORY | CURRENT)
     ;
 
 subpartitionFunctionDefinition
@@ -1663,7 +1677,7 @@ privilege
     : ALL PRIVILEGES?
     | ALTER ROUTINE?
     | CREATE (TEMPORARY TABLES | ROUTINE | VIEW | USER | TABLESPACE | ROLE)?
-    | DELETE
+    | DELETE (HISTORY)? // HISTORY is MariaDB-specific
     | DROP (ROLE)?
     | EVENT
     | EXECUTE
@@ -2305,6 +2319,7 @@ dataType
     )                                                                                  # spatialDataType
     | typeName = LONG VARCHAR? BINARY? (charSet charsetName)? (COLLATE collationName)? # longVarcharDataType // LONG VARCHAR is the same as LONG
     | LONG VARBINARY                                                                   # longVarbinaryDataType
+    | UUID                                                                             # uuidDataType // MariaDB-specific only
     ;
 
 collectionOptions
@@ -3232,6 +3247,7 @@ keywordsCanBeId
     | SETVAL
     | SKIP_
     | STATEMENT
+    | UUID
     | VIA
     | MONITOR
     | READ_ONLY

diff --git a/debezium-ddl-parser/src/main/antlr4/io/debezium/ddl/parser/mysql/generated/MySqlLexer.g4 b/debezium-ddl-parser/src/main/antlr4/io/debezium/ddl/parser/mysql/generated/MySqlLexer.g4
@@ -59,7 +59,6 @@ ARRAY: 'ARRAY';
 AS: 'AS';
 ASC: 'ASC';
 ATTRIBUTE: 'ATTRIBUTE';
-AUTO: 'AUTO'; // MariaDB-specific
 BEFORE: 'BEFORE';
 BETWEEN: 'BETWEEN';
 BOTH: 'BOTH';
@@ -218,7 +217,6 @@ STACKED: 'STACKED';
 STARTING: 'STARTING';
 STATEMENT: 'STATEMENT';
 STRAIGHT_JOIN: 'STRAIGHT_JOIN';
-SYSTEM_TIME: 'SYSTEM_TIME'; // MariaDB-specific
 TABLE: 'TABLE';
 TERMINATED: 'TERMINATED';
 THEN: 'THEN';
@@ -773,13 +771,6 @@ WEEK: 'WEEK';
 SECOND: 'SECOND';
 MICROSECOND: 'MICROSECOND';
 
-// MariaDB: userstat plugin Keywords
-
-USER_STATISTICS: 'USER_STATISTICS';
-CLIENT_STATISTICS: 'CLIENT_STATISTICS';
-INDEX_STATISTICS: 'INDEX_STATISTICS';
-TABLE_STATISTICS: 'TABLE_STATISTICS';
-
 // Azure Database for MySQL Single Server instance:
 FIREWALL_RULES: 'FIREWALL_RULES';
 
@@ -1225,23 +1216,6 @@ YEARWEEK: 'YEARWEEK';
 Y_FUNCTION: 'Y';
 X_FUNCTION: 'X';
 
-// MariaDB tokens
-VIA: 'VIA';
-LASTVAL: 'LASTVAL';
-NEXTVAL: 'NEXTVAL';
-SETVAL: 'SETVAL';
-PREVIOUS: 'PREVIOUS';
-PERSISTENT: 'PERSISTENT'; // Same as STORED for MySQL
-BINLOG_MONITOR: 'BINLOG_MONITOR';
-BINLOG_REPLAY: 'BINLOG_REPLAY';
-FEDERATED_ADMIN: 'FEDERATED_ADMIN';
-READ_ONLY_ADMIN: 'READ_ONLY_ADMIN';
-REPLICA: 'REPLICA';
-REPLICATION_MASTER_ADMIN: 'REPLICATION_MASTER_ADMIN';
-MONITOR: 'MONITOR';
-READ_ONLY: 'READ_ONLY';
-REPLAY: 'REPLAY';
-
 // Operators
 // Operators. Assigns