Merge b024060 into a783405

apache · Jul 29, 2019 · fd5bef0 · fd5bef0
2 parents a783405 + b024060
commit fd5bef0
Show file tree

Hide file tree

Showing 13 changed files with 197 additions and 11 deletions.
diff --git a/...e/sharding-core-parse/sharding-core-parse-mysql/src/main/antlr4/imports/mysql/BaseRule.g4 b/...e/sharding-core-parse/sharding-core-parse-mysql/src/main/antlr4/imports/mysql/BaseRule.g4
@@ -98,7 +98,8 @@ unreservedWord_
     | BOOLEAN | MAX | MIN | SUM | COUNT | AVG | BIT_AND
     | BIT_OR | BIT_XOR | GROUP_CONCAT | JSON_ARRAYAGG | JSON_OBJECTAGG | STD | STDDEV
     | STDDEV_POP | STDDEV_SAMP | VAR_POP | VAR_SAMP | VARIANCE | EXTENDED | STATUS
-    | FIELDS | INDEXES | USER | ROLE | OJ | AUTOCOMMIT | OFF
+    | FIELDS | INDEXES | USER | ROLE | OJ | AUTOCOMMIT | OFF | ROTATE | INSTANCE | MASTER | BINLOG |ERROR
+    | SCHEDULE | COMPLETION | DO | DEFINER |START |EVERY
     ;
 
 schemaName
@@ -113,6 +114,18 @@ columnName
     : (owner DOT_)? name
     ;
 
+userName
+    : (STRING_ | IDENTIFIER_) AT_ (STRING_ IDENTIFIER_)
+    | identifier_
+    | STRING_
+    ;
+
+eventName
+    : (STRING_ | IDENTIFIER_) AT_ (STRING_ IDENTIFIER_)
+    | identifier_
+    | STRING_ 
+    ;
+
 owner
     : identifier_
     ;

diff --git a/...arding-core-parse/sharding-core-parse-mysql/src/main/antlr4/imports/mysql/DDLStatement.g4 b/...arding-core-parse/sharding-core-parse-mysql/src/main/antlr4/imports/mysql/DDLStatement.g4
@@ -55,6 +55,39 @@ dropDatabse
     : DROP (DATABASE | SCHEMA) (IF EXISTS)? schemaName
     ;
 
+alterInstance
+    : ALTER INSTANCE instanceAction
+
+    ;
+
+instanceAction
+    : ROTATE 'INNODB' MASTER KEY
+    | ROTATE BINLOG MASTER KEY
+    | RELOAD 'TLS' (NO ROLLBACK ON ERROR)?
+    ;
+
+createEvent
+    : CREATE ownerStatement? EVENT (IF NOT EXISTS)? eventName
+      ON SCHEDULE scheduleExpression_
+      (ON COMPLETION NOT? PRESERVE)? (ENABLE | DISABLE | DISABLE ON SLAVE)?
+      (COMMENT STRING_)?
+      DO routineBody
+    ;
+
+alterEvent
+    : ALTER ownerStatement?
+      EVENT eventName
+      (ON SCHEDULE scheduleExpression_)?
+      (ON COMPLETION NOT? PRESERVE)?
+      (RENAME TO eventName)? (ENABLE | DISABLE | DISABLE ON SLAVE)?
+      (COMMENT STRING_)?
+      (DO routineBody)?
+    ;
+
+dropEvent
+    :  DROP EVENT (IF EXISTS)? eventName
+    ;
+
 createTableSpecification_
     : TEMPORARY
     ;
@@ -336,3 +369,31 @@ tableExistClause_
 dropIndexSpecification_
     : ONLINE | OFFLINE
     ;
+
+ownerStatement
+    : DEFINER EQ_ (userName | CURRENT_USER ( '(' ')')?)
+    ;
+
+scheduleExpression_
+    : AT_ timestampValue (PLUS_ intervalExpression_)*
+    | EVERY intervalExpression_
+        (
+          STARTS timestampValue
+          (PLUS_ intervalExpression_)*
+        )?
+        (
+          ENDS timestampValue
+          (PLUS_ intervalExpression_)*
+        )?     
+    ;
+
+timestampValue
+    : CURRENT_TIMESTAMP
+    | stringLiterals
+    | numberLiterals
+    | expr
+    ;
+
+routineBody
+    :  'not support'
+    ;
diff --git a/...re/sharding-core-parse/sharding-core-parse-mysql/src/main/antlr4/imports/mysql/Keyword.g4 b/...re/sharding-core-parse/sharding-core-parse-mysql/src/main/antlr4/imports/mysql/Keyword.g4
@@ -462,3 +462,23 @@ DISABLE
 CALL
     : C A L L
     ;
+
+INSTANCE
+    : I N S T A N C E
+    ;
+
+PRESERVE
+    : P R E S E R V E
+    ;
+
+DO
+    : D O
+    ;
+
+DEFINER
+    : D E F I N E R
+    ;
+
+CURRENT_USER
+    : C U R R E N T UL_ U S E R
+    ;
diff --git a/...e/sharding-core-parse/sharding-core-parse-mysql/src/main/antlr4/imports/mysql/Literals.g4 b/...e/sharding-core-parse/sharding-core-parse-mysql/src/main/antlr4/imports/mysql/Literals.g4
@@ -22,6 +22,7 @@ import Alphabet, Symbol;
 IDENTIFIER_
     : [A-Za-z_$0-9]*?[A-Za-z_$]+?[A-Za-z_$0-9]*
     |  BQ_ ~'`'+ BQ_
+    | (DQ_ ( '\\'. | '""' | ~('"'| '\\') )* DQ_)
     ;
 
 STRING_ 

diff --git a/...arding-core-parse/sharding-core-parse-mysql/src/main/antlr4/imports/mysql/MySQLKeyword.g4 b/...arding-core-parse/sharding-core-parse-mysql/src/main/antlr4/imports/mysql/MySQLKeyword.g4
@@ -959,3 +959,40 @@ SECOND_MICROSECOND
 UL_BINARY
     : UL_ B I N A R Y
     ;
+
+ROTATE
+    : R O T A T E
+    ;
+
+MASTER
+    : M A S T E R 
+    ;
+
+BINLOG
+    : B I N L O G
+    ;
+
+ERROR
+    : E R R O R
+    ;
+
+SCHEDULE
+    : S C H E D U L E
+    ;
+
+COMPLETION
+    : C O M P L E T I O N
+    ;
+
+EVERY
+    : E V E R Y
+    ;
+
+STARTS
+    : S T A R T S
+    ;
+
+ENDS
+    : E N D S
+    ;
+
diff --git a/...sharding-core-parse/sharding-core-parse-oracle/src/main/antlr4/imports/oracle/BaseRule.g4 b/...sharding-core-parse/sharding-core-parse-oracle/src/main/antlr4/imports/oracle/BaseRule.g4
@@ -95,6 +95,7 @@ unreservedWord_
     | CONTAINER | SEGMENT | RESTRICTED | COST | SYNONYM | BACKUP | UNLIMITED
     | BECOME | CHANGE | NOTIFICATION | ACCESS | PRIVILEGE | PURGE | RESUMABLE
     | SYSGUID | SYSBACKUP | SYSDBA | SYSDG | SYSKM | SYSOPER | DBA_RECYCLEBIN |SCHEMA
+    | DO | DEFINER | CURRENT_USER
     ;
 
 schemaName

diff --git a/.../sharding-core-parse/sharding-core-parse-oracle/src/main/antlr4/imports/oracle/Keyword.g4 b/.../sharding-core-parse/sharding-core-parse-oracle/src/main/antlr4/imports/oracle/Keyword.g4
@@ -462,3 +462,23 @@ DISABLE
 CALL
     : C A L L
     ;
+
+INSTANCE
+    : I N S T A N C E
+    ;
+
+PRESERVE
+    : P R E S E R V E
+    ;
+
+DO
+    : D O
+    ;
+
+DEFINER
+    : D E F I N E R
+    ;
+
+CURRENT_USER
+    : C U R R E N T UL_ U S E R
+    ;
diff --git a/...ing-core-parse/sharding-core-parse-oracle/src/main/antlr4/imports/oracle/OracleKeyword.g4 b/...ing-core-parse/sharding-core-parse-oracle/src/main/antlr4/imports/oracle/OracleKeyword.g4
@@ -335,10 +335,6 @@ ONLY
     : O N L Y
     ;
 
-PRESERVE
-    : P R E S E R V E
-    ;
-
 PRIOR
     : P R I O R
     ;

diff --git a/...-core-parse/sharding-core-parse-postgresql/src/main/antlr4/imports/postgresql/BaseRule.g4 b/...-core-parse/sharding-core-parse-postgresql/src/main/antlr4/imports/postgresql/BaseRule.g4
@@ -91,7 +91,7 @@ unreservedWord_
     | SEQUENCE | SESSION | SHOW | SIMPLE | STATISTICS | STORAGE | TABLESPACE
     | TEMP | TEMPORARY | TRIGGER | TYPE | UNBOUNDED | UNLOGGED | UPDATE
     | USAGE | VALID | VALIDATE | WITHIN | WITHOUT | ZONE | GROUPS
-    | RECURSIVE
+    | RECURSIVE | INSTANCE | DEFINER | PRESERVE
     ;
 
 schemaName

diff --git a/...g-core-parse/sharding-core-parse-postgresql/src/main/antlr4/imports/postgresql/Keyword.g4 b/...g-core-parse/sharding-core-parse-postgresql/src/main/antlr4/imports/postgresql/Keyword.g4
@@ -462,3 +462,23 @@ DISABLE
 CALL
     : C A L L
     ;
+
+INSTANCE
+    : I N S T A N C E
+    ;
+
+PRESERVE
+    : P R E S E R V E
+    ;
+
+DO
+    : D O
+    ;
+
+DEFINER
+    : D E F I N E R
+    ;
+
+CURRENT_USER
+    : C U R R E N T UL_ U S E R
+    ;
diff --git a/...se/sharding-core-parse-postgresql/src/main/antlr4/imports/postgresql/PostgreSQLKeyword.g4 b/...se/sharding-core-parse-postgresql/src/main/antlr4/imports/postgresql/PostgreSQLKeyword.g4
@@ -159,10 +159,6 @@ CURRENT_TIMESTAMP
     : C U R R E N T UL_ T I M E S T A M P
     ;
 
-CURRENT_USER
-    : C U R R E N T UL_ U S E R
-    ;
-
 CYCLE
     : C Y C L E
     ;

diff --git a/...ng-core-parse/sharding-core-parse-sqlserver/src/main/antlr4/imports/sqlserver/BaseRule.g4 b/...ng-core-parse/sharding-core-parse-sqlserver/src/main/antlr4/imports/sqlserver/BaseRule.g4
@@ -94,7 +94,7 @@ unreservedWord_
     | MASTER | DATA | SOURCE | FILE | FORMAT | LIBRARY | FULLTEXT | MASK | UNMASK
     | MESSAGE | TYPE | REMOTE | BINDING | ROUTE | SECURITY | POLICY | AGGREGATE | QUEUE
     | RULE | SYNONYM | COLLECTION | SCRIPT | KILL | BACKUP | LOG | SHOWPLAN
-    | SUBSCRIBE | QUERY | NOTIFICATIONS | CHECKPOINT | SEQUENCE
+    | SUBSCRIBE | QUERY | NOTIFICATIONS | CHECKPOINT | SEQUENCE | INSTANCE | DO | DEFINER
     ;
 
 schemaName

diff --git a/...ing-core-parse/sharding-core-parse-sqlserver/src/main/antlr4/imports/sqlserver/Keyword.g4 b/...ing-core-parse/sharding-core-parse-sqlserver/src/main/antlr4/imports/sqlserver/Keyword.g4
@@ -462,3 +462,24 @@ DISABLE
 CALL
     : C A L L
     ;
+
+INSTANCE
+    : I N S T A N C E
+    ;
+
+PRESERVE
+    : P R E S E R V E
+    ;
+
+DO
+    : D O
+    ;
+
+DEFINER
+    : D E F I N E R
+    ;
+
+CURRENT_USER
+    : C U R R E N T UL_ U S E R
+    ;
+