Merge pull request #48 from sharding-sphere/dev

update from origin
apache · Nov 12, 2018 · 0e82de4 · 0e82de4
2 parents 33e833a + f7528d2
commit 0e82de4
Show file tree

Hide file tree

Showing 61 changed files with 1,693 additions and 459 deletions.
diff --git a/sharding-core/src/main/antlr4/imports/BaseRule.g4 b/sharding-core/src/main/antlr4/imports/BaseRule.g4
@@ -11,6 +11,14 @@ schemaName
     : ID
     ;
 
+databaseName
+    : ID
+    ;
+
+domainName
+    : ID
+    ;
+
 tableName
     : ID
     ;
@@ -19,6 +27,10 @@ columnName
     : ID
     ;
 
+sequenceName
+    : ID
+    ;
+
 tablespaceName
     : ID
     ;
@@ -97,7 +109,7 @@ routineName
     ;
 
 roleName
-    : ID
+    : STRING | ID
     ;
 
 partitionName
@@ -113,9 +125,17 @@ ownerName
     ;
 
 userName
+    : STRING | ID
+    ;
+
+serverName
     : ID
     ;
 
+databaseName
+    : ID
+    ;
+
 dataTypeLength
     : LP_ (NUMBER (COMMA NUMBER)?)? RP_
     ;
@@ -140,6 +160,18 @@ rangeClause
     : NUMBER (COMMA  NUMBER)* | NUMBER OFFSET NUMBER
     ;
 
+schemaNames
+    : schemaName (COMMA schemaName)*
+    ;
+
+databaseNames
+    : databaseName (COMMA databaseName)*
+    ;
+
+domainNames
+    : domainName (COMMA domainName)*
+    ;
+
 tableNamesWithParen
     : LP_ tableNames RP_
     ;
@@ -160,10 +192,22 @@ columnList
     : LP_ columnNames RP_
     ;
 
+sequenceNames
+    : sequenceName (COMMA sequenceName)*
+    ;
+
+tablespaceNames
+    : tablespaceName (COMMA tablespaceName)*
+    ;
+
 indexNames
     : indexName (COMMA indexName)*
     ;
 
+typeNames
+    : typeName (COMMA typeName)*
+    ;
+
 rowNames
     : rowName (COMMA rowName)*
     ;
@@ -176,6 +220,10 @@ userNames
     : userName (COMMA userName)*
     ;
 
+serverNames
+    : serverName (COMMA serverName)*
+    ;
+
 bitExprs:
     bitExpr (COMMA bitExpr)*
     ;