Review the DDL Parsing rules for different databases

sharding-core/sharding-core-parse/sharding-core-parse-mysql/src/main/antlr4/imports/mysql/BaseRule.g4

@@ -34,7 +34,7 @@ literals
     ;
 
 stringLiterals
-    : characterSetName_? STRING_ collateName_?
+    : characterSetName_? STRING_ collateClause_?
     ;
 
 numberLiterals
@@ -47,11 +47,11 @@ dateTimeLiterals
     ;
 
 hexadecimalLiterals
-    : characterSetName_? HEX_DIGIT_ collateName_?
+    : characterSetName_? HEX_DIGIT_ collateClause_?
     ;
 
 bitValueLiterals
-    : characterSetName_? BIT_NUM_ collateName_?
+    : characterSetName_? BIT_NUM_ collateClause_?
     ;
 
 booleanLiterals
@@ -66,10 +66,6 @@ characterSetName_
     : IDENTIFIER_
     ;
 
-collateName_
-    : COLLATE IDENTIFIER_
-    ;
-
 identifier_
     : IDENTIFIER_ | unreservedWord_
     ;
@@ -112,7 +108,11 @@ columnName
     ;
 
 columnNames
-    : LP_ columnName (COMMA_ columnName)* RP_
+    : LP_? columnName (COMMA_ columnName)* RP_?
+    ;
+
+tableNames
+    : LP_? tableName (COMMA_ tableName)* RP_?
     ;
 
 indexName
@@ -355,7 +355,7 @@ dataTypeLength
     ;
 
 characterSet_
-    : (CHARACTER | CHAR) SET EQ_? ignoredIdentifier_ | CHARSET EQ_? ignoredIdentifier_
+    : (CHARACTER | CHAR) SET EQ_? ignoredIdentifier_
     ;
 
 collateClause_

sharding-core/sharding-core-parse/sharding-core-parse-mysql/src/main/antlr4/imports/mysql/DDLStatement.g4

@@ -20,34 +20,34 @@ grammar DDLStatement;
 import Symbol, Keyword, Literals, BaseRule;
 
 createTable
-    : CREATE createSpecification_ TABLE notExistClause_ tableName (createDefinitionClause_ | createLikeClause_)
+    : CREATE createTableSpecification_ TABLE tableNotExistClause_ tableName (createDefinitionClause_ | createLikeClause_)
     ;
 
 createIndex
-    : CREATE (UNIQUE | FULLTEXT | SPATIAL)? INDEX indexName indexType_? ON tableName
+    : CREATE createIndexSpecification_ INDEX indexName indexType_? ON tableName
     ;
 
 alterTable
-    : ALTER TABLE tableName alterSpecifications_?
+    : ALTER TABLE tableName alterDefinitionClause_?
     ;
 
 dropTable
-    : DROP TEMPORARY? TABLE (IF EXISTS)? tableName (COMMA_ tableName)*
+    : DROP dropTableSpecification_ TABLE tableExistClause_ tableNames
     ;
 
 dropIndex
-    : DROP INDEX (ONLINE | OFFLINE)? indexName ON tableName
+    : DROP INDEX dropIndexSpecification_ indexName ON tableName
     ;
 
 truncateTable
     : TRUNCATE TABLE? tableName
     ;
 
-createSpecification_
+createTableSpecification_
     : TEMPORARY?
     ;
 
-notExistClause_
+tableNotExistClause_
     : (IF NOT EXISTS)?
     ;
 
@@ -76,7 +76,7 @@ inlineDataType_
     ;
 
 commonDataTypeOption_
-    : primaryKey | UNIQUE KEY? | NOT? NULL | collateName_ | checkConstraintDefinition_ | referenceDefinition_ | COMMENT STRING_
+    : primaryKey | UNIQUE KEY? | NOT? NULL | collateClause_ | checkConstraintDefinition_ | referenceDefinition_ | COMMENT STRING_
     ;
 
 checkConstraintDefinition_
@@ -141,7 +141,11 @@ createLikeClause_
     : LP_? LIKE tableName RP_?
     ;
 
-alterSpecifications_
+createIndexSpecification_
+    : (UNIQUE | FULLTEXT | SPATIAL)?
+    ;
+
+alterDefinitionClause_
     : alterSpecification_ (COMMA_ alterSpecification_)*
     ;
 
@@ -169,7 +173,7 @@ alterSpecification_
     | LOCK EQ_? (DEFAULT | NONE | SHARED | EXCLUSIVE)
     | modifyColumnSpecification
     // TODO hongjun investigate ORDER BY col_name [, col_name] ...
-    | ORDER BY columnName (COMMA_ columnName)*
+    | ORDER BY columnNames
     | renameColumnSpecification
     | renameIndexSpecification
     | renameTableSpecification_
@@ -308,3 +312,15 @@ partitionDefinitionOption_
 subpartitionDefinition_
     : SUBPARTITION identifier_ partitionDefinitionOption_*
     ;
+
+dropTableSpecification_
+    : TEMPORARY?
+    ;
+
+tableExistClause_
+    : (IF EXISTS)?
+    ;
+
+dropIndexSpecification_
+    : (ONLINE | OFFLINE)?
+    ;

sharding-core/sharding-core-parse/sharding-core-parse-oracle/src/main/antlr4/imports/oracle/DDLStatement.g4

@@ -20,20 +20,20 @@ grammar DDLStatement;
 import Symbol, Keyword, Literals, BaseRule;
 
 createTable
-    : CREATE createSpecification_ TABLE tableName createDefinitionClause_
+    : CREATE createTableSpecification_ TABLE tableName createDefinitionClause_
     ;
 
 createIndex
-    : CREATE (UNIQUE | BITMAP)? INDEX indexName ON (tableIndexClause_ | bitmapJoinIndexClause_)
+    : CREATE createIndexSpecification_ INDEX indexName ON createIndexDefinitionClause_
     ;
 
 alterTable
-    : ALTER TABLE tableName (alterTableProperties | columnClauses | constraintClauses | alterExternalTable)?
+    : ALTER TABLE tableName alterDefinitionClause_
     ;
 
 // TODO hongjun throw exeption when alter index on oracle
 alterIndex
-    : ALTER INDEX indexName (RENAME TO indexName)?
+    : ALTER INDEX indexName renameIndexClause_
     ;
 
 dropTable
@@ -48,7 +48,7 @@ truncateTable
     : TRUNCATE TABLE tableName
     ;
 
-createSpecification_
+createTableSpecification_
     : (GLOBAL TEMPORARY)?
     ;
 
@@ -77,14 +77,26 @@ relationalProperty
     ;
 
 columnDefinition
-    : columnName dataType SORT? (VISIBLE | INVISIBLE)? (DEFAULT (ON NULL)? expr | identityClause)? (ENCRYPT encryptionSpecification_)? (inlineConstraint+ | inlineRefConstraint)?
+    : columnName dataType SORT? visibleClause_ (defaultNullClause_ expr | identityClause)? (ENCRYPT encryptionSpecification_)? (inlineConstraint+ | inlineRefConstraint)?
+    ;
+
+visibleClause_
+    : (VISIBLE | INVISIBLE)?
+    ;
+
+defaultNullClause_
+    : DEFAULT (ON NULL)?
     ;
 
 identityClause
-    : GENERATED (ALWAYS | BY DEFAULT (ON NULL)?) AS IDENTITY LP_? (identityOptions+)? RP_?
+    : GENERATED (ALWAYS | BY DEFAULT (ON NULL)?) AS IDENTITY identifyOptions
     ;
 
-identityOptions
+identifyOptions
+    : LP_? (identityOption+)? RP_?
+    ;
+
+identityOption
     : START WITH (NUMBER_ | LIMIT VALUE)
     | INCREMENT BY NUMBER_
     | MAXVALUE NUMBER_
@@ -134,7 +146,11 @@ exceptionsClause
     ;
 
 usingIndexClause
-    : USING INDEX (indexName | LP_ createIndex RP_)?
+    : USING INDEX (indexName | createIndexClause_)?
+    ;
+
+createIndexClause_ 
+    :  LP_ createIndex RP_
     ;
 
 inlineRefConstraint
@@ -160,12 +176,44 @@ outOfLineRefConstraint
     | (CONSTRAINT ignoredIdentifier_)? FOREIGN KEY lobItemList referencesClause constraintState*
     ;
 
-tableProperties
-    : columnProperties? (AS unionSelect)?
+createIndexSpecification_
+    : (UNIQUE | BITMAP)?
+    ;
+
+tableIndexClause_
+    : tableName alias? indexExpressions_
+    ;
+
+indexExpressions_
+    : LP_ indexExpression_ (COMMA_ indexExpression_)* RP_
+    ;
+
+indexExpression_
+    : (columnName | expr) (ASC | DESC)?
+    ;
+
+bitmapJoinIndexClause_
+    : tableName columnSortsClause_ FROM tableAlias WHERE expr
+    ;
+
+columnSortsClause_
+    : LP_ columnSortClause_ (COMMA_ columnSortClause_)* RP_
+    ;
+
+columnSortClause_
+    : (tableName | alias)? columnName (ASC | DESC)?
+    ;
+
+createIndexDefinitionClause_
+    : tableIndexClause_ | bitmapJoinIndexClause_
+    ;
+
+tableAlias
+    : tableName alias? (COMMA_ tableName alias?)*
     ;
 
-unionSelect
-    : matchNone
+alterDefinitionClause_
+    : (alterTableProperties | columnClauses | constraintClauses | alterExternalTable)?
     ;
 
 alterTableProperties
@@ -181,10 +229,10 @@ newTableName
     ;
 
 columnClauses
-    : opColumnClause+ | renameColumnSpecification
+    : operateColumnClause+ | renameColumnClause
     ;
 
-opColumnClause
+operateColumnClause
     : addColumnSpecification | modifyColumnSpecification | dropColumnClause
     ;
 
@@ -200,6 +248,22 @@ columnOrVirtualDefinition
     : columnDefinition | virtualColumnDefinition
     ;
 
+columnProperties
+    : columnProperty+
+    ;
+
+columnProperty
+    : objectTypeColProperties
+    ;
+
+objectTypeColProperties
+    : COLUMN columnName substitutableColumnClause
+    ;
+
+substitutableColumnClause
+    : ELEMENT? IS OF TYPE? LP_ ONLY? dataTypeName_ RP_ | NOT? SUBSTITUTABLE AT ALL LEVELS
+    ;
+
 modifyColumnSpecification
     : MODIFY (LP_? modifyColProperties (COMMA_ modifyColProperties)* RP_? | modifyColSubstitutable)
     ;
@@ -232,7 +296,7 @@ checkpointNumber
     : CHECKPOINT NUMBER_
     ;
 
-renameColumnSpecification
+renameColumnClause
     : RENAME COLUMN columnName TO columnName
     ;
 
@@ -283,36 +347,6 @@ objectProperty
     : (columnName | attributeName) (DEFAULT expr)? (inlineConstraint* | inlineRefConstraint?) | outOfLineConstraint | outOfLineRefConstraint
     ;
 
-columnProperties
-    : columnProperty+
-    ;
-
-columnProperty
-    : objectTypeColProperties
+renameIndexClause_
+    : (RENAME TO indexName)?
     ;
-
-objectTypeColProperties
-    : COLUMN columnName substitutableColumnClause
-    ;
-
-substitutableColumnClause
-    : ELEMENT? IS OF TYPE? LP_ ONLY? dataTypeName_ RP_ | NOT? SUBSTITUTABLE AT ALL LEVELS
-    ;
-
-tableIndexClause_
-    : tableName alias? LP_ indexExpr_ (COMMA_ indexExpr_)* RP_
-    ;
-
-indexExpr_
-    : (columnName | expr) (ASC | DESC)?
-    ;
-
-bitmapJoinIndexClause_
-    : tableName LP_ columnSortClause_ (COMMA_ columnSortClause_)* RP_ FROM tableName alias? (COMMA_ tableName alias?)* WHERE expr
-    ;
-
-columnSortClause_
-    : tableName alias? columnName (ASC | DESC)?
-    ;
-
-