resolve conflict and format code

apache · Nov 6, 2023 · 2336d7a · 2336d7a
1 parent 674dbde
commit 2336d7a
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/parser/sql/dialect/oracle/src/main/antlr4/imports/oracle/DDLStatement.g4 b/parser/sql/dialect/oracle/src/main/antlr4/imports/oracle/DDLStatement.g4
@@ -4144,3 +4144,4 @@ datafileSpecClause
 createProfile
     : CREATE MANDATORY? PROFILE profileName LIMIT (resourceParameters | passwordParameters)+ (CONTAINER EQ_ (CURRENT | ALL))?
     ;
+
diff --git a/parser/sql/dialect/oracle/src/main/antlr4/imports/oracle/OracleKeyword.g4 b/parser/sql/dialect/oracle/src/main/antlr4/imports/oracle/OracleKeyword.g4
@@ -7745,5 +7745,5 @@ DB_RECOVERY_FILE_DEST_SIZE
     ;
 
 MANDATORY
-    : M A N D A  T O R Y
-    ;
+    : M A N D A T O R Y
+    ;
diff --git a/...he/shardingsphere/sql/parser/oracle/visitor/statement/type/OracleDDLStatementVisitor.java b/...he/shardingsphere/sql/parser/oracle/visitor/statement/type/OracleDDLStatementVisitor.java
@@ -1353,13 +1353,12 @@ public ASTNode visitCreateJava(final CreateJavaContext ctx) {
     public ASTNode visitCreateLibrary(final CreateLibraryContext ctx) {
         return new OracleCreateLibraryStatement();
     }
-
+    
     @Override
     public ASTNode visitSwitch(final SwitchContext ctx) {
         return new OracleSwitchStatement();
     }
-
-
+
     @Override
     public ASTNode visitCreateProfile(final CreateProfileContext ctx) {
         return new OracleCreateProfileStatement();

diff --git a/.../main/java/org/apache/shardingsphere/sql/parser/core/database/visitor/SQLVisitorRule.java b/.../main/java/org/apache/shardingsphere/sql/parser/core/database/visitor/SQLVisitorRule.java
@@ -700,9 +700,9 @@ public enum SQLVisitorRule {
     PLSQL_BLOCK("PlsqlBlock", SQLStatementType.DDL),
 
     CREATE_LIBRARY("CreateLibrary", SQLStatementType.DDL),
-
+    
     SWITCH("Switch", SQLStatementType.DDL),
-
+    
     CREATE_PROFILE("CreateProfile", SQLStatementType.DDL);
 
     private final String name;

diff --git a/.../shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/RootSQLParserTestCases.java b/.../shardingsphere/test/it/sql/parser/internal/cases/parser/jaxb/RootSQLParserTestCases.java
@@ -1724,10 +1724,10 @@ public final class RootSQLParserTestCases {
 
     @XmlElement(name = "switch")
     private final List<SwitchStatementTestCase> switchStatementTestCases = new LinkedList<>();
-
+    
     @XmlElement(name = "create-profile")
     private final List<CreateProfileStatementTestCase> createProfileStatementTestCases = new LinkedList<>();
-
+    
     /**
      * Get all SQL parser test cases.
      *
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4144,3 +4144,4 @@ datafileSpecClause
		createProfile
		: CREATE MANDATORY? PROFILE profileName LIMIT (resourceParameters \| passwordParameters)+ (CONTAINER EQ_ (CURRENT \| ALL))?
		;