From d123cbfa82abef037073779a04dc27c7e11174fe Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Thu, 8 Aug 2024 16:48:08 +0800
Subject: [PATCH 001/113] init

---
 sqlTranslate/.idea/misc.xml                   | 14 ++++
 sqlTranslate/.idea/vcs.xml                    |  6 ++
 sqlTranslate/.idea/workspace.xml              | 64 +++++++++++++++++++
 sqlTranslate/pom.xml                          | 45 +++++++++++++
 .../src/main/java/org/example/App.java        |  7 ++
 .../src/test/java/org/example/AppTest.java    | 13 ++++
 6 files changed, 149 insertions(+)
 create mode 100644 sqlTranslate/.idea/misc.xml
 create mode 100644 sqlTranslate/.idea/vcs.xml
 create mode 100644 sqlTranslate/.idea/workspace.xml
 create mode 100644 sqlTranslate/pom.xml
 create mode 100644 sqlTranslate/src/main/java/org/example/App.java
 create mode 100644 sqlTranslate/src/test/java/org/example/AppTest.java

diff --git a/sqlTranslate/.idea/misc.xml b/sqlTranslate/.idea/misc.xml
new file mode 100644
index 00000000..e5d62959
--- /dev/null
+++ b/sqlTranslate/.idea/misc.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="MavenProjectsManager">
+    <option name="originalFiles">
+      <list>
+        <option value="$PROJECT_DIR$/pom.xml" />
+      </list>
+    </option>
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_19" default="true" project-jdk-name="19" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/sqlTranslate/.idea/vcs.xml b/sqlTranslate/.idea/vcs.xml
new file mode 100644
index 00000000..6c0b8635
--- /dev/null
+++ b/sqlTranslate/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
new file mode 100644
index 00000000..8a06abb0
--- /dev/null
+++ b/sqlTranslate/.idea/workspace.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AutoImportSettings">
+    <option name="autoReloadType" value="SELECTIVE" />
+  </component>
+  <component name="ChangeListManager">
+    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="">
+      <change afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
+    </list>
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="MavenImportPreferences">
+    <option name="importingSettings">
+      <MavenImportingSettings>
+        <option name="workspaceImportEnabled" value="true" />
+      </MavenImportingSettings>
+    </option>
+  </component>
+  <component name="ProjectId" id="2kMwWhUohyqt8bZ1bSi1kwgGkSK" />
+  <component name="ProjectViewState">
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showLibraryContents" value="true" />
+  </component>
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "RunOnceActivity.OpenProjectViewOnStart": "true",
+    "RunOnceActivity.ShowReadmeOnStart": "true"
+  }
+}]]></component>
+  <component name="RunManager">
+    <configuration name="App" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
+      <option name="MAIN_CLASS_NAME" value="org.example.App" />
+      <module name="sqlTranslate" />
+      <extension name="coverage">
+        <pattern>
+          <option name="PATTERN" value="org.example.*" />
+          <option name="ENABLED" value="true" />
+        </pattern>
+      </extension>
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
+    <recent_temporary>
+      <list>
+        <item itemvalue="应用程序.App" />
+      </list>
+    </recent_temporary>
+  </component>
+  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="应用程序级" UseSingleDictionary="true" transferred="true" />
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="默认任务">
+      <changelist id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="" />
+      <created>1723106789329</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1723106789329</updated>
+    </task>
+    <servers />
+  </component>
+</project>
\ No newline at end of file
diff --git a/sqlTranslate/pom.xml b/sqlTranslate/pom.xml
new file mode 100644
index 00000000..bb34291c
--- /dev/null
+++ b/sqlTranslate/pom.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>org.example</groupId>
+  <artifactId>sqlTranslate</artifactId>
+  <version>1.0-SNAPSHOT</version>
+  <packaging>jar</packaging>
+
+  <name>sqlTranslate</name>
+  <url>http://www.example.com</url>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-engine</artifactId>
+      <version>5.7.1</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-params</artifactId>
+      <version>5.7.1</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>3.0.0-M5</version>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/sqlTranslate/src/main/java/org/example/App.java b/sqlTranslate/src/main/java/org/example/App.java
new file mode 100644
index 00000000..e803e22b
--- /dev/null
+++ b/sqlTranslate/src/main/java/org/example/App.java
@@ -0,0 +1,7 @@
+package org.example;
+
+public class App {
+  public static void main(String[] args) {
+    System.out.println("Hello World!");
+  }
+}
diff --git a/sqlTranslate/src/test/java/org/example/AppTest.java b/sqlTranslate/src/test/java/org/example/AppTest.java
new file mode 100644
index 00000000..6fb6e67d
--- /dev/null
+++ b/sqlTranslate/src/test/java/org/example/AppTest.java
@@ -0,0 +1,13 @@
+package org.example;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+public class AppTest {
+    
+  @Test
+  public void shouldAnswerWithTrue() {
+    assertTrue(true);
+  }
+}
-- 
Gitee


From db166f7b5c14294c1628def851a7e0a48ba7ebf4 Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Fri, 16 Aug 2024 22:35:28 +0800
Subject: [PATCH 002/113] lexer

---
 sqlTranslate/.idea/compiler.xml               | 13 +++
 sqlTranslate/.idea/encodings.xml              |  7 ++
 sqlTranslate/.idea/jarRepositories.xml        | 20 +++++
 sqlTranslate/.idea/workspace.xml              | 78 +++++++++++++++++-
 .../src/main/java/Lexer/OracleLexer.java      | 79 +++++++++++++++++++
 sqlTranslate/src/main/java/Lexer/Token.java   | 31 ++++++++
 sqlTranslate/src/main/java/Main.java          | 16 ++++
 .../src/main/java/org/example/App.java        |  7 --
 .../src/test/java/org/example/AppTest.java    | 13 ---
 9 files changed, 240 insertions(+), 24 deletions(-)
 create mode 100644 sqlTranslate/.idea/compiler.xml
 create mode 100644 sqlTranslate/.idea/encodings.xml
 create mode 100644 sqlTranslate/.idea/jarRepositories.xml
 create mode 100644 sqlTranslate/src/main/java/Lexer/OracleLexer.java
 create mode 100644 sqlTranslate/src/main/java/Lexer/Token.java
 create mode 100644 sqlTranslate/src/main/java/Main.java
 delete mode 100644 sqlTranslate/src/main/java/org/example/App.java
 delete mode 100644 sqlTranslate/src/test/java/org/example/AppTest.java

diff --git a/sqlTranslate/.idea/compiler.xml b/sqlTranslate/.idea/compiler.xml
new file mode 100644
index 00000000..8e6776c3
--- /dev/null
+++ b/sqlTranslate/.idea/compiler.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <annotationProcessing>
+      <profile name="Maven default annotation processors profile" enabled="true">
+        <sourceOutputDir name="target/generated-sources/annotations" />
+        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
+        <outputRelativeToContentRoot value="true" />
+        <module name="sqlTranslate" />
+      </profile>
+    </annotationProcessing>
+  </component>
+</project>
\ No newline at end of file
diff --git a/sqlTranslate/.idea/encodings.xml b/sqlTranslate/.idea/encodings.xml
new file mode 100644
index 00000000..aa00ffab
--- /dev/null
+++ b/sqlTranslate/.idea/encodings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding">
+    <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/sqlTranslate/.idea/jarRepositories.xml b/sqlTranslate/.idea/jarRepositories.xml
new file mode 100644
index 00000000..712ab9d9
--- /dev/null
+++ b/sqlTranslate/.idea/jarRepositories.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Central Repository" />
+      <option name="url" value="https://repo.maven.apache.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jboss.community" />
+      <option name="name" value="JBoss Community repository" />
+      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+    </remote-repository>
+  </component>
+</project>
\ No newline at end of file
diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
index 8a06abb0..67d9ae73 100644
--- a/sqlTranslate/.idea/workspace.xml
+++ b/sqlTranslate/.idea/workspace.xml
@@ -4,14 +4,32 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="">
-      <change afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
+    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="init">
+      <change afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/encodings.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/jarRepositories.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/Lexer/OracleLexer.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/Lexer/Token.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/Main.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/org/example/App.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/test/java/org/example/AppTest.java" beforeDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
+  <component name="FileTemplateManagerImpl">
+    <option name="RECENT_TEMPLATES">
+      <list>
+        <option value="Class" />
+      </list>
+    </option>
+  </component>
+  <component name="MarkdownSettingsMigration">
+    <option name="stateVersion" value="1" />
+  </component>
   <component name="MavenImportPreferences">
     <option name="importingSettings">
       <MavenImportingSettings>
@@ -20,6 +38,9 @@
     </option>
   </component>
   <component name="ProjectId" id="2kMwWhUohyqt8bZ1bSi1kwgGkSK" />
+  <component name="ProjectLevelVcsManager">
+    <ConfirmationsSetting value="2" id="Add" />
+  </component>
   <component name="ProjectViewState">
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
@@ -27,10 +48,11 @@
   <component name="PropertiesComponent"><![CDATA[{
   "keyToString": {
     "RunOnceActivity.OpenProjectViewOnStart": "true",
-    "RunOnceActivity.ShowReadmeOnStart": "true"
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "SHARE_PROJECT_CONFIGURATION_FILES": "true"
   }
 }]]></component>
-  <component name="RunManager">
+  <component name="RunManager" selected="应用程序.Main">
     <configuration name="App" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
       <option name="MAIN_CLASS_NAME" value="org.example.App" />
       <module name="sqlTranslate" />
@@ -44,9 +66,34 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
+    <configuration name="Main" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
+      <option name="MAIN_CLASS_NAME" value="Main" />
+      <module name="sqlTranslate" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
+    <configuration name="AppTest.shouldAnswerWithTrue" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+      <module name="sqlTranslate" />
+      <extension name="coverage">
+        <pattern>
+          <option name="PATTERN" value="org.example.*" />
+          <option name="ENABLED" value="true" />
+        </pattern>
+      </extension>
+      <option name="PACKAGE_NAME" value="org.example" />
+      <option name="MAIN_CLASS_NAME" value="org.example.AppTest" />
+      <option name="METHOD_NAME" value="shouldAnswerWithTrue" />
+      <option name="TEST_OBJECT" value="method" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
     <recent_temporary>
       <list>
+        <item itemvalue="应用程序.Main" />
         <item itemvalue="应用程序.App" />
+        <item itemvalue="JUnit.AppTest.shouldAnswerWithTrue" />
       </list>
     </recent_temporary>
   </component>
@@ -59,6 +106,29 @@
       <option name="presentableId" value="Default" />
       <updated>1723106789329</updated>
     </task>
+    <task id="LOCAL-00001" summary="init">
+      <created>1723106890550</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1723106890550</updated>
+    </task>
+    <option name="localTasksCounter" value="2" />
     <servers />
   </component>
+  <component name="Vcs.Log.Tabs.Properties">
+    <option name="TAB_STATES">
+      <map>
+        <entry key="MAIN">
+          <value>
+            <State />
+          </value>
+        </entry>
+      </map>
+    </option>
+  </component>
+  <component name="VcsManagerConfiguration">
+    <MESSAGE value="init" />
+    <option name="LAST_COMMIT_MESSAGE" value="init" />
+  </component>
 </project>
\ No newline at end of file
diff --git a/sqlTranslate/src/main/java/Lexer/OracleLexer.java b/sqlTranslate/src/main/java/Lexer/OracleLexer.java
new file mode 100644
index 00000000..005e683b
--- /dev/null
+++ b/sqlTranslate/src/main/java/Lexer/OracleLexer.java
@@ -0,0 +1,79 @@
+package Lexer;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+
+public class OracleLexer {
+    public static final String[] keywords = {"SELECT", "FROM", "WHERE", "AND", "OR", "INSERT", "UPDATE", "DELETE", "now()"};
+    private static final Pattern TOKEN_PATTERN = Pattern.compile(
+            "(now\\(\\))|" +                    // now() function
+            "(\\b[A-Za-z_][A-Za-z0-9_]*\\b)|" + // Keywords and identifiers
+                    "(\\d+\\.?\\d*)|" +                 // Numbers (integer or decimal)
+                    "(\"[^\"]*\")|" +                   // Double-quoted strings
+                    "('([^']|\\\\')*)'|" +              // Single-quoted strings
+                    "([;,()])|" +                     // Symbols: ;, (, ), ,
+                    "([=<>+\\-*/<<>>])|" +              // Operators, including shift operators
+                    "(\\s+)"                            // Whitespace
+    );
+
+    private final List<Token> tokens = new ArrayList<>();
+    private final String input;
+    private int position = 0;
+
+    public OracleLexer(String input) {
+        this.input = input;
+    }
+
+    public List<Token> tokenize() {
+        Matcher matcher = TOKEN_PATTERN.matcher(input);
+        while (matcher.find()) {
+            String tokenValue = matcher.group();
+            Token token = createToken(tokenValue);
+            if (token != null) { // Skip whitespace
+                tokens.add(token);
+                // Update position based on the length of the matched group
+                position += tokenValue.length();
+            } else {
+                // If the token is null, we skip it (whitespace)
+                position += tokenValue.length();
+            }
+        }
+        tokens.add(new Token(Token.TokenType.EOF, ""));
+        return tokens;
+    }
+
+    private Token createToken(String tokenValue) {
+        if (tokenValue.matches("\\d+(\\.\\d+)?")) {
+            return new Token(Token.TokenType.NUMBER, tokenValue);
+        } else if (tokenValue.matches("\"[^\"]*\"")) {
+            return new Token(Token.TokenType.STRING, tokenValue);
+        } else if (tokenValue.matches("'([^']|\\\\')*'")) {
+            return new Token(Token.TokenType.STRING, tokenValue);
+        } else if (tokenValue.matches("([;(),])")) {
+            return new Token(Token.TokenType.SYMBOL, tokenValue);
+        } else if (tokenValue.matches("[=<>+\\-*/<<>>]")) {
+            return new Token(Token.TokenType.OPERATOR, tokenValue);
+        } else if (tokenValue.matches("now\\(\\)")) {
+            // Handle the now() function as a single token
+            return new Token(Token.TokenType.KEYWORD, tokenValue);
+        } else if (isKeyword(tokenValue)) {
+            return new Token(Token.TokenType.KEYWORD, tokenValue);
+        } else if (tokenValue.matches("[a-zA-Z_][a-zA-Z0-9_]*")) {
+            return new Token(Token.TokenType.IDENTIFIER, tokenValue);
+        }
+        return null;
+    }
+
+    private boolean isKeyword(String tokenValue) {
+        for (String keyword : keywords) {
+            if (keyword.equalsIgnoreCase(tokenValue)) {
+                return true;
+            }
+        }
+        return false;
+    }
+}
diff --git a/sqlTranslate/src/main/java/Lexer/Token.java b/sqlTranslate/src/main/java/Lexer/Token.java
new file mode 100644
index 00000000..b8319f0d
--- /dev/null
+++ b/sqlTranslate/src/main/java/Lexer/Token.java
@@ -0,0 +1,31 @@
+package Lexer;
+
+public class Token {
+    public enum TokenType {
+        KEYWORD, IDENTIFIER, NUMBER, OPERATOR, STRING, SYMBOL, EOF
+    }
+
+    private final TokenType type;
+    private final String value;
+
+    public Token(TokenType type, String value) {
+        this.type = type;
+        this.value = value;
+    }
+
+    public TokenType getType() {
+        return type;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    @Override
+    public String toString() {
+        return "Token{" +
+                "type=" + type +
+                ", value='" + value + '\'' +
+                '}';
+    }
+}
diff --git a/sqlTranslate/src/main/java/Main.java b/sqlTranslate/src/main/java/Main.java
new file mode 100644
index 00000000..b68a4f3d
--- /dev/null
+++ b/sqlTranslate/src/main/java/Main.java
@@ -0,0 +1,16 @@
+import Lexer.OracleLexer;
+import Lexer.Token;
+
+import java.util.List;
+
+public class Main {
+    public static void main(String[] args) {
+        String sql = "SELECT now() FROM table WHERE name = 'John Doe';";
+        OracleLexer lexer = new OracleLexer(sql);
+        List<Token> tokens = lexer.tokenize();
+
+        for (Token token : tokens) {
+            System.out.println(token);
+        }
+    }
+}
diff --git a/sqlTranslate/src/main/java/org/example/App.java b/sqlTranslate/src/main/java/org/example/App.java
deleted file mode 100644
index e803e22b..00000000
--- a/sqlTranslate/src/main/java/org/example/App.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.example;
-
-public class App {
-  public static void main(String[] args) {
-    System.out.println("Hello World!");
-  }
-}
diff --git a/sqlTranslate/src/test/java/org/example/AppTest.java b/sqlTranslate/src/test/java/org/example/AppTest.java
deleted file mode 100644
index 6fb6e67d..00000000
--- a/sqlTranslate/src/test/java/org/example/AppTest.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.example;
-
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-public class AppTest {
-    
-  @Test
-  public void shouldAnswerWithTrue() {
-    assertTrue(true);
-  }
-}
-- 
Gitee


From d4aa1c1ffdd149f8b0002b20f9ac4727b617fddb Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Sat, 17 Aug 2024 13:15:41 +0800
Subject: [PATCH 003/113] AST node

---
 sqlTranslate/.idea/workspace.xml              |  38 +++--
 .../src/main/java/Lexer/OracleLexer.java      |   3 +-
 sqlTranslate/src/main/java/Lexer/Token.java   |   6 +-
 sqlTranslate/src/main/java/Main.java          |   2 +-
 .../src/main/java/Parser/ASTNode.java         | 145 ++++++++++++++++++
 5 files changed, 174 insertions(+), 20 deletions(-)
 create mode 100644 sqlTranslate/src/main/java/Parser/ASTNode.java

diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
index 67d9ae73..00b09c29 100644
--- a/sqlTranslate/.idea/workspace.xml
+++ b/sqlTranslate/.idea/workspace.xml
@@ -4,16 +4,12 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="init">
-      <change afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/encodings.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/.idea/jarRepositories.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/Lexer/OracleLexer.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/Lexer/Token.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/Main.java" afterDir="false" />
+    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="lexer">
+      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/ASTNode.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/org/example/App.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/test/java/org/example/AppTest.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Lexer/OracleLexer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Lexer/OracleLexer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Lexer/Token.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Lexer/Token.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Main.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -45,13 +41,13 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "RunOnceActivity.OpenProjectViewOnStart": "true",
-    "RunOnceActivity.ShowReadmeOnStart": "true",
-    "SHARE_PROJECT_CONFIGURATION_FILES": "true"
+  <component name="PropertiesComponent">{
+  &quot;keyToString&quot;: {
+    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    &quot;SHARE_PROJECT_CONFIGURATION_FILES&quot;: &quot;true&quot;
   }
-}]]></component>
+}</component>
   <component name="RunManager" selected="应用程序.Main">
     <configuration name="App" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
       <option name="MAIN_CLASS_NAME" value="org.example.App" />
@@ -113,7 +109,14 @@
       <option name="project" value="LOCAL" />
       <updated>1723106890550</updated>
     </task>
-    <option name="localTasksCounter" value="2" />
+    <task id="LOCAL-00002" summary="lexer">
+      <created>1723818930161</created>
+      <option name="number" value="00002" />
+      <option name="presentableId" value="LOCAL-00002" />
+      <option name="project" value="LOCAL" />
+      <updated>1723818930161</updated>
+    </task>
+    <option name="localTasksCounter" value="3" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
@@ -129,6 +132,7 @@
   </component>
   <component name="VcsManagerConfiguration">
     <MESSAGE value="init" />
-    <option name="LAST_COMMIT_MESSAGE" value="init" />
+    <MESSAGE value="lexer" />
+    <option name="LAST_COMMIT_MESSAGE" value="lexer" />
   </component>
 </project>
\ No newline at end of file
diff --git a/sqlTranslate/src/main/java/Lexer/OracleLexer.java b/sqlTranslate/src/main/java/Lexer/OracleLexer.java
index 005e683b..2f441600 100644
--- a/sqlTranslate/src/main/java/Lexer/OracleLexer.java
+++ b/sqlTranslate/src/main/java/Lexer/OracleLexer.java
@@ -8,7 +8,8 @@ import java.util.regex.Pattern;
 
 
 public class OracleLexer {
-    public static final String[] keywords = {"SELECT", "FROM", "WHERE", "AND", "OR", "INSERT", "UPDATE", "DELETE", "now()"};
+    public static final String[] keywords = {"SELECT", "FROM", "WHERE", "AND", "OR", "INSERT", "UPDATE", "DELETE",
+            "now()"};
     private static final Pattern TOKEN_PATTERN = Pattern.compile(
             "(now\\(\\))|" +                    // now() function
             "(\\b[A-Za-z_][A-Za-z0-9_]*\\b)|" + // Keywords and identifiers
diff --git a/sqlTranslate/src/main/java/Lexer/Token.java b/sqlTranslate/src/main/java/Lexer/Token.java
index b8319f0d..e4574aa3 100644
--- a/sqlTranslate/src/main/java/Lexer/Token.java
+++ b/sqlTranslate/src/main/java/Lexer/Token.java
@@ -5,7 +5,7 @@ public class Token {
         KEYWORD, IDENTIFIER, NUMBER, OPERATOR, STRING, SYMBOL, EOF
     }
 
-    private final TokenType type;
+    private TokenType type;
     private final String value;
 
     public Token(TokenType type, String value) {
@@ -21,6 +21,10 @@ public class Token {
         return value;
     }
 
+    public boolean hasType(TokenType type) {
+        return this.type == type;
+    }
+
     @Override
     public String toString() {
         return "Token{" +
diff --git a/sqlTranslate/src/main/java/Main.java b/sqlTranslate/src/main/java/Main.java
index b68a4f3d..b17fc7ce 100644
--- a/sqlTranslate/src/main/java/Main.java
+++ b/sqlTranslate/src/main/java/Main.java
@@ -5,7 +5,7 @@ import java.util.List;
 
 public class Main {
     public static void main(String[] args) {
-        String sql = "SELECT now() FROM table WHERE name = 'John Doe';";
+        String sql = "SELECT adef FROM table WHERE name = 'John Doe';";
         OracleLexer lexer = new OracleLexer(sql);
         List<Token> tokens = lexer.tokenize();
 
diff --git a/sqlTranslate/src/main/java/Parser/ASTNode.java b/sqlTranslate/src/main/java/Parser/ASTNode.java
new file mode 100644
index 00000000..3df84539
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/ASTNode.java
@@ -0,0 +1,145 @@
+package Parser;
+
+import Lexer.Token;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+public class ASTNode {
+    private Token token;
+    private ASTNode parent;
+    private List<ASTNode> children = new ArrayList<>();
+
+    public ASTNode(Token token) {
+        this.token = token;
+    }
+
+    public ASTNode(ASTNode node) {
+        this.token = node.token;
+        this.parent = node.parent;
+        this.children = new ArrayList<>(node.children);
+    }
+
+    public Token getToken() {
+        return token;
+    }
+
+    public void setToken(Token token) {
+        this.token = token;
+    }
+
+    public ASTNode getParent() {
+        return parent;
+    }
+
+    public void setParent(ASTNode parent) {
+        this.parent = parent;
+    }
+
+    public List<ASTNode> getChildren() {
+        return children;
+    }
+
+    public ASTNode getChildByName(String childName) {
+        for (ASTNode child : children) {
+            if (child.toString().equals(childName)) {
+                return child;
+            }
+        }
+
+        return null;
+    }
+
+    public List<ASTNode> getChildrenByName(String childName) {
+        List<ASTNode> nodes = new ArrayList<>();
+        for (ASTNode child : children) {
+            if (child.toString().equals(childName)) {
+                nodes.add(child);
+            }
+        }
+
+        return nodes;
+    }
+
+    /**
+     * 将对应名称的node更新为新的child
+     */
+    public void setChildrenByName(String childName, ASTNode child) {
+        for (int i = 0; i < this.children.size(); i++) {
+            if (this.children.get(i).getToken().getValue().contains(childName)) {
+                this.children.set(i, child);
+                break;
+            }
+        }
+    }
+
+    public void addChild(ASTNode childNode) {
+        childNode.setParent(this);
+        children.add(childNode);
+    }
+
+    public void replaceChild(ASTNode oldChild, ASTNode newChild) {
+        newChild.setParent(this);
+        children.set(children.indexOf(oldChild), newChild);
+    }
+
+    // add a child node at position index of children
+    public void addChild(int index, ASTNode childNode) {
+        childNode.setParent(this);
+        children.add(index, childNode);
+    }
+
+    public void removeChild(ASTNode childNode) {
+        children.remove(childNode);
+    }
+
+    public String toQueryString() {
+        StringBuilder queryString = new StringBuilder();
+        visit(this, queryString, false);
+        return queryString.toString();
+    }
+
+    private void visit(ASTNode node, StringBuilder queryString, boolean hasPrespace) {
+        if (node == null) {
+            return;
+        }
+        if (node.getToken().hasType(Token.TokenType.KEYWORD)) {
+            String value = node.getToken().getValue();
+            if (value == null || value.trim().isEmpty()) {
+                return;
+            }
+            boolean preSpace = true;
+            if (queryString.length() == 0) {
+                preSpace = false;
+            } else if (queryString.charAt(queryString.length() - 1) == '(') {
+                preSpace = false;
+            } else if (Arrays.asList(",", ";", ")").contains(value)) {
+                preSpace = false;
+            } else if (!hasPrespace) {
+                // If the token does not have pre space, we should not add, either.
+                preSpace = false;
+            }
+            if (preSpace) {
+                queryString.append(" ");
+            }
+            queryString.append(value);
+        } else {
+            for (int i = 0; i < node.getChildren().size(); i++) {
+                ASTNode childNode = node.getChildren().get(i);
+                if (i == 0) {
+                    visit(childNode, queryString, hasPrespace || childNode.getToken().hasPreSpace());
+                } else {
+                    visit(childNode, queryString, childNode.getToken().hasPreSpace());
+                }
+            }
+        }
+    }
+
+    @Override
+    public String toString() {
+        return token.getValue();
+    }
+
+
+}
-- 
Gitee


From 7beef2b80fb025de6d79e074f4cdae8bc18e61be Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Sun, 18 Aug 2024 22:42:41 +0800
Subject: [PATCH 004/113] add AST node

---
 sqlTranslate/.idea/uiDesigner.xml             | 124 ++++++++++++++++++
 sqlTranslate/.idea/workspace.xml              |  37 ++++--
 .../java/Generator/OpenGaussGenerator.java    |   4 +
 .../src/main/java/Lexer/OracleLexer.java      |   3 +
 .../main/java/Parser/{ => AST}/ASTNode.java   |  45 +------
 .../main/java/Parser/AST/CreateTabNode.java   |  28 ++++
 .../java/Parser/AST/SelectStatementNode.java  |  25 ++++
 .../main/java/Parser/AST/TableTypeNode.java   |  24 ++++
 .../src/main/java/Parser/OracleParser.java    |   4 +
 9 files changed, 241 insertions(+), 53 deletions(-)
 create mode 100644 sqlTranslate/.idea/uiDesigner.xml
 create mode 100644 sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java
 rename sqlTranslate/src/main/java/Parser/{ => AST}/ASTNode.java (61%)
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/CreateTabNode.java
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/SelectStatementNode.java
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/TableTypeNode.java
 create mode 100644 sqlTranslate/src/main/java/Parser/OracleParser.java

diff --git a/sqlTranslate/.idea/uiDesigner.xml b/sqlTranslate/.idea/uiDesigner.xml
new file mode 100644
index 00000000..2b63946d
--- /dev/null
+++ b/sqlTranslate/.idea/uiDesigner.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Palette2">
+    <group name="Swing">
+      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
+      </item>
+      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.svg" removable="false" auto-create-binding="false" can-attach-label="true">
+        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
+        <initial-values>
+          <property name="text" value="Button" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="RadioButton" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="CheckBox" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="Label" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+          <preferred-size width="200" height="200" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+          <preferred-size width="200" height="200" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
+          <preferred-size width="-1" height="20" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
+      </item>
+    </group>
+  </component>
+</project>
\ No newline at end of file
diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
index 00b09c29..88b31e62 100644
--- a/sqlTranslate/.idea/workspace.xml
+++ b/sqlTranslate/.idea/workspace.xml
@@ -4,12 +4,16 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="lexer">
-      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/ASTNode.java" afterDir="false" />
+    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="AST node">
+      <change afterPath="$PROJECT_DIR$/.idea/uiDesigner.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/Generator/OpenGaussGenerator.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/CreateTabNode.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/SelectStatementNode.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/TableTypeNode.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/Lexer/OracleLexer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Lexer/OracleLexer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Lexer/Token.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Lexer/Token.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Main.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/ASTNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/ASTNode.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -41,13 +45,14 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent">{
-  &quot;keyToString&quot;: {
-    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
-    &quot;SHARE_PROJECT_CONFIGURATION_FILES&quot;: &quot;true&quot;
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "RunOnceActivity.OpenProjectViewOnStart": "true",
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "SHARE_PROJECT_CONFIGURATION_FILES": "true",
+    "last_opened_file_path": "F:/oracle2opengauss/examples/sqlTranslate"
   }
-}</component>
+}]]></component>
   <component name="RunManager" selected="应用程序.Main">
     <configuration name="App" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
       <option name="MAIN_CLASS_NAME" value="org.example.App" />
@@ -116,7 +121,14 @@
       <option name="project" value="LOCAL" />
       <updated>1723818930161</updated>
     </task>
-    <option name="localTasksCounter" value="3" />
+    <task id="LOCAL-00003" summary="AST node">
+      <created>1723871742424</created>
+      <option name="number" value="00003" />
+      <option name="presentableId" value="LOCAL-00003" />
+      <option name="project" value="LOCAL" />
+      <updated>1723871742424</updated>
+    </task>
+    <option name="localTasksCounter" value="4" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
@@ -133,6 +145,7 @@
   <component name="VcsManagerConfiguration">
     <MESSAGE value="init" />
     <MESSAGE value="lexer" />
-    <option name="LAST_COMMIT_MESSAGE" value="lexer" />
+    <MESSAGE value="AST node" />
+    <option name="LAST_COMMIT_MESSAGE" value="AST node" />
   </component>
 </project>
\ No newline at end of file
diff --git a/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java b/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java
new file mode 100644
index 00000000..6e4a894f
--- /dev/null
+++ b/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java
@@ -0,0 +1,4 @@
+package Generator;
+
+public class OpenGaussGenerator {
+}
diff --git a/sqlTranslate/src/main/java/Lexer/OracleLexer.java b/sqlTranslate/src/main/java/Lexer/OracleLexer.java
index 2f441600..affc0b64 100644
--- a/sqlTranslate/src/main/java/Lexer/OracleLexer.java
+++ b/sqlTranslate/src/main/java/Lexer/OracleLexer.java
@@ -9,6 +9,9 @@ import java.util.regex.Pattern;
 
 public class OracleLexer {
     public static final String[] keywords = {"SELECT", "FROM", "WHERE", "AND", "OR", "INSERT", "UPDATE", "DELETE",
+            // keywords of creating table
+            "CREATE", "TABLE", "TEMPORARY", "",
+
             "now()"};
     private static final Pattern TOKEN_PATTERN = Pattern.compile(
             "(now\\(\\))|" +                    // now() function
diff --git a/sqlTranslate/src/main/java/Parser/ASTNode.java b/sqlTranslate/src/main/java/Parser/AST/ASTNode.java
similarity index 61%
rename from sqlTranslate/src/main/java/Parser/ASTNode.java
rename to sqlTranslate/src/main/java/Parser/AST/ASTNode.java
index 3df84539..de092614 100644
--- a/sqlTranslate/src/main/java/Parser/ASTNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/ASTNode.java
@@ -1,12 +1,11 @@
-package Parser;
+package Parser.AST;
 
 import Lexer.Token;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
-public class ASTNode {
+public abstract class ASTNode {
     private Token token;
     private ASTNode parent;
     private List<ASTNode> children = new ArrayList<>();
@@ -96,50 +95,14 @@ public class ASTNode {
 
     public String toQueryString() {
         StringBuilder queryString = new StringBuilder();
-        visit(this, queryString, false);
+        visit(this, queryString);
         return queryString.toString();
     }
 
-    private void visit(ASTNode node, StringBuilder queryString, boolean hasPrespace) {
-        if (node == null) {
-            return;
-        }
-        if (node.getToken().hasType(Token.TokenType.KEYWORD)) {
-            String value = node.getToken().getValue();
-            if (value == null || value.trim().isEmpty()) {
-                return;
-            }
-            boolean preSpace = true;
-            if (queryString.length() == 0) {
-                preSpace = false;
-            } else if (queryString.charAt(queryString.length() - 1) == '(') {
-                preSpace = false;
-            } else if (Arrays.asList(",", ";", ")").contains(value)) {
-                preSpace = false;
-            } else if (!hasPrespace) {
-                // If the token does not have pre space, we should not add, either.
-                preSpace = false;
-            }
-            if (preSpace) {
-                queryString.append(" ");
-            }
-            queryString.append(value);
-        } else {
-            for (int i = 0; i < node.getChildren().size(); i++) {
-                ASTNode childNode = node.getChildren().get(i);
-                if (i == 0) {
-                    visit(childNode, queryString, hasPrespace || childNode.getToken().hasPreSpace());
-                } else {
-                    visit(childNode, queryString, childNode.getToken().hasPreSpace());
-                }
-            }
-        }
-    }
+    public abstract void visit(ASTNode node, StringBuilder queryString);
 
     @Override
     public String toString() {
         return token.getValue();
     }
-
-
 }
diff --git a/sqlTranslate/src/main/java/Parser/AST/CreateTabNode.java b/sqlTranslate/src/main/java/Parser/AST/CreateTabNode.java
new file mode 100644
index 00000000..9a63d5bc
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/CreateTabNode.java
@@ -0,0 +1,28 @@
+package Parser.AST;
+
+import Lexer.Token;
+
+public class CreateTabNode extends ASTNode{
+    public CreateTabNode(ASTNode node) {
+        super(node);
+    }
+
+    public CreateTabNode(Token token) {
+        super(token);
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString) {
+        // judge the type of the table
+        if (getChildren().get(0) instanceof TableTypeNode) {
+            queryString.append("CREATE ");
+        }
+        else {
+            queryString.append("CREATE TABLE ");
+        }
+        for (ASTNode child : getChildren())
+        {
+            child.visit(child, queryString);
+        }
+    }
+}
diff --git a/sqlTranslate/src/main/java/Parser/AST/SelectStatementNode.java b/sqlTranslate/src/main/java/Parser/AST/SelectStatementNode.java
new file mode 100644
index 00000000..d7ac736b
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/SelectStatementNode.java
@@ -0,0 +1,25 @@
+package Parser.AST;
+
+import Lexer.Token;
+
+public class SelectStatementNode extends ASTNode{
+    public SelectStatementNode(ASTNode node)
+    {
+        super(node);
+    }
+
+    public SelectStatementNode(Token token)
+    {
+        super(token);
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString)
+    {
+        queryString.append("SELECT ");
+        for (ASTNode child : getChildren())
+        {
+            child.visit(child, queryString);
+        }
+    }
+}
diff --git a/sqlTranslate/src/main/java/Parser/AST/TableTypeNode.java b/sqlTranslate/src/main/java/Parser/AST/TableTypeNode.java
new file mode 100644
index 00000000..7bac1028
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/TableTypeNode.java
@@ -0,0 +1,24 @@
+package Parser.AST;
+
+import Lexer.Token;
+
+public class TableTypeNode extends ASTNode{
+    public TableTypeNode(ASTNode node)
+    {
+        super(node);
+    }
+    public TableTypeNode(Token token)
+    {
+        super(token);
+    }
+
+    public void visit(ASTNode node, StringBuilder queryString)
+    {
+        queryString.append(getToken() + " ");
+        for (ASTNode child : getChildren())
+        {
+            child.visit(child, queryString);
+        }
+    }
+
+}
diff --git a/sqlTranslate/src/main/java/Parser/OracleParser.java b/sqlTranslate/src/main/java/Parser/OracleParser.java
new file mode 100644
index 00000000..6d013339
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/OracleParser.java
@@ -0,0 +1,4 @@
+package Parser;
+
+public class OracleParser {
+}
-- 
Gitee


From 33978043c6aa3fc010d9368c6756694eba5f9a78 Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Tue, 20 Aug 2024 17:12:04 +0800
Subject: [PATCH 005/113] add functions

---
 sqlTranslate/.idea/workspace.xml              | 43 ++++++-----
 .../src/main/java/Lexer/OracleLexer.java      | 76 ++++++++++++++++---
 sqlTranslate/src/main/java/Main.java          | 20 +++--
 .../Parser/AST/CreateTable/ColumnNode.java    | 25 ++++++
 .../AST/{ => CreateTable}/CreateTabNode.java  |  5 +-
 .../AST/CreateTable/TableConstraintNode.java  | 24 ++++++
 .../Parser/AST/CreateTable/TableNode.java     | 25 ++++++
 .../AST/{ => CreateTable}/TableTypeNode.java  |  5 +-
 .../src/main/java/Parser/AST/EndNode.java     | 21 +++++
 .../src/main/java/Parser/OracleParser.java    | 14 ++++
 10 files changed, 222 insertions(+), 36 deletions(-)
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/CreateTable/ColumnNode.java
 rename sqlTranslate/src/main/java/Parser/AST/{ => CreateTable}/CreateTabNode.java (84%)
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/CreateTable/TableConstraintNode.java
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/CreateTable/TableNode.java
 rename sqlTranslate/src/main/java/Parser/AST/{ => CreateTable}/TableTypeNode.java (79%)
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/EndNode.java

diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
index 88b31e62..eb513254 100644
--- a/sqlTranslate/.idea/workspace.xml
+++ b/sqlTranslate/.idea/workspace.xml
@@ -4,16 +4,17 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="AST node">
-      <change afterPath="$PROJECT_DIR$/.idea/uiDesigner.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/Generator/OpenGaussGenerator.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/CreateTabNode.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/SelectStatementNode.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/TableTypeNode.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" afterDir="false" />
+    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add AST node">
+      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/CreateTable/ColumnNode.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/CreateTable/TableConstraintNode.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/CreateTable/TableNode.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/EndNode.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/Lexer/OracleLexer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Lexer/OracleLexer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/ASTNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/ASTNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Main.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/CreateTabNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/CreateTable/CreateTabNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/TableTypeNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/CreateTable/TableTypeNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -45,14 +46,14 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "RunOnceActivity.OpenProjectViewOnStart": "true",
-    "RunOnceActivity.ShowReadmeOnStart": "true",
-    "SHARE_PROJECT_CONFIGURATION_FILES": "true",
-    "last_opened_file_path": "F:/oracle2opengauss/examples/sqlTranslate"
+  <component name="PropertiesComponent">{
+  &quot;keyToString&quot;: {
+    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    &quot;SHARE_PROJECT_CONFIGURATION_FILES&quot;: &quot;true&quot;,
+    &quot;last_opened_file_path&quot;: &quot;F:/oracle2opengauss/examples/sqlTranslate&quot;
   }
-}]]></component>
+}</component>
   <component name="RunManager" selected="应用程序.Main">
     <configuration name="App" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
       <option name="MAIN_CLASS_NAME" value="org.example.App" />
@@ -128,7 +129,14 @@
       <option name="project" value="LOCAL" />
       <updated>1723871742424</updated>
     </task>
-    <option name="localTasksCounter" value="4" />
+    <task id="LOCAL-00004" summary="add AST node">
+      <created>1723992163694</created>
+      <option name="number" value="00004" />
+      <option name="presentableId" value="LOCAL-00004" />
+      <option name="project" value="LOCAL" />
+      <updated>1723992163694</updated>
+    </task>
+    <option name="localTasksCounter" value="5" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
@@ -146,6 +154,7 @@
     <MESSAGE value="init" />
     <MESSAGE value="lexer" />
     <MESSAGE value="AST node" />
-    <option name="LAST_COMMIT_MESSAGE" value="AST node" />
+    <MESSAGE value="add AST node" />
+    <option name="LAST_COMMIT_MESSAGE" value="add AST node" />
   </component>
 </project>
\ No newline at end of file
diff --git a/sqlTranslate/src/main/java/Lexer/OracleLexer.java b/sqlTranslate/src/main/java/Lexer/OracleLexer.java
index affc0b64..f9ee67a0 100644
--- a/sqlTranslate/src/main/java/Lexer/OracleLexer.java
+++ b/sqlTranslate/src/main/java/Lexer/OracleLexer.java
@@ -10,18 +10,35 @@ import java.util.regex.Pattern;
 public class OracleLexer {
     public static final String[] keywords = {"SELECT", "FROM", "WHERE", "AND", "OR", "INSERT", "UPDATE", "DELETE",
             // keywords of creating table
-            "CREATE", "TABLE", "TEMPORARY", "",
+            "CREATE", "TABLE", "TEMPORARY",
+            "NUMBER", "INTEGER", "SMALLIN", "BINARY_INTEGER", "DECIMAL", "REAL", "FLOAT", "DOUBLE PRECISION", "CHAR", "VARCHAR2",
+            "NCHAR", "NVARCHAR2", "CLOB", "NCLOB", "DATE", "TIMESTAMP", "TIMESTAMP WITH TIME ZONE", "TIMESTAMP WITH LOCAL TIME ZONE", "BLOB", "RAW",
+            "LONG RAW", "BOOLEAN", "INTERVAL YEAR TO MONTH", "INTERVAL DAY TO SECOND", "ROWID", "UROWID", "REF CURSOR",
+            "NOT NULL", "PRIMARY KEY", "UNIQUE", "CHECK", "REFERENCES", "DEFAULT",
+            "CONSTRAINT", "FOREIGN KEY"
 
-            "now()"};
+    };
     private static final Pattern TOKEN_PATTERN = Pattern.compile(
-            "(now\\(\\))|" +                    // now() function
-            "(\\b[A-Za-z_][A-Za-z0-9_]*\\b)|" + // Keywords and identifiers
+            "(NUMBER\\(.*?\\))|" +                     // NUMBER() function
+                    "(DECIMAL\\(.*?\\))|" +                   // DECIMAL() function
+                    "(FLOAT\\(.*?\\))|" +                    // FLOAT() function
+                    "(CHAR\\(.*?\\))|" +                     // CHAR() function
+                    "(VARCHAR2\\(.*?\\))|" +                     // VARCHAR2() function
+                    "(NCHAR\\(.*?\\))|" +                     // NCHAR() function
+                    "(NVARCHAR2\\(.*?\\))|" +                     // NVARCHAR2() function
+                    "(RAW\\(.*?\\))|" +                     // RAW() function
+                    "(NOT NULL)|" +
+                    "(PRIMARY KEY)|" +
+                    "(FOREIGN KEY)|" +
+
+                    "(\\b[A-Za-z_][A-Za-z0-9_]*\\b)|" + // Keywords and identifiers
                     "(\\d+\\.?\\d*)|" +                 // Numbers (integer or decimal)
                     "(\"[^\"]*\")|" +                   // Double-quoted strings
                     "('([^']|\\\\')*)'|" +              // Single-quoted strings
                     "([;,()])|" +                     // Symbols: ;, (, ), ,
                     "([=<>+\\-*/<<>>])|" +              // Operators, including shift operators
-                    "(\\s+)"                            // Whitespace
+                    "(\\s+)",                            // Whitespace
+            Pattern.CASE_INSENSITIVE
     );
 
     private final List<Token> tokens = new ArrayList<>();
@@ -29,7 +46,8 @@ public class OracleLexer {
     private int position = 0;
 
     public OracleLexer(String input) {
-        this.input = input;
+        this.input = dataProcess(input);
+        tokenize();
     }
 
     public List<Token> tokenize() {
@@ -61,10 +79,36 @@ public class OracleLexer {
             return new Token(Token.TokenType.SYMBOL, tokenValue);
         } else if (tokenValue.matches("[=<>+\\-*/<<>>]")) {
             return new Token(Token.TokenType.OPERATOR, tokenValue);
-        } else if (tokenValue.matches("now\\(\\)")) {
-            // Handle the now() function as a single token
+        }
+
+        else if (tokenValue.matches("(?i)NUMBER\\(.*?\\)")) {
+            // NUMBER() function, CASE_INSENSITIVE
+            return new Token(Token.TokenType.KEYWORD, tokenValue);
+        }else if (tokenValue.matches("(?i)DECIMAL\\(.*?\\)")) {
+            // DECIMAL() function, CASE_INSENSITIVE
+            return new Token(Token.TokenType.KEYWORD, tokenValue);
+        }else if (tokenValue.matches("(?i)FLOAT\\(.*?\\)")) {
+            // FLOAT() function, CASE_INSENSITIVE
             return new Token(Token.TokenType.KEYWORD, tokenValue);
-        } else if (isKeyword(tokenValue)) {
+        }else if (tokenValue.matches("(?i)CHAR\\(.*?\\)")) {
+            // CHAR() function, CASE_INSENSITIVE
+            return new Token(Token.TokenType.KEYWORD, tokenValue);
+        }else if (tokenValue.matches("(?i)VARCHAR2\\(.*?\\)")) {
+            // VARCHAR2() function, CASE_INSENSITIVE
+            return new Token(Token.TokenType.KEYWORD, tokenValue);
+        }else if (tokenValue.matches("(?i)NCHAR\\(.*?\\)")) {
+            // NCHAR() function, CASE_INSENSITIVE
+            return new Token(Token.TokenType.KEYWORD, tokenValue);
+        }else if (tokenValue.matches("(?i)NVARCHAR2\\(.*?\\)")) {
+            // NVARCHAR2() function, CASE_INSENSITIVE
+            return new Token(Token.TokenType.KEYWORD, tokenValue);
+        }else if (tokenValue.matches("(?i)RAW\\(.*?\\)")) {
+            // RAW() function, CASE_INSENSITIVE
+            return new Token(Token.TokenType.KEYWORD, tokenValue);
+        }
+
+
+        else if (isKeyword(tokenValue)) {
             return new Token(Token.TokenType.KEYWORD, tokenValue);
         } else if (tokenValue.matches("[a-zA-Z_][a-zA-Z0-9_]*")) {
             return new Token(Token.TokenType.IDENTIFIER, tokenValue);
@@ -80,4 +124,18 @@ public class OracleLexer {
         }
         return false;
     }
+
+    private static String dataProcess(String input){
+        while (input.contains("  ")) {
+            input = input.replace("  ", " ");
+        }
+        input = input.replace(" (", "(");
+        return input;
+    }
+
+    public void printTokens() {
+        for (Token token : tokens) {
+            System.out.println(token);
+        }
+    }
 }
diff --git a/sqlTranslate/src/main/java/Main.java b/sqlTranslate/src/main/java/Main.java
index b17fc7ce..ff19ccf5 100644
--- a/sqlTranslate/src/main/java/Main.java
+++ b/sqlTranslate/src/main/java/Main.java
@@ -5,12 +5,20 @@ import java.util.List;
 
 public class Main {
     public static void main(String[] args) {
-        String sql = "SELECT adef FROM table WHERE name = 'John Doe';";
+//        String sql = "SELECT NuMBER(1,3) Not NULL FROM table WHERE name = 'John Doe';";
+        String sql = "CREATE TABLE employees (\n" +
+                "    employee_id NUMBER(6) PRIMARY KEY,\n" +
+                "    first_name VARCHAR2(20),\n" +
+                "    last_name VARCHAR2(25),\n" +
+                "    email VARCHAR2(25),\n" +
+                "    hire_date DATE\n" +
+                ");";
         OracleLexer lexer = new OracleLexer(sql);
-        List<Token> tokens = lexer.tokenize();
-
-        for (Token token : tokens) {
-            System.out.println(token);
-        }
+        lexer.printTokens();
+//        List<Token> tokens = lexer.tokenize();
+//
+//        for (Token token : tokens) {
+//            System.out.println(token);
+//        }
     }
 }
diff --git a/sqlTranslate/src/main/java/Parser/AST/CreateTable/ColumnNode.java b/sqlTranslate/src/main/java/Parser/AST/CreateTable/ColumnNode.java
new file mode 100644
index 00000000..0b0c7bbd
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/CreateTable/ColumnNode.java
@@ -0,0 +1,25 @@
+package Parser.AST.CreateTable;
+
+import Lexer.Token;
+import Parser.AST.ASTNode;
+
+public class ColumnNode extends ASTNode {
+    public ColumnNode(ASTNode node)
+    {
+        super(node);
+    }
+    public ColumnNode(Token token)
+    {
+        super(token);
+    }
+
+    public void visit(ASTNode node, StringBuilder queryString)
+    {
+        queryString.append(getToken().getValue() + " ");
+        for (ASTNode child : getChildren())
+        {
+            child.visit(child, queryString);
+        }
+    }
+
+}
diff --git a/sqlTranslate/src/main/java/Parser/AST/CreateTabNode.java b/sqlTranslate/src/main/java/Parser/AST/CreateTable/CreateTabNode.java
similarity index 84%
rename from sqlTranslate/src/main/java/Parser/AST/CreateTabNode.java
rename to sqlTranslate/src/main/java/Parser/AST/CreateTable/CreateTabNode.java
index 9a63d5bc..3676552e 100644
--- a/sqlTranslate/src/main/java/Parser/AST/CreateTabNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/CreateTable/CreateTabNode.java
@@ -1,8 +1,9 @@
-package Parser.AST;
+package Parser.AST.CreateTable;
 
 import Lexer.Token;
+import Parser.AST.ASTNode;
 
-public class CreateTabNode extends ASTNode{
+public class CreateTabNode extends ASTNode {
     public CreateTabNode(ASTNode node) {
         super(node);
     }
diff --git a/sqlTranslate/src/main/java/Parser/AST/CreateTable/TableConstraintNode.java b/sqlTranslate/src/main/java/Parser/AST/CreateTable/TableConstraintNode.java
new file mode 100644
index 00000000..f64a8668
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/CreateTable/TableConstraintNode.java
@@ -0,0 +1,24 @@
+package Parser.AST.CreateTable;
+
+import Lexer.Token;
+import Parser.AST.ASTNode;
+
+public class TableConstraintNode extends ASTNode{
+    public TableConstraintNode(ASTNode node)
+    {
+        super(node);
+    }
+    public TableConstraintNode(Token token)
+    {
+        super(token);
+    }
+
+    public void visit(ASTNode node, StringBuilder queryString)
+    {
+        queryString.append(getToken().getValue() + " ");
+        for (ASTNode child : getChildren())
+        {
+            child.visit(child, queryString);
+        }
+    }
+}
diff --git a/sqlTranslate/src/main/java/Parser/AST/CreateTable/TableNode.java b/sqlTranslate/src/main/java/Parser/AST/CreateTable/TableNode.java
new file mode 100644
index 00000000..ce8ab1b4
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/CreateTable/TableNode.java
@@ -0,0 +1,25 @@
+package Parser.AST.CreateTable;
+
+import Lexer.Token;
+import Parser.AST.ASTNode;
+
+public class TableNode extends ASTNode{
+    public TableNode(ASTNode node)
+    {
+        super(node);
+    }
+    public TableNode(Token token)
+    {
+        super(token);
+    }
+
+    public void visit(ASTNode node, StringBuilder queryString)
+    {
+        queryString.append(getToken().getValue() + " ");
+        for (ASTNode child : getChildren())
+        {
+            child.visit(child, queryString);
+        }
+    }
+
+}
diff --git a/sqlTranslate/src/main/java/Parser/AST/TableTypeNode.java b/sqlTranslate/src/main/java/Parser/AST/CreateTable/TableTypeNode.java
similarity index 79%
rename from sqlTranslate/src/main/java/Parser/AST/TableTypeNode.java
rename to sqlTranslate/src/main/java/Parser/AST/CreateTable/TableTypeNode.java
index 7bac1028..b90157c8 100644
--- a/sqlTranslate/src/main/java/Parser/AST/TableTypeNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/CreateTable/TableTypeNode.java
@@ -1,8 +1,9 @@
-package Parser.AST;
+package Parser.AST.CreateTable;
 
 import Lexer.Token;
+import Parser.AST.ASTNode;
 
-public class TableTypeNode extends ASTNode{
+public class TableTypeNode extends ASTNode {
     public TableTypeNode(ASTNode node)
     {
         super(node);
diff --git a/sqlTranslate/src/main/java/Parser/AST/EndNode.java b/sqlTranslate/src/main/java/Parser/AST/EndNode.java
new file mode 100644
index 00000000..5aa6a95e
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/EndNode.java
@@ -0,0 +1,21 @@
+package Parser.AST;
+import Lexer.Token;
+import Parser.AST.ASTNode;
+public class EndNode extends ASTNode{
+    public EndNode(ASTNode node)
+    {
+        super(node);
+    }
+    public EndNode(Token token)
+    {
+        super(token);
+    }
+    public void visit(ASTNode node, StringBuilder queryString)
+    {
+        queryString.append(")" + getToken().getValue());
+        for (ASTNode child : getChildren())
+        {
+            child.visit(child, queryString);
+        }
+    }
+}
diff --git a/sqlTranslate/src/main/java/Parser/OracleParser.java b/sqlTranslate/src/main/java/Parser/OracleParser.java
index 6d013339..bd0f93ca 100644
--- a/sqlTranslate/src/main/java/Parser/OracleParser.java
+++ b/sqlTranslate/src/main/java/Parser/OracleParser.java
@@ -1,4 +1,18 @@
 package Parser;
 
+import Lexer.OracleLexer;
+import Parser.AST.ASTNode;
+
 public class OracleParser {
+    private OracleLexer lexer;
+    public OracleParser(OracleLexer lexer) {
+        this.lexer = lexer;
+    }
+    public ASTNode parse(String input)
+    {
+
+        return null;
+    }
+
+
 }
-- 
Gitee


From 18ded7e870dde5fa4de42ae705d03c6da7a0f16a Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Tue, 20 Aug 2024 22:38:16 +0800
Subject: [PATCH 006/113] revise

---
 sqlTranslate/.idea/workspace.xml              | 32 ++++++---
 sqlTranslate/pom.xml                          |  8 +++
 .../java/Exception/ParseFailedException.java  |  8 +++
 .../java/Generator/OpenGaussGenerator.java    |  9 +++
 .../src/main/java/Lexer/OracleLexer.java      |  6 +-
 .../src/main/java/Parser/AST/ASTNode.java     | 27 ++++---
 .../CRTEndNode.java}                          | 15 ++--
 .../Parser/AST/CreateTable/ColumnNode.java    |  8 ++-
 .../Parser/AST/CreateTable/CreateTabNode.java | 12 ++--
 .../AST/CreateTable/TableConstraintNode.java  |  8 ++-
 .../Parser/AST/CreateTable/TableNode.java     |  8 ++-
 .../Parser/AST/CreateTable/TableTypeNode.java |  8 ++-
 .../java/Parser/AST/SelectStatementNode.java  |  8 ++-
 .../src/main/java/Parser/OracleParser.java    | 70 ++++++++++++++++++-
 14 files changed, 175 insertions(+), 52 deletions(-)
 create mode 100644 sqlTranslate/src/main/java/Exception/ParseFailedException.java
 rename sqlTranslate/src/main/java/Parser/AST/{EndNode.java => CreateTable/CRTEndNode.java} (53%)

diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
index eb513254..b6926131 100644
--- a/sqlTranslate/.idea/workspace.xml
+++ b/sqlTranslate/.idea/workspace.xml
@@ -4,16 +4,20 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add AST node">
-      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/CreateTable/ColumnNode.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/CreateTable/TableConstraintNode.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/CreateTable/TableNode.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/EndNode.java" afterDir="false" />
+    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add functions">
+      <change afterPath="$PROJECT_DIR$/src/main/java/Exception/ParseFailedException.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Generator/OpenGaussGenerator.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Generator/OpenGaussGenerator.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/Lexer/OracleLexer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Lexer/OracleLexer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Main.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/CreateTabNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/CreateTable/CreateTabNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/TableTypeNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/CreateTable/TableTypeNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/ASTNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/ASTNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/CreateTable/ColumnNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/CreateTable/ColumnNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/CreateTable/CreateTabNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/CreateTable/CreateTabNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/CreateTable/TableConstraintNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/CreateTable/TableConstraintNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/CreateTable/TableNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/CreateTable/TableNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/CreateTable/TableTypeNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/CreateTable/TableTypeNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/EndNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/CreateTable/CRTEndNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/SelectStatementNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/SelectStatementNode.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -136,7 +140,14 @@
       <option name="project" value="LOCAL" />
       <updated>1723992163694</updated>
     </task>
-    <option name="localTasksCounter" value="5" />
+    <task id="LOCAL-00005" summary="add functions">
+      <created>1724145125754</created>
+      <option name="number" value="00005" />
+      <option name="presentableId" value="LOCAL-00005" />
+      <option name="project" value="LOCAL" />
+      <updated>1724145125754</updated>
+    </task>
+    <option name="localTasksCounter" value="6" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
@@ -155,6 +166,7 @@
     <MESSAGE value="lexer" />
     <MESSAGE value="AST node" />
     <MESSAGE value="add AST node" />
-    <option name="LAST_COMMIT_MESSAGE" value="add AST node" />
+    <MESSAGE value="add functions" />
+    <option name="LAST_COMMIT_MESSAGE" value="add functions" />
   </component>
 </project>
\ No newline at end of file
diff --git a/sqlTranslate/pom.xml b/sqlTranslate/pom.xml
index bb34291c..a05364c0 100644
--- a/sqlTranslate/pom.xml
+++ b/sqlTranslate/pom.xml
@@ -40,6 +40,14 @@
         <artifactId>maven-surefire-plugin</artifactId>
         <version>3.0.0-M5</version>
       </plugin>
+        <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-compiler-plugin</artifactId>
+            <configuration>
+                <source>9</source>
+                <target>9</target>
+            </configuration>
+        </plugin>
     </plugins>
   </build>
 </project>
diff --git a/sqlTranslate/src/main/java/Exception/ParseFailedException.java b/sqlTranslate/src/main/java/Exception/ParseFailedException.java
new file mode 100644
index 00000000..7d9458f5
--- /dev/null
+++ b/sqlTranslate/src/main/java/Exception/ParseFailedException.java
@@ -0,0 +1,8 @@
+package Exception;
+
+public class ParseFailedException extends RuntimeException{
+    public ParseFailedException(String message)
+    {
+        super(message);
+    }
+}
diff --git a/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java b/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java
index 6e4a894f..fe661260 100644
--- a/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java
+++ b/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java
@@ -1,4 +1,13 @@
 package Generator;
 
+import Parser.AST.ASTNode;
+
 public class OpenGaussGenerator {
+    private ASTNode node;
+    public OpenGaussGenerator(ASTNode node) {
+        this.node = node;
+    }
+    public String generate() {
+        return node.toQueryString();
+    }
 }
diff --git a/sqlTranslate/src/main/java/Lexer/OracleLexer.java b/sqlTranslate/src/main/java/Lexer/OracleLexer.java
index f9ee67a0..70fdcaaa 100644
--- a/sqlTranslate/src/main/java/Lexer/OracleLexer.java
+++ b/sqlTranslate/src/main/java/Lexer/OracleLexer.java
@@ -10,7 +10,7 @@ import java.util.regex.Pattern;
 public class OracleLexer {
     public static final String[] keywords = {"SELECT", "FROM", "WHERE", "AND", "OR", "INSERT", "UPDATE", "DELETE",
             // keywords of creating table
-            "CREATE", "TABLE", "TEMPORARY",
+            "CREATE", "TABLE", "TEMPORARY", "GLOBAL",
             "NUMBER", "INTEGER", "SMALLIN", "BINARY_INTEGER", "DECIMAL", "REAL", "FLOAT", "DOUBLE PRECISION", "CHAR", "VARCHAR2",
             "NCHAR", "NVARCHAR2", "CLOB", "NCLOB", "DATE", "TIMESTAMP", "TIMESTAMP WITH TIME ZONE", "TIMESTAMP WITH LOCAL TIME ZONE", "BLOB", "RAW",
             "LONG RAW", "BOOLEAN", "INTERVAL YEAR TO MONTH", "INTERVAL DAY TO SECOND", "ROWID", "UROWID", "REF CURSOR",
@@ -138,4 +138,8 @@ public class OracleLexer {
             System.out.println(token);
         }
     }
+
+    public List<Token> getTokens() {
+        return tokens;
+    }
 }
diff --git a/sqlTranslate/src/main/java/Parser/AST/ASTNode.java b/sqlTranslate/src/main/java/Parser/AST/ASTNode.java
index de092614..d89a6918 100644
--- a/sqlTranslate/src/main/java/Parser/AST/ASTNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/ASTNode.java
@@ -6,26 +6,26 @@ import java.util.ArrayList;
 import java.util.List;
 
 public abstract class ASTNode {
-    private Token token;
+    private List<Token> tokens;
     private ASTNode parent;
     private List<ASTNode> children = new ArrayList<>();
 
-    public ASTNode(Token token) {
-        this.token = token;
+    public ASTNode(List<Token> tokens) {
+        this.tokens = tokens;
     }
 
     public ASTNode(ASTNode node) {
-        this.token = node.token;
+        this.tokens = node.tokens;
         this.parent = node.parent;
         this.children = new ArrayList<>(node.children);
     }
 
-    public Token getToken() {
-        return token;
+    public List<Token> getTokens() {
+        return tokens;
     }
 
-    public void setToken(Token token) {
-        this.token = token;
+    public void setTokens(List<Token> tokens) {
+        this.tokens = tokens;
     }
 
     public ASTNode getParent() {
@@ -66,7 +66,7 @@ public abstract class ASTNode {
      */
     public void setChildrenByName(String childName, ASTNode child) {
         for (int i = 0; i < this.children.size(); i++) {
-            if (this.children.get(i).getToken().getValue().contains(childName)) {
+            if (this.children.get(i).toString().contains(childName)) {
                 this.children.set(i, child);
                 break;
             }
@@ -103,6 +103,13 @@ public abstract class ASTNode {
 
     @Override
     public String toString() {
-        return token.getValue();
+        String str = "";
+        for (int i = 0; i < tokens.size(); i++) {
+            if (i < tokens.size() - 1)
+                str += tokens.get(i).getValue() + " ";
+            else
+                str += tokens.get(i).getValue();
+        }
+        return str;
     }
 }
diff --git a/sqlTranslate/src/main/java/Parser/AST/EndNode.java b/sqlTranslate/src/main/java/Parser/AST/CreateTable/CRTEndNode.java
similarity index 53%
rename from sqlTranslate/src/main/java/Parser/AST/EndNode.java
rename to sqlTranslate/src/main/java/Parser/AST/CreateTable/CRTEndNode.java
index 5aa6a95e..01db870e 100644
--- a/sqlTranslate/src/main/java/Parser/AST/EndNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/CreateTable/CRTEndNode.java
@@ -1,18 +1,21 @@
-package Parser.AST;
+package Parser.AST.CreateTable;
 import Lexer.Token;
 import Parser.AST.ASTNode;
-public class EndNode extends ASTNode{
-    public EndNode(ASTNode node)
+
+import java.util.List;
+
+public class CRTEndNode extends ASTNode {
+    public CRTEndNode(ASTNode node)
     {
         super(node);
     }
-    public EndNode(Token token)
+    public CRTEndNode(List<Token> tokens)
     {
-        super(token);
+        super(tokens);
     }
     public void visit(ASTNode node, StringBuilder queryString)
     {
-        queryString.append(")" + getToken().getValue());
+        queryString.append(")" + toString());
         for (ASTNode child : getChildren())
         {
             child.visit(child, queryString);
diff --git a/sqlTranslate/src/main/java/Parser/AST/CreateTable/ColumnNode.java b/sqlTranslate/src/main/java/Parser/AST/CreateTable/ColumnNode.java
index 0b0c7bbd..671912fb 100644
--- a/sqlTranslate/src/main/java/Parser/AST/CreateTable/ColumnNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/CreateTable/ColumnNode.java
@@ -3,19 +3,21 @@ package Parser.AST.CreateTable;
 import Lexer.Token;
 import Parser.AST.ASTNode;
 
+import java.util.List;
+
 public class ColumnNode extends ASTNode {
     public ColumnNode(ASTNode node)
     {
         super(node);
     }
-    public ColumnNode(Token token)
+    public ColumnNode(List<Token> tokens)
     {
-        super(token);
+        super(tokens);
     }
 
     public void visit(ASTNode node, StringBuilder queryString)
     {
-        queryString.append(getToken().getValue() + " ");
+        queryString.append(toString() + " ");
         for (ASTNode child : getChildren())
         {
             child.visit(child, queryString);
diff --git a/sqlTranslate/src/main/java/Parser/AST/CreateTable/CreateTabNode.java b/sqlTranslate/src/main/java/Parser/AST/CreateTable/CreateTabNode.java
index 3676552e..5fbc3006 100644
--- a/sqlTranslate/src/main/java/Parser/AST/CreateTable/CreateTabNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/CreateTable/CreateTabNode.java
@@ -2,25 +2,21 @@ package Parser.AST.CreateTable;
 
 import Lexer.Token;
 import Parser.AST.ASTNode;
+import java.util.List;
 
 public class CreateTabNode extends ASTNode {
     public CreateTabNode(ASTNode node) {
         super(node);
     }
 
-    public CreateTabNode(Token token) {
-        super(token);
+    public CreateTabNode(List<Token> tokens) {
+        super(tokens);
     }
 
     @Override
     public void visit(ASTNode node, StringBuilder queryString) {
         // judge the type of the table
-        if (getChildren().get(0) instanceof TableTypeNode) {
-            queryString.append("CREATE ");
-        }
-        else {
-            queryString.append("CREATE TABLE ");
-        }
+        queryString.append(toString() + " ");
         for (ASTNode child : getChildren())
         {
             child.visit(child, queryString);
diff --git a/sqlTranslate/src/main/java/Parser/AST/CreateTable/TableConstraintNode.java b/sqlTranslate/src/main/java/Parser/AST/CreateTable/TableConstraintNode.java
index f64a8668..d10d4126 100644
--- a/sqlTranslate/src/main/java/Parser/AST/CreateTable/TableConstraintNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/CreateTable/TableConstraintNode.java
@@ -3,19 +3,21 @@ package Parser.AST.CreateTable;
 import Lexer.Token;
 import Parser.AST.ASTNode;
 
+import java.util.List;
+
 public class TableConstraintNode extends ASTNode{
     public TableConstraintNode(ASTNode node)
     {
         super(node);
     }
-    public TableConstraintNode(Token token)
+    public TableConstraintNode(List<Token> tokens)
     {
-        super(token);
+        super(tokens);
     }
 
     public void visit(ASTNode node, StringBuilder queryString)
     {
-        queryString.append(getToken().getValue() + " ");
+        queryString.append(toString() + " ");
         for (ASTNode child : getChildren())
         {
             child.visit(child, queryString);
diff --git a/sqlTranslate/src/main/java/Parser/AST/CreateTable/TableNode.java b/sqlTranslate/src/main/java/Parser/AST/CreateTable/TableNode.java
index ce8ab1b4..a66bde7d 100644
--- a/sqlTranslate/src/main/java/Parser/AST/CreateTable/TableNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/CreateTable/TableNode.java
@@ -3,19 +3,21 @@ package Parser.AST.CreateTable;
 import Lexer.Token;
 import Parser.AST.ASTNode;
 
+import java.util.List;
+
 public class TableNode extends ASTNode{
     public TableNode(ASTNode node)
     {
         super(node);
     }
-    public TableNode(Token token)
+    public TableNode(List<Token> tokens)
     {
-        super(token);
+        super(tokens);
     }
 
     public void visit(ASTNode node, StringBuilder queryString)
     {
-        queryString.append(getToken().getValue() + " ");
+        queryString.append(toString() + " ");
         for (ASTNode child : getChildren())
         {
             child.visit(child, queryString);
diff --git a/sqlTranslate/src/main/java/Parser/AST/CreateTable/TableTypeNode.java b/sqlTranslate/src/main/java/Parser/AST/CreateTable/TableTypeNode.java
index b90157c8..73de827f 100644
--- a/sqlTranslate/src/main/java/Parser/AST/CreateTable/TableTypeNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/CreateTable/TableTypeNode.java
@@ -3,19 +3,21 @@ package Parser.AST.CreateTable;
 import Lexer.Token;
 import Parser.AST.ASTNode;
 
+import java.util.List;
+
 public class TableTypeNode extends ASTNode {
     public TableTypeNode(ASTNode node)
     {
         super(node);
     }
-    public TableTypeNode(Token token)
+    public TableTypeNode(List<Token> tokens)
     {
-        super(token);
+        super(tokens);
     }
 
     public void visit(ASTNode node, StringBuilder queryString)
     {
-        queryString.append(getToken() + " ");
+        queryString.append(toString() + " ");
         for (ASTNode child : getChildren())
         {
             child.visit(child, queryString);
diff --git a/sqlTranslate/src/main/java/Parser/AST/SelectStatementNode.java b/sqlTranslate/src/main/java/Parser/AST/SelectStatementNode.java
index d7ac736b..0d3eb828 100644
--- a/sqlTranslate/src/main/java/Parser/AST/SelectStatementNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/SelectStatementNode.java
@@ -2,21 +2,23 @@ package Parser.AST;
 
 import Lexer.Token;
 
+import java.util.List;
+
 public class SelectStatementNode extends ASTNode{
     public SelectStatementNode(ASTNode node)
     {
         super(node);
     }
 
-    public SelectStatementNode(Token token)
+    public SelectStatementNode(List<Token> tokens)
     {
-        super(token);
+        super(tokens);
     }
 
     @Override
     public void visit(ASTNode node, StringBuilder queryString)
     {
-        queryString.append("SELECT ");
+        queryString.append(toString() + " ");
         for (ASTNode child : getChildren())
         {
             child.visit(child, queryString);
diff --git a/sqlTranslate/src/main/java/Parser/OracleParser.java b/sqlTranslate/src/main/java/Parser/OracleParser.java
index bd0f93ca..d44c522d 100644
--- a/sqlTranslate/src/main/java/Parser/OracleParser.java
+++ b/sqlTranslate/src/main/java/Parser/OracleParser.java
@@ -1,17 +1,83 @@
 package Parser;
 
 import Lexer.OracleLexer;
+import Lexer.Token;
 import Parser.AST.ASTNode;
+import Exception.ParseFailedException;
+import Parser.AST.CreateTable.CreateTabNode;
+import Parser.AST.CreateTable.TableNode;
+import Parser.AST.CreateTable.TableTypeNode;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 
 public class OracleParser {
     private OracleLexer lexer;
     public OracleParser(OracleLexer lexer) {
         this.lexer = lexer;
     }
-    public ASTNode parse(String input)
+    public ASTNode parse()
     {
+        List<Token> tokens = lexer.getTokens();
+        // check if the input is a create table statement
+        if ((tokens.get(0).getValue().equalsIgnoreCase("CREATE") && tokens.get(1).getValue().equalsIgnoreCase("TABLE")) ||
+                (tokens.get(0).getValue().equalsIgnoreCase("CREATE") && tokens.get(2).getValue().equalsIgnoreCase("TEMPORARY") && tokens.get(3).getValue().equalsIgnoreCase("TABLE")) ) {
+            return parseCreateTab();
+        }
+        else {
+            throw new ParseFailedException("Parse failed!");
+        }
+    }
+
+    private ASTNode parseCreateTab() {
+        List <Token> tokens = new ArrayList<>();
+        tokens.add(lexer.getTokens().get(0));
+        ASTNode root = new CreateTabNode(tokens);
+        ASTNode currentNode = root;
+        for (int i = 1; i < lexer.getTokens().size(); i++) {
+            if (i == 1 && lexer.getTokens().get(i).getValue().equalsIgnoreCase("TABLE")) {
+                tokens.clear();
+                tokens.add(lexer.getTokens().get(i));
+                try {
+                    tokens.add(lexer.getTokens().get(i + 1));
+                }
+                catch (ParseFailedException e) {
+                    throw new ParseFailedException("Parse failed!");
+                }
+                i++;
+                ASTNode child = new TableNode(tokens);
+                root.addChild(child);
+                currentNode = child;
+            }
+            else if (i == 1 && !lexer.getTokens().get(i).getValue().equalsIgnoreCase("TABLE")){
+                tokens.clear();
+                tokens.add(lexer.getTokens().get(i));
+                for (int j = i + 1; j < lexer.getTokens().size(); j++) {
+                    if (lexer.getTokens().get(j).getValue().equalsIgnoreCase("TABLE")) {
+                        ASTNode child = new TableTypeNode(tokens);
+                        root.addChild(child);
+                        currentNode = child;
+                        tokens.clear();
+                        tokens.add(lexer.getTokens().get(j));
+                        try {
+                            tokens.add(lexer.getTokens().get(j + 1));
+                        }
+                        catch (ParseFailedException e) {
+                            throw new ParseFailedException("Parse failed!");
+                        }
+                        i = j + 1;
+                        break;
+                    }
+                    tokens.add(lexer.getTokens().get(j));
+                }
 
-        return null;
+                ASTNode child = new TableNode(tokens);
+                currentNode.addChild(child);
+                currentNode = child;
+            }
+        }
+        return root;
     }
 
 
-- 
Gitee


From f49954ec42917c03f3d9169087a6d20e978a0b21 Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Tue, 20 Aug 2024 22:43:27 +0800
Subject: [PATCH 007/113] revise

---
 sqlTranslate/.idea/workspace.xml            | 44 +++++++++------------
 sqlTranslate/src/main/java/Lexer/Token.java |  7 ++++
 2 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
index b6926131..59230c43 100644
--- a/sqlTranslate/.idea/workspace.xml
+++ b/sqlTranslate/.idea/workspace.xml
@@ -4,22 +4,7 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add functions">
-      <change afterPath="$PROJECT_DIR$/src/main/java/Exception/ParseFailedException.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Generator/OpenGaussGenerator.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Generator/OpenGaussGenerator.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Lexer/OracleLexer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Lexer/OracleLexer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/ASTNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/ASTNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/CreateTable/ColumnNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/CreateTable/ColumnNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/CreateTable/CreateTabNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/CreateTable/CreateTabNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/CreateTable/TableConstraintNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/CreateTable/TableConstraintNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/CreateTable/TableNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/CreateTable/TableNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/CreateTable/TableTypeNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/CreateTable/TableTypeNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/EndNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/CreateTable/CRTEndNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/SelectStatementNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/SelectStatementNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" afterDir="false" />
-    </list>
+    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="revise" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -50,14 +35,15 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent">{
-  &quot;keyToString&quot;: {
-    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
-    &quot;SHARE_PROJECT_CONFIGURATION_FILES&quot;: &quot;true&quot;,
-    &quot;last_opened_file_path&quot;: &quot;F:/oracle2opengauss/examples/sqlTranslate&quot;
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "RunOnceActivity.OpenProjectViewOnStart": "true",
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "SHARE_PROJECT_CONFIGURATION_FILES": "true",
+    "last_opened_file_path": "F:/oracle2opengauss/examples/sqlTranslate",
+    "settings.editor.selected.configurable": "preferences.pluginManager"
   }
-}</component>
+}]]></component>
   <component name="RunManager" selected="应用程序.Main">
     <configuration name="App" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
       <option name="MAIN_CLASS_NAME" value="org.example.App" />
@@ -147,7 +133,14 @@
       <option name="project" value="LOCAL" />
       <updated>1724145125754</updated>
     </task>
-    <option name="localTasksCounter" value="6" />
+    <task id="LOCAL-00006" summary="revise">
+      <created>1724164698153</created>
+      <option name="number" value="00006" />
+      <option name="presentableId" value="LOCAL-00006" />
+      <option name="project" value="LOCAL" />
+      <updated>1724164698153</updated>
+    </task>
+    <option name="localTasksCounter" value="7" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
@@ -167,6 +160,7 @@
     <MESSAGE value="AST node" />
     <MESSAGE value="add AST node" />
     <MESSAGE value="add functions" />
-    <option name="LAST_COMMIT_MESSAGE" value="add functions" />
+    <MESSAGE value="revise" />
+    <option name="LAST_COMMIT_MESSAGE" value="revise" />
   </component>
 </project>
\ No newline at end of file
diff --git a/sqlTranslate/src/main/java/Lexer/Token.java b/sqlTranslate/src/main/java/Lexer/Token.java
index e4574aa3..04359b78 100644
--- a/sqlTranslate/src/main/java/Lexer/Token.java
+++ b/sqlTranslate/src/main/java/Lexer/Token.java
@@ -32,4 +32,11 @@ public class Token {
                 ", value='" + value + '\'' +
                 '}';
     }
+
+    public static Token createIdentifierToken(String value) {
+        return new Token(TokenType.IDENTIFIER, value);
+    }
+    public static Token createKeywordToken(String value) {
+        return new Token(TokenType.KEYWORD, value);
+    }
 }
-- 
Gitee


From 9187a6e135acd98bab9f93a565bbb218a1cbd9d6 Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Tue, 20 Aug 2024 22:43:47 +0800
Subject: [PATCH 008/113] revise

---
 sqlTranslate/src/main/java/Lexer/Token.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sqlTranslate/src/main/java/Lexer/Token.java b/sqlTranslate/src/main/java/Lexer/Token.java
index 04359b78..17b8fd89 100644
--- a/sqlTranslate/src/main/java/Lexer/Token.java
+++ b/sqlTranslate/src/main/java/Lexer/Token.java
@@ -36,6 +36,8 @@ public class Token {
     public static Token createIdentifierToken(String value) {
         return new Token(TokenType.IDENTIFIER, value);
     }
+
+
     public static Token createKeywordToken(String value) {
         return new Token(TokenType.KEYWORD, value);
     }
-- 
Gitee


From 9791f9a1dc2235fcb67fa9851ecc2ee58f26b9bb Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Tue, 20 Aug 2024 22:44:06 +0800
Subject: [PATCH 009/113] revise

---
 sqlTranslate/src/main/java/Lexer/Token.java | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/sqlTranslate/src/main/java/Lexer/Token.java b/sqlTranslate/src/main/java/Lexer/Token.java
index 17b8fd89..50baec53 100644
--- a/sqlTranslate/src/main/java/Lexer/Token.java
+++ b/sqlTranslate/src/main/java/Lexer/Token.java
@@ -33,12 +33,4 @@ public class Token {
                 '}';
     }
 
-    public static Token createIdentifierToken(String value) {
-        return new Token(TokenType.IDENTIFIER, value);
-    }
-
-
-    public static Token createKeywordToken(String value) {
-        return new Token(TokenType.KEYWORD, value);
-    }
 }
-- 
Gitee


From 0bcc3c21b7c63a7870c6dfa2adfb5b8a3525bd28 Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Tue, 20 Aug 2024 23:00:46 +0800
Subject: [PATCH 010/113] add parser function

---
 sqlTranslate/.idea/workspace.xml              | 29 +++++++++++++++++--
 .../Parser/AST/CreateTable/TableNode.java     |  2 +-
 .../src/main/java/Parser/OracleParser.java    | 10 +++++++
 3 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
index 59230c43..267180b4 100644
--- a/sqlTranslate/.idea/workspace.xml
+++ b/sqlTranslate/.idea/workspace.xml
@@ -4,7 +4,11 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="revise" />
+    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="revise">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/CreateTable/TableNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/CreateTable/TableNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -140,7 +144,28 @@
       <option name="project" value="LOCAL" />
       <updated>1724164698153</updated>
     </task>
-    <option name="localTasksCounter" value="7" />
+    <task id="LOCAL-00007" summary="revise">
+      <created>1724165008682</created>
+      <option name="number" value="00007" />
+      <option name="presentableId" value="LOCAL-00007" />
+      <option name="project" value="LOCAL" />
+      <updated>1724165008682</updated>
+    </task>
+    <task id="LOCAL-00008" summary="revise">
+      <created>1724165028837</created>
+      <option name="number" value="00008" />
+      <option name="presentableId" value="LOCAL-00008" />
+      <option name="project" value="LOCAL" />
+      <updated>1724165028837</updated>
+    </task>
+    <task id="LOCAL-00009" summary="revise">
+      <created>1724165047441</created>
+      <option name="number" value="00009" />
+      <option name="presentableId" value="LOCAL-00009" />
+      <option name="project" value="LOCAL" />
+      <updated>1724165047441</updated>
+    </task>
+    <option name="localTasksCounter" value="10" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
diff --git a/sqlTranslate/src/main/java/Parser/AST/CreateTable/TableNode.java b/sqlTranslate/src/main/java/Parser/AST/CreateTable/TableNode.java
index a66bde7d..9f1cd6d3 100644
--- a/sqlTranslate/src/main/java/Parser/AST/CreateTable/TableNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/CreateTable/TableNode.java
@@ -17,7 +17,7 @@ public class TableNode extends ASTNode{
 
     public void visit(ASTNode node, StringBuilder queryString)
     {
-        queryString.append(toString() + " ");
+        queryString.append(toString() + " ( ");
         for (ASTNode child : getChildren())
         {
             child.visit(child, queryString);
diff --git a/sqlTranslate/src/main/java/Parser/OracleParser.java b/sqlTranslate/src/main/java/Parser/OracleParser.java
index d44c522d..205c8601 100644
--- a/sqlTranslate/src/main/java/Parser/OracleParser.java
+++ b/sqlTranslate/src/main/java/Parser/OracleParser.java
@@ -76,6 +76,16 @@ public class OracleParser {
                 currentNode.addChild(child);
                 currentNode = child;
             }
+            else if (lexer.getTokens().get(i).hasType(Token.TokenType.IDENTIFIER)) {
+                tokens.clear();
+                tokens.add(lexer.getTokens().get(i));
+                for (int j = i + 1; j < lexer.getTokens().size(); j++) {
+                    // TODO: Token.TokenType.IDENTIFIER ... , -> column node
+                }
+            }
+            else {
+                throw new ParseFailedException("Parse failed!");
+            }
         }
         return root;
     }
-- 
Gitee


From ff0b115eccf9cfec0c206f9f255be5b693b8671a Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Thu, 22 Aug 2024 22:51:40 +0800
Subject: [PATCH 011/113] add function

---
 sqlTranslate/.idea/workspace.xml              | 34 ++++++++++++-------
 .../src/main/java/Parser/AST/ASTNode.java     |  3 ++
 .../Parser/AST/CreateTable/ColumnNode.java    | 30 ++++++++++++++++
 .../src/main/java/Parser/OracleParser.java    | 25 ++++++++++++--
 4 files changed, 78 insertions(+), 14 deletions(-)

diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
index 267180b4..d6262f71 100644
--- a/sqlTranslate/.idea/workspace.xml
+++ b/sqlTranslate/.idea/workspace.xml
@@ -4,9 +4,10 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="revise">
+    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add parser function">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/CreateTable/TableNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/CreateTable/TableNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/ASTNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/ASTNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/CreateTable/ColumnNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/CreateTable/ColumnNode.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -18,6 +19,7 @@
     <option name="RECENT_TEMPLATES">
       <list>
         <option value="Class" />
+        <option value="Interface" />
       </list>
     </option>
   </component>
@@ -39,15 +41,15 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "RunOnceActivity.OpenProjectViewOnStart": "true",
-    "RunOnceActivity.ShowReadmeOnStart": "true",
-    "SHARE_PROJECT_CONFIGURATION_FILES": "true",
-    "last_opened_file_path": "F:/oracle2opengauss/examples/sqlTranslate",
-    "settings.editor.selected.configurable": "preferences.pluginManager"
+  <component name="PropertiesComponent">{
+  &quot;keyToString&quot;: {
+    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    &quot;SHARE_PROJECT_CONFIGURATION_FILES&quot;: &quot;true&quot;,
+    &quot;last_opened_file_path&quot;: &quot;F:/oracle2opengauss/examples/sqlTranslate&quot;,
+    &quot;settings.editor.selected.configurable&quot;: &quot;preferences.pluginManager&quot;
   }
-}]]></component>
+}</component>
   <component name="RunManager" selected="应用程序.Main">
     <configuration name="App" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
       <option name="MAIN_CLASS_NAME" value="org.example.App" />
@@ -165,7 +167,14 @@
       <option name="project" value="LOCAL" />
       <updated>1724165047441</updated>
     </task>
-    <option name="localTasksCounter" value="10" />
+    <task id="LOCAL-00010" summary="add parser function">
+      <created>1724166047929</created>
+      <option name="number" value="00010" />
+      <option name="presentableId" value="LOCAL-00010" />
+      <option name="project" value="LOCAL" />
+      <updated>1724166047929</updated>
+    </task>
+    <option name="localTasksCounter" value="11" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
@@ -186,6 +195,7 @@
     <MESSAGE value="add AST node" />
     <MESSAGE value="add functions" />
     <MESSAGE value="revise" />
-    <option name="LAST_COMMIT_MESSAGE" value="revise" />
+    <MESSAGE value="add parser function" />
+    <option name="LAST_COMMIT_MESSAGE" value="add parser function" />
   </component>
 </project>
\ No newline at end of file
diff --git a/sqlTranslate/src/main/java/Parser/AST/ASTNode.java b/sqlTranslate/src/main/java/Parser/AST/ASTNode.java
index d89a6918..4f22066b 100644
--- a/sqlTranslate/src/main/java/Parser/AST/ASTNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/ASTNode.java
@@ -10,6 +10,9 @@ public abstract class ASTNode {
     private ASTNode parent;
     private List<ASTNode> children = new ArrayList<>();
 
+    public ASTNode() {
+    }
+
     public ASTNode(List<Token> tokens) {
         this.tokens = tokens;
     }
diff --git a/sqlTranslate/src/main/java/Parser/AST/CreateTable/ColumnNode.java b/sqlTranslate/src/main/java/Parser/AST/CreateTable/ColumnNode.java
index 671912fb..90381ea1 100644
--- a/sqlTranslate/src/main/java/Parser/AST/CreateTable/ColumnNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/CreateTable/ColumnNode.java
@@ -6,6 +6,12 @@ import Parser.AST.ASTNode;
 import java.util.List;
 
 public class ColumnNode extends ASTNode {
+    private Token name;
+    private Token type;
+    private Token constraint;
+    public ColumnNode() {
+        super();
+    }
     public ColumnNode(ASTNode node)
     {
         super(node);
@@ -24,4 +30,28 @@ public class ColumnNode extends ASTNode {
         }
     }
 
+    public Token getName() {
+        return name;
+    }
+
+    public void setName(Token name) {
+        this.name = name;
+    }
+
+    public Token getType() {
+        return type;
+    }
+
+    public void setType(Token type) {
+        this.type = type;
+    }
+
+    public Token getConstraint() {
+        return constraint;
+    }
+
+    public void setConstraint(Token constraint) {
+        this.constraint = constraint;
+    }
+
 }
diff --git a/sqlTranslate/src/main/java/Parser/OracleParser.java b/sqlTranslate/src/main/java/Parser/OracleParser.java
index 205c8601..5d237cc1 100644
--- a/sqlTranslate/src/main/java/Parser/OracleParser.java
+++ b/sqlTranslate/src/main/java/Parser/OracleParser.java
@@ -4,6 +4,7 @@ import Lexer.OracleLexer;
 import Lexer.Token;
 import Parser.AST.ASTNode;
 import Exception.ParseFailedException;
+import Parser.AST.CreateTable.ColumnNode;
 import Parser.AST.CreateTable.CreateTabNode;
 import Parser.AST.CreateTable.TableNode;
 import Parser.AST.CreateTable.TableTypeNode;
@@ -77,11 +78,31 @@ public class OracleParser {
                 currentNode = child;
             }
             else if (lexer.getTokens().get(i).hasType(Token.TokenType.IDENTIFIER)) {
+                // Token.TokenType.IDENTIFIER ... , -> column node
                 tokens.clear();
-                tokens.add(lexer.getTokens().get(i));
+                ColumnNode child = new ColumnNode();
+                child.setName();
+                tokens.add();
                 for (int j = i + 1; j < lexer.getTokens().size(); j++) {
-                    // TODO: Token.TokenType.IDENTIFIER ... , -> column node
+                    if (j == i + 1) {
+
+                    }
+                    tokens.add(lexer.getTokens().get(j));
+                    if ((lexer.getTokens().get(j).hasType(Token.TokenType.SYMBOL) && lexer.getTokens().get(j).getValue().equals(",")) ||
+                            (lexer.getTokens().get(j).hasType(Token.TokenType.SYMBOL) && lexer.getTokens().get(j).getValue().equals(")")) ) {
+                        i = j;
+                        break;
+                    }
                 }
+                child.setTokens(tokens);
+                currentNode.addChild(child);
+                currentNode = child;
+            }
+            else if (lexer.getTokens().get(i).hasType(Token.TokenType.KEYWORD) && lexer.getTokens().get(i).getValue().equalsIgnoreCase("CONSTRAINT")) {
+                // Table constraint
+                tokens.clear();
+                tokens.add(lexer.getTokens().get(i));
+
             }
             else {
                 throw new ParseFailedException("Parse failed!");
-- 
Gitee


From bae72996a4b5f1898132c800afad24386278d9a5 Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Fri, 23 Aug 2024 21:19:37 +0800
Subject: [PATCH 012/113] add function

---
 sqlTranslate/.idea/workspace.xml              | 15 +++++--
 .../Parser/AST/CreateTable/ColumnNode.java    |  6 +--
 .../src/main/java/Parser/OracleParser.java    | 40 +++++++++++++++++--
 3 files changed, 51 insertions(+), 10 deletions(-)

diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
index d6262f71..0e43459d 100644
--- a/sqlTranslate/.idea/workspace.xml
+++ b/sqlTranslate/.idea/workspace.xml
@@ -4,9 +4,8 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add parser function">
+    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add function">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/ASTNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/ASTNode.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/CreateTable/ColumnNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/CreateTable/ColumnNode.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" afterDir="false" />
     </list>
@@ -174,7 +173,14 @@
       <option name="project" value="LOCAL" />
       <updated>1724166047929</updated>
     </task>
-    <option name="localTasksCounter" value="11" />
+    <task id="LOCAL-00011" summary="add function">
+      <created>1724338301831</created>
+      <option name="number" value="00011" />
+      <option name="presentableId" value="LOCAL-00011" />
+      <option name="project" value="LOCAL" />
+      <updated>1724338301831</updated>
+    </task>
+    <option name="localTasksCounter" value="12" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
@@ -196,6 +202,7 @@
     <MESSAGE value="add functions" />
     <MESSAGE value="revise" />
     <MESSAGE value="add parser function" />
-    <option name="LAST_COMMIT_MESSAGE" value="add parser function" />
+    <MESSAGE value="add function" />
+    <option name="LAST_COMMIT_MESSAGE" value="add function" />
   </component>
 </project>
\ No newline at end of file
diff --git a/sqlTranslate/src/main/java/Parser/AST/CreateTable/ColumnNode.java b/sqlTranslate/src/main/java/Parser/AST/CreateTable/ColumnNode.java
index 90381ea1..39c77014 100644
--- a/sqlTranslate/src/main/java/Parser/AST/CreateTable/ColumnNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/CreateTable/ColumnNode.java
@@ -8,7 +8,7 @@ import java.util.List;
 public class ColumnNode extends ASTNode {
     private Token name;
     private Token type;
-    private Token constraint;
+    private List<Token> constraint;
     public ColumnNode() {
         super();
     }
@@ -46,11 +46,11 @@ public class ColumnNode extends ASTNode {
         this.type = type;
     }
 
-    public Token getConstraint() {
+    public List<Token> getConstraint() {
         return constraint;
     }
 
-    public void setConstraint(Token constraint) {
+    public void setConstraint(List<Token> constraint) {
         this.constraint = constraint;
     }
 
diff --git a/sqlTranslate/src/main/java/Parser/OracleParser.java b/sqlTranslate/src/main/java/Parser/OracleParser.java
index 5d237cc1..b514da91 100644
--- a/sqlTranslate/src/main/java/Parser/OracleParser.java
+++ b/sqlTranslate/src/main/java/Parser/OracleParser.java
@@ -8,6 +8,7 @@ import Parser.AST.CreateTable.ColumnNode;
 import Parser.AST.CreateTable.CreateTabNode;
 import Parser.AST.CreateTable.TableNode;
 import Parser.AST.CreateTable.TableTypeNode;
+import java.util.Stack;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -81,16 +82,49 @@ public class OracleParser {
                 // Token.TokenType.IDENTIFIER ... , -> column node
                 tokens.clear();
                 ColumnNode child = new ColumnNode();
-                child.setName();
-                tokens.add();
+                child.setName(lexer.getTokens().get(i));
+                tokens.add(lexer.getTokens().get(i));
+                List <Token> constraint = new ArrayList<>();
                 for (int j = i + 1; j < lexer.getTokens().size(); j++) {
                     if (j == i + 1) {
-
+                        child.setType(lexer.getTokens().get(j));
+                    }
+                    else {
+                        constraint.add(lexer.getTokens().get(j));
                     }
                     tokens.add(lexer.getTokens().get(j));
+                    // Check () or REFERENCES other_table(other_column)
+                    if (lexer.getTokens().get(j).hasType(Token.TokenType.KEYWORD) &&
+                            (lexer.getTokens().get(j).getValue().equalsIgnoreCase("REFERENCES") || lexer.getTokens().get(j).getValue().equalsIgnoreCase("CHECK"))) {
+                        Stack<String> stack = new Stack<>();
+                        for (int k = j + 1; k < lexer.getTokens().size(); k++) {
+                            tokens.add(lexer.getTokens().get(k));
+                            constraint.add(lexer.getTokens().get(k));
+                            if (lexer.getTokens().get(k).getValue().equals("(")) {
+                                stack.push("(");
+                                for (int t = k + 1; t < lexer.getTokens().size(); t++) {
+                                    tokens.add(lexer.getTokens().get(t));
+                                    constraint.add(lexer.getTokens().get(t));
+                                    if (lexer.getTokens().get(t).getValue().equals("(")) {
+                                        stack.push("(");
+                                    }
+                                    else if (lexer.getTokens().get(t).getValue().equals(")")) {
+                                        stack.pop();
+                                        if (stack.empty()) {
+                                            i = t;
+                                            break;
+                                        }
+                                    }
+                                }
+                                break;
+                            }
+                        }
+                        break;
+                    }
                     if ((lexer.getTokens().get(j).hasType(Token.TokenType.SYMBOL) && lexer.getTokens().get(j).getValue().equals(",")) ||
                             (lexer.getTokens().get(j).hasType(Token.TokenType.SYMBOL) && lexer.getTokens().get(j).getValue().equals(")")) ) {
                         i = j;
+                        child.setConstraint(constraint);
                         break;
                     }
                 }
-- 
Gitee


From 7eb3119503c7663b74f7e6ed5401fd9938bcf284 Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Fri, 23 Aug 2024 22:36:37 +0800
Subject: [PATCH 013/113] add function

---
 sqlTranslate/.idea/workspace.xml              | 30 +++++++----
 sqlTranslate/src/main/java/Main.java          | 14 +++--
 .../src/main/java/Parser/OracleParser.java    | 52 +++++++++++++++++--
 3 files changed, 75 insertions(+), 21 deletions(-)

diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
index 0e43459d..c3f62bc4 100644
--- a/sqlTranslate/.idea/workspace.xml
+++ b/sqlTranslate/.idea/workspace.xml
@@ -6,7 +6,7 @@
   <component name="ChangeListManager">
     <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add function">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/CreateTable/ColumnNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/CreateTable/ColumnNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Main.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -40,15 +40,18 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent">{
-  &quot;keyToString&quot;: {
-    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
-    &quot;SHARE_PROJECT_CONFIGURATION_FILES&quot;: &quot;true&quot;,
-    &quot;last_opened_file_path&quot;: &quot;F:/oracle2opengauss/examples/sqlTranslate&quot;,
-    &quot;settings.editor.selected.configurable&quot;: &quot;preferences.pluginManager&quot;
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "RunOnceActivity.OpenProjectViewOnStart": "true",
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "SHARE_PROJECT_CONFIGURATION_FILES": "true",
+    "last_opened_file_path": "F:/oracle2opengauss/examples/sqlTranslate",
+    "project.structure.last.edited": "模块",
+    "project.structure.proportion": "0.0",
+    "project.structure.side.proportion": "0.0",
+    "settings.editor.selected.configurable": "build.tools"
   }
-}</component>
+}]]></component>
   <component name="RunManager" selected="应用程序.Main">
     <configuration name="App" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
       <option name="MAIN_CLASS_NAME" value="org.example.App" />
@@ -180,7 +183,14 @@
       <option name="project" value="LOCAL" />
       <updated>1724338301831</updated>
     </task>
-    <option name="localTasksCounter" value="12" />
+    <task id="LOCAL-00012" summary="add function">
+      <created>1724419179050</created>
+      <option name="number" value="00012" />
+      <option name="presentableId" value="LOCAL-00012" />
+      <option name="project" value="LOCAL" />
+      <updated>1724419179050</updated>
+    </task>
+    <option name="localTasksCounter" value="13" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
diff --git a/sqlTranslate/src/main/java/Main.java b/sqlTranslate/src/main/java/Main.java
index ff19ccf5..fc8e3791 100644
--- a/sqlTranslate/src/main/java/Main.java
+++ b/sqlTranslate/src/main/java/Main.java
@@ -1,11 +1,11 @@
+
 import Lexer.OracleLexer;
-import Lexer.Token;
+import Parser.AST.ASTNode;
+import Parser.OracleParser;
 
-import java.util.List;
 
 public class Main {
     public static void main(String[] args) {
-//        String sql = "SELECT NuMBER(1,3) Not NULL FROM table WHERE name = 'John Doe';";
         String sql = "CREATE TABLE employees (\n" +
                 "    employee_id NUMBER(6) PRIMARY KEY,\n" +
                 "    first_name VARCHAR2(20),\n" +
@@ -15,10 +15,8 @@ public class Main {
                 ");";
         OracleLexer lexer = new OracleLexer(sql);
         lexer.printTokens();
-//        List<Token> tokens = lexer.tokenize();
-//
-//        for (Token token : tokens) {
-//            System.out.println(token);
-//        }
+        OracleParser parser = new OracleParser(lexer);
+        ASTNode root = parser.parse();
+        System.out.println(root.toQueryString());
     }
 }
diff --git a/sqlTranslate/src/main/java/Parser/OracleParser.java b/sqlTranslate/src/main/java/Parser/OracleParser.java
index b514da91..caff544f 100644
--- a/sqlTranslate/src/main/java/Parser/OracleParser.java
+++ b/sqlTranslate/src/main/java/Parser/OracleParser.java
@@ -95,7 +95,8 @@ public class OracleParser {
                     tokens.add(lexer.getTokens().get(j));
                     // Check () or REFERENCES other_table(other_column)
                     if (lexer.getTokens().get(j).hasType(Token.TokenType.KEYWORD) &&
-                            (lexer.getTokens().get(j).getValue().equalsIgnoreCase("REFERENCES") || lexer.getTokens().get(j).getValue().equalsIgnoreCase("CHECK"))) {
+                            (lexer.getTokens().get(j).getValue().equalsIgnoreCase("REFERENCES")
+                                    || lexer.getTokens().get(j).getValue().equalsIgnoreCase("CHECK"))) {
                         Stack<String> stack = new Stack<>();
                         for (int k = j + 1; k < lexer.getTokens().size(); k++) {
                             tokens.add(lexer.getTokens().get(k));
@@ -124,18 +125,63 @@ public class OracleParser {
                     if ((lexer.getTokens().get(j).hasType(Token.TokenType.SYMBOL) && lexer.getTokens().get(j).getValue().equals(",")) ||
                             (lexer.getTokens().get(j).hasType(Token.TokenType.SYMBOL) && lexer.getTokens().get(j).getValue().equals(")")) ) {
                         i = j;
-                        child.setConstraint(constraint);
                         break;
                     }
                 }
                 child.setTokens(tokens);
+                child.setConstraint(constraint);
                 currentNode.addChild(child);
                 currentNode = child;
             }
-            else if (lexer.getTokens().get(i).hasType(Token.TokenType.KEYWORD) && lexer.getTokens().get(i).getValue().equalsIgnoreCase("CONSTRAINT")) {
+            else if (lexer.getTokens().get(i).hasType(Token.TokenType.KEYWORD)
+                    && lexer.getTokens().get(i).getValue().equalsIgnoreCase("CONSTRAINT")) {
                 // Table constraint
                 tokens.clear();
                 tokens.add(lexer.getTokens().get(i));
+                for (int j = i + 1; j < lexer.getTokens().size(); j++) {
+                    tokens.add(lexer.getTokens().get(j));
+                    /**
+                     * CONSTRAINT pk_example PRIMARY KEY (column1, column2)
+                     * CONSTRAINT uk_example UNIQUE (column1)
+                     * CONSTRAINT fk_example FOREIGN KEY (column1) REFERENCES other_table(column2)
+                     * CONSTRAINT chk_example CHECK (column1 > 0)
+                     */
+                    if (lexer.getTokens().get(j).hasType(Token.TokenType.KEYWORD) &&
+                            (lexer.getTokens().get(j).getValue().equalsIgnoreCase("UNIQUE")
+                                    || lexer.getTokens().get(j).getValue().equalsIgnoreCase("CHECK")
+                                    || lexer.getTokens().get(j).getValue().equalsIgnoreCase("PRIMARY KEY")
+                                    || lexer.getTokens().get(j).getValue().equalsIgnoreCase("FOREIGN KEY")
+                                    || lexer.getTokens().get(j).getValue().equalsIgnoreCase("REFERENCES"))) {
+                        Stack<String> stack = new Stack<>();
+                        for (int k = j + 1; k < lexer.getTokens().size(); k++) {
+                            tokens.add(lexer.getTokens().get(k));
+                            if (lexer.getTokens().get(k).getValue().equals("(")) {
+                                stack.push("(");
+                                for (int t = k + 1; t < lexer.getTokens().size(); t++) {
+                                    tokens.add(lexer.getTokens().get(t));
+                                    if (lexer.getTokens().get(t).getValue().equals("(")) {
+                                        stack.push("(");
+                                    }
+                                    else if (lexer.getTokens().get(t).getValue().equals(")")) {
+                                        stack.pop();
+                                        if (stack.empty()) {
+                                            i = t;
+                                            j = t;
+                                            break;
+                                        }
+                                    }
+                                }
+                                break;
+                            }
+                        }
+                        continue;
+                    }
+                    if ((lexer.getTokens().get(j).hasType(Token.TokenType.SYMBOL) && lexer.getTokens().get(j).getValue().equals(",")) ||
+                            (lexer.getTokens().get(j).hasType(Token.TokenType.SYMBOL) && lexer.getTokens().get(j).getValue().equals(")")) ) {
+                        i = j;
+                        break;
+                    }
+                }
 
             }
             else {
-- 
Gitee


From fe03e497a9d74129054cfebf31d765c72215b0c2 Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Fri, 23 Aug 2024 23:07:06 +0800
Subject: [PATCH 014/113] add function

---
 sqlTranslate/.idea/workspace.xml              | 39 ++++++++++++-------
 .../src/main/java/Parser/AST/ASTNode.java     |  6 +++
 .../src/main/java/Parser/OracleParser.java    | 16 ++++----
 3 files changed, 41 insertions(+), 20 deletions(-)

diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
index c3f62bc4..34de1c72 100644
--- a/sqlTranslate/.idea/workspace.xml
+++ b/sqlTranslate/.idea/workspace.xml
@@ -6,7 +6,6 @@
   <component name="ChangeListManager">
     <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add function">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Main.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -40,18 +39,18 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "RunOnceActivity.OpenProjectViewOnStart": "true",
-    "RunOnceActivity.ShowReadmeOnStart": "true",
-    "SHARE_PROJECT_CONFIGURATION_FILES": "true",
-    "last_opened_file_path": "F:/oracle2opengauss/examples/sqlTranslate",
-    "project.structure.last.edited": "模块",
-    "project.structure.proportion": "0.0",
-    "project.structure.side.proportion": "0.0",
-    "settings.editor.selected.configurable": "build.tools"
+  <component name="PropertiesComponent">{
+  &quot;keyToString&quot;: {
+    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    &quot;SHARE_PROJECT_CONFIGURATION_FILES&quot;: &quot;true&quot;,
+    &quot;last_opened_file_path&quot;: &quot;F:/oracle2opengauss/examples/sqlTranslate&quot;,
+    &quot;project.structure.last.edited&quot;: &quot;模块&quot;,
+    &quot;project.structure.proportion&quot;: &quot;0.0&quot;,
+    &quot;project.structure.side.proportion&quot;: &quot;0.0&quot;,
+    &quot;settings.editor.selected.configurable&quot;: &quot;build.tools&quot;
   }
-}]]></component>
+}</component>
   <component name="RunManager" selected="应用程序.Main">
     <configuration name="App" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
       <option name="MAIN_CLASS_NAME" value="org.example.App" />
@@ -190,7 +189,14 @@
       <option name="project" value="LOCAL" />
       <updated>1724419179050</updated>
     </task>
-    <option name="localTasksCounter" value="13" />
+    <task id="LOCAL-00013" summary="add function">
+      <created>1724423798948</created>
+      <option name="number" value="00013" />
+      <option name="presentableId" value="LOCAL-00013" />
+      <option name="project" value="LOCAL" />
+      <updated>1724423798948</updated>
+    </task>
+    <option name="localTasksCounter" value="14" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
@@ -215,4 +221,11 @@
     <MESSAGE value="add function" />
     <option name="LAST_COMMIT_MESSAGE" value="add function" />
   </component>
+  <component name="XDebuggerManager">
+    <watches-manager>
+      <configuration name="Application">
+        <watch expression="((CreateTabNode)root).tokens" custom="Parser.AST.CreateTable.CreateTabNode" />
+      </configuration>
+    </watches-manager>
+  </component>
 </project>
\ No newline at end of file
diff --git a/sqlTranslate/src/main/java/Parser/AST/ASTNode.java b/sqlTranslate/src/main/java/Parser/AST/ASTNode.java
index 4f22066b..a68223ee 100644
--- a/sqlTranslate/src/main/java/Parser/AST/ASTNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/ASTNode.java
@@ -115,4 +115,10 @@ public abstract class ASTNode {
         }
         return str;
     }
+
+    public String getASTString() {
+        String str = "";
+        // TODO: implement
+        return str;
+    }
 }
diff --git a/sqlTranslate/src/main/java/Parser/OracleParser.java b/sqlTranslate/src/main/java/Parser/OracleParser.java
index caff544f..8c3c54cb 100644
--- a/sqlTranslate/src/main/java/Parser/OracleParser.java
+++ b/sqlTranslate/src/main/java/Parser/OracleParser.java
@@ -36,10 +36,12 @@ public class OracleParser {
         List <Token> tokens = new ArrayList<>();
         tokens.add(lexer.getTokens().get(0));
         ASTNode root = new CreateTabNode(tokens);
-        ASTNode currentNode = root;
+        ASTNode currentNode = null;
         for (int i = 1; i < lexer.getTokens().size(); i++) {
+//            System.out.println("Parsing the token: " + lexer.getTokens().get(i).getValue());
             if (i == 1 && lexer.getTokens().get(i).getValue().equalsIgnoreCase("TABLE")) {
-                tokens.clear();
+                tokens = new ArrayList<>();
+
                 tokens.add(lexer.getTokens().get(i));
                 try {
                     tokens.add(lexer.getTokens().get(i + 1));
@@ -53,14 +55,14 @@ public class OracleParser {
                 currentNode = child;
             }
             else if (i == 1 && !lexer.getTokens().get(i).getValue().equalsIgnoreCase("TABLE")){
-                tokens.clear();
+                tokens = new ArrayList<>();
                 tokens.add(lexer.getTokens().get(i));
                 for (int j = i + 1; j < lexer.getTokens().size(); j++) {
                     if (lexer.getTokens().get(j).getValue().equalsIgnoreCase("TABLE")) {
                         ASTNode child = new TableTypeNode(tokens);
                         root.addChild(child);
                         currentNode = child;
-                        tokens.clear();
+                        tokens = new ArrayList<>();
                         tokens.add(lexer.getTokens().get(j));
                         try {
                             tokens.add(lexer.getTokens().get(j + 1));
@@ -80,7 +82,7 @@ public class OracleParser {
             }
             else if (lexer.getTokens().get(i).hasType(Token.TokenType.IDENTIFIER)) {
                 // Token.TokenType.IDENTIFIER ... , -> column node
-                tokens.clear();
+                tokens = new ArrayList<>();
                 ColumnNode child = new ColumnNode();
                 child.setName(lexer.getTokens().get(i));
                 tokens.add(lexer.getTokens().get(i));
@@ -136,7 +138,7 @@ public class OracleParser {
             else if (lexer.getTokens().get(i).hasType(Token.TokenType.KEYWORD)
                     && lexer.getTokens().get(i).getValue().equalsIgnoreCase("CONSTRAINT")) {
                 // Table constraint
-                tokens.clear();
+                tokens = new ArrayList<>();
                 tokens.add(lexer.getTokens().get(i));
                 for (int j = i + 1; j < lexer.getTokens().size(); j++) {
                     tokens.add(lexer.getTokens().get(j));
@@ -185,7 +187,7 @@ public class OracleParser {
 
             }
             else {
-                throw new ParseFailedException("Parse failed!");
+//                throw new ParseFailedException("Parse failed!");
             }
         }
         return root;
-- 
Gitee


From 1d40557152f5a206e45a88933e9aa855eba6f1a5 Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Sat, 24 Aug 2024 12:01:19 +0800
Subject: [PATCH 015/113] add function

---
 sqlTranslate/.idea/workspace.xml              | 12 ++++++--
 .../src/main/java/Parser/AST/ASTNode.java     |  4 +++
 .../Parser/AST/CreateTable/ColumnNode.java    |  5 +++-
 .../AST/CreateTable/TableConstraintNode.java  |  5 +++-
 .../src/main/java/Parser/OracleParser.java    | 28 +++++++++++++------
 5 files changed, 42 insertions(+), 12 deletions(-)

diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
index 34de1c72..49395dcc 100644
--- a/sqlTranslate/.idea/workspace.xml
+++ b/sqlTranslate/.idea/workspace.xml
@@ -6,6 +6,8 @@
   <component name="ChangeListManager">
     <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add function">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/ASTNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/ASTNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/CreateTable/ColumnNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/CreateTable/ColumnNode.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -43,7 +45,6 @@
   &quot;keyToString&quot;: {
     &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
     &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
-    &quot;SHARE_PROJECT_CONFIGURATION_FILES&quot;: &quot;true&quot;,
     &quot;last_opened_file_path&quot;: &quot;F:/oracle2opengauss/examples/sqlTranslate&quot;,
     &quot;project.structure.last.edited&quot;: &quot;模块&quot;,
     &quot;project.structure.proportion&quot;: &quot;0.0&quot;,
@@ -196,7 +197,14 @@
       <option name="project" value="LOCAL" />
       <updated>1724423798948</updated>
     </task>
-    <option name="localTasksCounter" value="14" />
+    <task id="LOCAL-00014" summary="add function">
+      <created>1724425628008</created>
+      <option name="number" value="00014" />
+      <option name="presentableId" value="LOCAL-00014" />
+      <option name="project" value="LOCAL" />
+      <updated>1724425628008</updated>
+    </task>
+    <option name="localTasksCounter" value="15" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
diff --git a/sqlTranslate/src/main/java/Parser/AST/ASTNode.java b/sqlTranslate/src/main/java/Parser/AST/ASTNode.java
index a68223ee..ed5bfdc9 100644
--- a/sqlTranslate/src/main/java/Parser/AST/ASTNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/ASTNode.java
@@ -43,6 +43,10 @@ public abstract class ASTNode {
         return children;
     }
 
+    public boolean hasChild() {
+        return !children.isEmpty();
+    }
+
     public ASTNode getChildByName(String childName) {
         for (ASTNode child : children) {
             if (child.toString().equals(childName)) {
diff --git a/sqlTranslate/src/main/java/Parser/AST/CreateTable/ColumnNode.java b/sqlTranslate/src/main/java/Parser/AST/CreateTable/ColumnNode.java
index 39c77014..d5a7d431 100644
--- a/sqlTranslate/src/main/java/Parser/AST/CreateTable/ColumnNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/CreateTable/ColumnNode.java
@@ -23,7 +23,10 @@ public class ColumnNode extends ASTNode {
 
     public void visit(ASTNode node, StringBuilder queryString)
     {
-        queryString.append(toString() + " ");
+        if (node.hasChild() && !(node.getChildren().get(0) instanceof CRTEndNode) )
+            queryString.append(toString() + ", ");
+        else if (node.hasChild() && (node.getChildren().get(0) instanceof CRTEndNode))
+            queryString.append(toString() + " ");
         for (ASTNode child : getChildren())
         {
             child.visit(child, queryString);
diff --git a/sqlTranslate/src/main/java/Parser/AST/CreateTable/TableConstraintNode.java b/sqlTranslate/src/main/java/Parser/AST/CreateTable/TableConstraintNode.java
index d10d4126..7c370de0 100644
--- a/sqlTranslate/src/main/java/Parser/AST/CreateTable/TableConstraintNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/CreateTable/TableConstraintNode.java
@@ -17,7 +17,10 @@ public class TableConstraintNode extends ASTNode{
 
     public void visit(ASTNode node, StringBuilder queryString)
     {
-        queryString.append(toString() + " ");
+        if (node.hasChild() && !(node.getChildren().get(0) instanceof CRTEndNode) )
+            queryString.append(toString() + ", ");
+        else if (node.hasChild() && (node.getChildren().get(0) instanceof CRTEndNode))
+            queryString.append(toString() + " ");
         for (ASTNode child : getChildren())
         {
             child.visit(child, queryString);
diff --git a/sqlTranslate/src/main/java/Parser/OracleParser.java b/sqlTranslate/src/main/java/Parser/OracleParser.java
index 8c3c54cb..61a34e60 100644
--- a/sqlTranslate/src/main/java/Parser/OracleParser.java
+++ b/sqlTranslate/src/main/java/Parser/OracleParser.java
@@ -4,10 +4,8 @@ import Lexer.OracleLexer;
 import Lexer.Token;
 import Parser.AST.ASTNode;
 import Exception.ParseFailedException;
-import Parser.AST.CreateTable.ColumnNode;
-import Parser.AST.CreateTable.CreateTabNode;
-import Parser.AST.CreateTable.TableNode;
-import Parser.AST.CreateTable.TableTypeNode;
+import Parser.AST.CreateTable.*;
+
 import java.util.Stack;
 
 import java.util.ArrayList;
@@ -50,6 +48,7 @@ public class OracleParser {
                     throw new ParseFailedException("Parse failed!");
                 }
                 i++;
+                i++; // pass the "("
                 ASTNode child = new TableNode(tokens);
                 root.addChild(child);
                 currentNode = child;
@@ -70,7 +69,7 @@ public class OracleParser {
                         catch (ParseFailedException e) {
                             throw new ParseFailedException("Parse failed!");
                         }
-                        i = j + 1;
+                        i = j + 2; // pass the "("
                         break;
                     }
                     tokens.add(lexer.getTokens().get(j));
@@ -94,11 +93,11 @@ public class OracleParser {
                     else {
                         constraint.add(lexer.getTokens().get(j));
                     }
-                    tokens.add(lexer.getTokens().get(j));
                     // Check () or REFERENCES other_table(other_column)
                     if (lexer.getTokens().get(j).hasType(Token.TokenType.KEYWORD) &&
                             (lexer.getTokens().get(j).getValue().equalsIgnoreCase("REFERENCES")
                                     || lexer.getTokens().get(j).getValue().equalsIgnoreCase("CHECK"))) {
+                        tokens.add(lexer.getTokens().get(j));
                         Stack<String> stack = new Stack<>();
                         for (int k = j + 1; k < lexer.getTokens().size(); k++) {
                             tokens.add(lexer.getTokens().get(k));
@@ -129,6 +128,7 @@ public class OracleParser {
                         i = j;
                         break;
                     }
+                    tokens.add(lexer.getTokens().get(j));
                 }
                 child.setTokens(tokens);
                 child.setConstraint(constraint);
@@ -141,7 +141,6 @@ public class OracleParser {
                 tokens = new ArrayList<>();
                 tokens.add(lexer.getTokens().get(i));
                 for (int j = i + 1; j < lexer.getTokens().size(); j++) {
-                    tokens.add(lexer.getTokens().get(j));
                     /**
                      * CONSTRAINT pk_example PRIMARY KEY (column1, column2)
                      * CONSTRAINT uk_example UNIQUE (column1)
@@ -154,6 +153,7 @@ public class OracleParser {
                                     || lexer.getTokens().get(j).getValue().equalsIgnoreCase("PRIMARY KEY")
                                     || lexer.getTokens().get(j).getValue().equalsIgnoreCase("FOREIGN KEY")
                                     || lexer.getTokens().get(j).getValue().equalsIgnoreCase("REFERENCES"))) {
+                        tokens.add(lexer.getTokens().get(j));
                         Stack<String> stack = new Stack<>();
                         for (int k = j + 1; k < lexer.getTokens().size(); k++) {
                             tokens.add(lexer.getTokens().get(k));
@@ -183,11 +183,23 @@ public class OracleParser {
                         i = j;
                         break;
                     }
+                    tokens.add(lexer.getTokens().get(j));
                 }
 
             }
+            else if (lexer.getTokens().get(i).hasType(Token.TokenType.SYMBOL) && lexer.getTokens().get(i).getValue().equals(";")) {
+                tokens = new ArrayList<>();
+                tokens.add(lexer.getTokens().get(i));
+                ASTNode EndNode = new CRTEndNode(tokens);
+                currentNode.addChild(EndNode);
+                currentNode = EndNode;
+            }
+            else if (lexer.getTokens().get(i).hasType(Token.TokenType.EOF)) {
+                break;
+            }
             else {
-//                throw new ParseFailedException("Parse failed!");
+//                System.out.println("Fail to parse:" + lexer.getTokens().get(i).getValue());
+                throw new ParseFailedException("Parse failed!");
             }
         }
         return root;
-- 
Gitee


From 0245c1d0ed14a522fe4282a2b67f2837695fadae Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Sat, 24 Aug 2024 16:18:05 +0800
Subject: [PATCH 016/113] add function

---
 sqlTranslate/.idea/workspace.xml              | 12 +++++++---
 sqlTranslate/src/main/java/Main.java          |  1 +
 .../src/main/java/Parser/AST/ASTNode.java     | 23 ++++++++++++++++---
 3 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
index 49395dcc..f14b0abc 100644
--- a/sqlTranslate/.idea/workspace.xml
+++ b/sqlTranslate/.idea/workspace.xml
@@ -6,9 +6,8 @@
   <component name="ChangeListManager">
     <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add function">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Main.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/ASTNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/ASTNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/CreateTable/ColumnNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/CreateTable/ColumnNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -204,7 +203,14 @@
       <option name="project" value="LOCAL" />
       <updated>1724425628008</updated>
     </task>
-    <option name="localTasksCounter" value="15" />
+    <task id="LOCAL-00015" summary="add function">
+      <created>1724472081080</created>
+      <option name="number" value="00015" />
+      <option name="presentableId" value="LOCAL-00015" />
+      <option name="project" value="LOCAL" />
+      <updated>1724472081080</updated>
+    </task>
+    <option name="localTasksCounter" value="16" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
diff --git a/sqlTranslate/src/main/java/Main.java b/sqlTranslate/src/main/java/Main.java
index fc8e3791..c7211486 100644
--- a/sqlTranslate/src/main/java/Main.java
+++ b/sqlTranslate/src/main/java/Main.java
@@ -18,5 +18,6 @@ public class Main {
         OracleParser parser = new OracleParser(lexer);
         ASTNode root = parser.parse();
         System.out.println(root.toQueryString());
+        System.out.println(root.getASTString());
     }
 }
diff --git a/sqlTranslate/src/main/java/Parser/AST/ASTNode.java b/sqlTranslate/src/main/java/Parser/AST/ASTNode.java
index ed5bfdc9..5cc95157 100644
--- a/sqlTranslate/src/main/java/Parser/AST/ASTNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/ASTNode.java
@@ -121,8 +121,25 @@ public abstract class ASTNode {
     }
 
     public String getASTString() {
-        String str = "";
-        // TODO: implement
-        return str;
+        StringBuilder ASTString = new StringBuilder();
+        VisitAST(this, ASTString, 0);
+        return ASTString.toString();
+    }
+
+    private void VisitAST(ASTNode node, StringBuilder ASTString, int depth) {
+        addASTStructure(depth, ASTString);
+        ASTString.append(node.getClass() + ":" + node.toString() + "\n");
+        for (ASTNode child : node.getChildren()) {
+            if (child.getClass() == node.getClass())
+                VisitAST(child, ASTString, depth);
+            else
+                VisitAST(child, ASTString, depth + 1);
+        }
+    }
+
+    private void addASTStructure(int depth, StringBuilder ASTString) {
+        for (int i = 1; i <= depth; i++) {
+            ASTString.append("--");
+        }
     }
 }
-- 
Gitee


From c704d436aa3655b2c8589b79ad753f17bd0935fe Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Sat, 24 Aug 2024 21:38:20 +0800
Subject: [PATCH 017/113] coding

---
 sqlTranslate/.idea/workspace.xml              |  16 ++-
 .../src/main/java/Document/DataType in Oracle | 105 ++++++++++++++++++
 .../Exception/GenerateFailedException.java    |   8 ++
 .../java/Generator/OpenGaussGenerator.java    |  29 +++++
 sqlTranslate/src/main/java/Main.java          |   3 +
 .../Parser/AST/CreateTable/ColumnNode.java    |  11 ++
 6 files changed, 169 insertions(+), 3 deletions(-)
 create mode 100644 sqlTranslate/src/main/java/Document/DataType in Oracle
 create mode 100644 sqlTranslate/src/main/java/Exception/GenerateFailedException.java

diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
index f14b0abc..80640972 100644
--- a/sqlTranslate/.idea/workspace.xml
+++ b/sqlTranslate/.idea/workspace.xml
@@ -5,9 +5,12 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add function">
+      <change afterPath="$PROJECT_DIR$/src/main/java/Document/DataType in Oracle" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/Exception/GenerateFailedException.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Generator/OpenGaussGenerator.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Generator/OpenGaussGenerator.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Main.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/ASTNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/ASTNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/CreateTable/ColumnNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/CreateTable/ColumnNode.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -17,8 +20,8 @@
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
       <list>
-        <option value="Class" />
         <option value="Interface" />
+        <option value="Class" />
       </list>
     </option>
   </component>
@@ -210,7 +213,14 @@
       <option name="project" value="LOCAL" />
       <updated>1724472081080</updated>
     </task>
-    <option name="localTasksCounter" value="16" />
+    <task id="LOCAL-00016" summary="add function">
+      <created>1724487486717</created>
+      <option name="number" value="00016" />
+      <option name="presentableId" value="LOCAL-00016" />
+      <option name="project" value="LOCAL" />
+      <updated>1724487486717</updated>
+    </task>
+    <option name="localTasksCounter" value="17" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
diff --git a/sqlTranslate/src/main/java/Document/DataType in Oracle b/sqlTranslate/src/main/java/Document/DataType in Oracle
new file mode 100644
index 00000000..787d70a8
--- /dev/null
+++ b/sqlTranslate/src/main/java/Document/DataType in Oracle	
@@ -0,0 +1,105 @@
+数值类型
+    NUMBER
+        用于存储整数或浮点数。
+        可以指定精度（总位数）和小数位数。
+        示例：NUMBER(10, 2) 表示一个最多有 10 位数字的数，其中 2 位是小数位。
+    INTEGER
+        用于存储整数。
+        等价于 NUMBER 但默认没有精度限制。
+        示例：INTEGER
+    SMALLINT
+        用于存储较小的整数。
+        等价于 INTEGER 但默认范围更小。
+        示例：SMALLINT
+    BINARY_INTEGER
+        用于存储整数。
+        通常用于内部使用，而不是直接在表定义中使用。
+        示例：BINARY_INTEGER
+    DECIMAL
+        等价于 NUMBER。
+        示例：DECIMAL(10, 2)
+    REAL
+        用于存储单精度浮点数。
+        示例：REAL
+    FLOAT
+        用于存储双精度浮点数。
+        可以指定精度。
+        示例：FLOAT(128)
+    DOUBLE PRECISION
+        用于存储双精度浮点数。
+        示例：DOUBLE PRECISION
+
+字符串类型
+    CHAR
+        用于存储固定长度的字符串。
+        示例：CHAR(20)
+    VARCHAR2
+        用于存储可变长度的字符串。
+        最大长度为 4000 字节（在早期版本中）或 32767 字节（从 Oracle 12c 开始）。
+        示例：VARCHAR2(255)
+    NCHAR
+        用于存储固定长度的 Unicode 字符串。
+        示例：NCHAR(20)
+    NVARCHAR2
+        用于存储可变长度的 Unicode 字符串。
+        示例：NVARCHAR2(255)
+    CLOB
+        用于存储大文本块。
+        示例：CLOB
+    NCLOB
+        用于存储大 Unicode 文本块。
+        示例：NCLOB
+
+日期/时间类型
+    DATE
+        用于存储日期和时间信息。
+        包括年、月、日、小时、分钟和秒。
+        示例：DATE
+    TIMESTAMP
+        用于存储日期和时间信息。
+        可以包含毫秒。
+        示例：TIMESTAMP
+    TIMESTAMP WITH TIME ZONE
+        用于存储日期和时间信息，包括时区。
+        示例：TIMESTAMP WITH TIME ZONE
+    TIMESTAMP WITH LOCAL TIME ZONE
+        用于存储日期和时间信息，按照本地时区显示。
+        示例：TIMESTAMP WITH LOCAL TIME ZONE
+
+二进制类型
+    BLOB
+        用于存储大二进制对象，如图像或文件。
+        示例：BLOB
+    RAW
+        用于存储固定长度的二进制数据。
+        示例：RAW(2000)
+    LONG RAW
+        用于存储长二进制数据。
+        最大长度为 2GB。
+        示例：LONG RAW
+
+特殊类型
+    BOOLEAN
+        用于存储布尔值 TRUE, FALSE 或 NULL。
+        从 Oracle 12c 开始支持。
+    INTERVAL YEAR TO MONTH
+        用于存储年份到月份的时间间隔。
+        示例：INTERVAL YEAR TO MONTH
+    INTERVAL DAY TO SECOND
+        用于存储天到秒的时间间隔。
+        示例：INTERVAL DAY TO SECOND
+    ROWID
+        用于存储行标识符。
+        示例：ROWID
+    UROWID
+        用于存储统一行标识符。
+        示例：UROWID
+    REF
+        用于存储对另一个表的引用。
+        示例：REF <typename>
+    OBJECT
+        用于存储用户定义的对象类型。
+        示例：OBJECT (attr1 NUMBER, attr2 VARCHAR2(50))
+    REF CURSOR
+        用于存储游标引用。
+        示例：REF CURSOR
\ No newline at end of file
diff --git a/sqlTranslate/src/main/java/Exception/GenerateFailedException.java b/sqlTranslate/src/main/java/Exception/GenerateFailedException.java
new file mode 100644
index 00000000..181b987c
--- /dev/null
+++ b/sqlTranslate/src/main/java/Exception/GenerateFailedException.java
@@ -0,0 +1,8 @@
+package Exception;
+
+public class GenerateFailedException extends RuntimeException{
+    public GenerateFailedException(String message)
+    {
+        super(message);
+    }
+}
diff --git a/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java b/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java
index fe661260..07e4b15f 100644
--- a/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java
+++ b/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java
@@ -1,6 +1,9 @@
 package Generator;
 
 import Parser.AST.ASTNode;
+import Parser.AST.CreateTable.ColumnNode;
+import Parser.AST.CreateTable.CreateTabNode;
+import Exception.GenerateFailedException;
 
 public class OpenGaussGenerator {
     private ASTNode node;
@@ -8,6 +11,32 @@ public class OpenGaussGenerator {
         this.node = node;
     }
     public String generate() {
+        if (node instanceof CreateTabNode) {
+            return GenCreatTableSQL(node);
+        }
+        else {
+            throw new GenerateFailedException("Root node:" + node.getClass() + "(Unsupported node type!)");
+        }
+    }
+
+    private String GenCreatTableSQL(ASTNode node) {
+        // type convert
+        visit(node);
         return node.toQueryString();
     }
+
+    private void visit(ASTNode node) {
+        if (node instanceof ColumnNode) {
+            ColumnTypeConvert((ColumnNode) node);
+        }
+        for (ASTNode child : node.getChildren()) {
+            visit(child);
+        }
+    }
+
+    private void ColumnTypeConvert(ColumnNode node) {
+        if (node.getType().getValue().equalsIgnoreCase("")) {
+
+        }
+    }
 }
diff --git a/sqlTranslate/src/main/java/Main.java b/sqlTranslate/src/main/java/Main.java
index c7211486..b5356333 100644
--- a/sqlTranslate/src/main/java/Main.java
+++ b/sqlTranslate/src/main/java/Main.java
@@ -1,4 +1,5 @@
 
+import Generator.OpenGaussGenerator;
 import Lexer.OracleLexer;
 import Parser.AST.ASTNode;
 import Parser.OracleParser;
@@ -19,5 +20,7 @@ public class Main {
         ASTNode root = parser.parse();
         System.out.println(root.toQueryString());
         System.out.println(root.getASTString());
+        OpenGaussGenerator generator = new OpenGaussGenerator(root);
+        System.out.println(generator.generate());
     }
 }
diff --git a/sqlTranslate/src/main/java/Parser/AST/CreateTable/ColumnNode.java b/sqlTranslate/src/main/java/Parser/AST/CreateTable/ColumnNode.java
index d5a7d431..bd0155ef 100644
--- a/sqlTranslate/src/main/java/Parser/AST/CreateTable/ColumnNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/CreateTable/ColumnNode.java
@@ -3,6 +3,7 @@ package Parser.AST.CreateTable;
 import Lexer.Token;
 import Parser.AST.ASTNode;
 
+import java.util.ArrayList;
 import java.util.List;
 
 public class ColumnNode extends ASTNode {
@@ -57,4 +58,14 @@ public class ColumnNode extends ASTNode {
         this.constraint = constraint;
     }
 
+    public void ResetTokensbyNameTypeConstraint() {
+        List <Token> tokens = new ArrayList<>();
+        tokens.add(name);
+        tokens.add(type);
+        for (Token token : constraint) {
+            tokens.add(token);
+        }
+        setTokens(tokens);
+    }
+
 }
-- 
Gitee


From e0a1c67c1bf9578c6941568a7fe55977e70d3c35 Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Sat, 24 Aug 2024 21:47:06 +0800
Subject: [PATCH 018/113] coding

---
 sqlTranslate/.idea/workspace.xml              | 45 +++++++++++--------
 .../java/Document/Column constraint in Oracle | 18 ++++++++
 .../java/Document/Table constraint in Oracle  | 14 ++++++
 3 files changed, 59 insertions(+), 18 deletions(-)
 create mode 100644 sqlTranslate/src/main/java/Document/Column constraint in Oracle
 create mode 100644 sqlTranslate/src/main/java/Document/Table constraint in Oracle

diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
index 80640972..f9e6e2cd 100644
--- a/sqlTranslate/.idea/workspace.xml
+++ b/sqlTranslate/.idea/workspace.xml
@@ -4,13 +4,10 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add function">
-      <change afterPath="$PROJECT_DIR$/src/main/java/Document/DataType in Oracle" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/Exception/GenerateFailedException.java" afterDir="false" />
+    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="coding">
+      <change afterPath="$PROJECT_DIR$/src/main/java/Document/Column constraint in Oracle" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/Document/Table constraint in Oracle" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Generator/OpenGaussGenerator.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Generator/OpenGaussGenerator.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Main.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/CreateTable/ColumnNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/CreateTable/ColumnNode.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -43,17 +40,17 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent">{
-  &quot;keyToString&quot;: {
-    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
-    &quot;last_opened_file_path&quot;: &quot;F:/oracle2opengauss/examples/sqlTranslate&quot;,
-    &quot;project.structure.last.edited&quot;: &quot;模块&quot;,
-    &quot;project.structure.proportion&quot;: &quot;0.0&quot;,
-    &quot;project.structure.side.proportion&quot;: &quot;0.0&quot;,
-    &quot;settings.editor.selected.configurable&quot;: &quot;build.tools&quot;
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "RunOnceActivity.OpenProjectViewOnStart": "true",
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "last_opened_file_path": "F:/oracle2opengauss/examples/sqlTranslate",
+    "project.structure.last.edited": "模块",
+    "project.structure.proportion": "0.0",
+    "project.structure.side.proportion": "0.0",
+    "settings.editor.selected.configurable": "preferences.fileTypes"
   }
-}</component>
+}]]></component>
   <component name="RunManager" selected="应用程序.Main">
     <configuration name="App" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
       <option name="MAIN_CLASS_NAME" value="org.example.App" />
@@ -220,7 +217,14 @@
       <option name="project" value="LOCAL" />
       <updated>1724487486717</updated>
     </task>
-    <option name="localTasksCounter" value="17" />
+    <task id="LOCAL-00017" summary="coding">
+      <created>1724506701566</created>
+      <option name="number" value="00017" />
+      <option name="presentableId" value="LOCAL-00017" />
+      <option name="project" value="LOCAL" />
+      <updated>1724506701566</updated>
+    </task>
+    <option name="localTasksCounter" value="18" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
@@ -243,7 +247,8 @@
     <MESSAGE value="revise" />
     <MESSAGE value="add parser function" />
     <MESSAGE value="add function" />
-    <option name="LAST_COMMIT_MESSAGE" value="add function" />
+    <MESSAGE value="coding" />
+    <option name="LAST_COMMIT_MESSAGE" value="coding" />
   </component>
   <component name="XDebuggerManager">
     <watches-manager>
@@ -252,4 +257,8 @@
       </configuration>
     </watches-manager>
   </component>
+  <component name="XSLT-Support.FileAssociations.UIState">
+    <expand />
+    <select />
+  </component>
 </project>
\ No newline at end of file
diff --git a/sqlTranslate/src/main/java/Document/Column constraint in Oracle b/sqlTranslate/src/main/java/Document/Column constraint in Oracle
new file mode 100644
index 00000000..4afc4c07
--- /dev/null
+++ b/sqlTranslate/src/main/java/Document/Column constraint in Oracle	
@@ -0,0 +1,18 @@
+NOT NULL
+    用于指定某列不允许为空。
+    示例：column_name VARCHAR2(50) NOT NULL
+PRIMARY KEY
+    用于指定某列为表的主键，主键列必须唯一且不能为空。
+    示例：column_name NUMBER(10) PRIMARY KEY
+UNIQUE
+    用于指定某列的值必须是唯一的，但允许为空。
+    示例：column_name VARCHAR2(50) UNIQUE
+CHECK
+    用于指定某列上的值必须满足一个条件。
+    示例：column_name NUMBER CHECK (column_name > 0)
+FOREIGN KEY
+    用于定义外键约束，外键引用另一个表的主键或唯一键。
+    示例：column_name NUMBER(10) REFERENCES other_table(other_column)
+DEFAULT
+    用于指定某列如果没有给定值时的默认值。
+    示例：column_name VARCHAR2(50) DEFAULT 'default_value'
\ No newline at end of file
diff --git a/sqlTranslate/src/main/java/Document/Table constraint in Oracle b/sqlTranslate/src/main/java/Document/Table constraint in Oracle
new file mode 100644
index 00000000..2b046205
--- /dev/null
+++ b/sqlTranslate/src/main/java/Document/Table constraint in Oracle	
@@ -0,0 +1,14 @@
+PRIMARY KEY
+    用于定义表的主键，主键列必须唯一且不能为空。
+    可以定义单个列或多个列作为复合主键。
+    示例：CONSTRAINT pk_example PRIMARY KEY (column1, column2)
+UNIQUE
+    用于定义列的唯一性约束，允许为空。
+    可以定义在单个列或多列上。
+    示例：CONSTRAINT uk_example UNIQUE (column1)
+FOREIGN KEY
+    用于定义外键约束，外键引用另一个表的主键或唯一键。
+    示例：CONSTRAINT fk_example FOREIGN KEY (column1) REFERENCES other_table(column2)
+CHECK
+    用于定义整个表的一个或多个列上的约束条件。
+    示例：CONSTRAINT chk_example CHECK (column1 > 0)
\ No newline at end of file
-- 
Gitee


From d3779f8b3cf52147e35a1da79259a5b19ce4e21c Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Sat, 24 Aug 2024 22:34:53 +0800
Subject: [PATCH 019/113] coding

---
 sqlTranslate/.idea/workspace.xml                   | 14 +++++++++++---
 .../main/java/Generator/OpenGaussGenerator.java    |  6 ++++--
 sqlTranslate/src/main/java/Main.java               |  2 +-
 .../src/main/java/Parser/OracleParser.java         |  6 +++---
 4 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
index f9e6e2cd..43b9a0ac 100644
--- a/sqlTranslate/.idea/workspace.xml
+++ b/sqlTranslate/.idea/workspace.xml
@@ -5,9 +5,10 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="coding">
-      <change afterPath="$PROJECT_DIR$/src/main/java/Document/Column constraint in Oracle" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/Document/Table constraint in Oracle" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Generator/OpenGaussGenerator.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Generator/OpenGaussGenerator.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Main.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -224,7 +225,14 @@
       <option name="project" value="LOCAL" />
       <updated>1724506701566</updated>
     </task>
-    <option name="localTasksCounter" value="18" />
+    <task id="LOCAL-00018" summary="coding">
+      <created>1724507228242</created>
+      <option name="number" value="00018" />
+      <option name="presentableId" value="LOCAL-00018" />
+      <option name="project" value="LOCAL" />
+      <updated>1724507228242</updated>
+    </task>
+    <option name="localTasksCounter" value="19" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
diff --git a/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java b/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java
index 07e4b15f..ff0aa05c 100644
--- a/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java
+++ b/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java
@@ -1,5 +1,6 @@
 package Generator;
 
+import Lexer.Token;
 import Parser.AST.ASTNode;
 import Parser.AST.CreateTable.ColumnNode;
 import Parser.AST.CreateTable.CreateTabNode;
@@ -35,8 +36,9 @@ public class OpenGaussGenerator {
     }
 
     private void ColumnTypeConvert(ColumnNode node) {
-        if (node.getType().getValue().equalsIgnoreCase("")) {
-
+        if (node.getType().getValue().equalsIgnoreCase("NUMBER")) {
+            node.setType(new Token(Token.TokenType.KEYWORD, "NUMERIC"));
+            node.ResetTokensbyNameTypeConstraint();
         }
     }
 }
diff --git a/sqlTranslate/src/main/java/Main.java b/sqlTranslate/src/main/java/Main.java
index b5356333..f7097627 100644
--- a/sqlTranslate/src/main/java/Main.java
+++ b/sqlTranslate/src/main/java/Main.java
@@ -8,7 +8,7 @@ import Parser.OracleParser;
 public class Main {
     public static void main(String[] args) {
         String sql = "CREATE TABLE employees (\n" +
-                "    employee_id NUMBER(6) PRIMARY KEY,\n" +
+                "    employee_id NUMBER PRIMARY KEY,\n" +
                 "    first_name VARCHAR2(20),\n" +
                 "    last_name VARCHAR2(25),\n" +
                 "    email VARCHAR2(25),\n" +
diff --git a/sqlTranslate/src/main/java/Parser/OracleParser.java b/sqlTranslate/src/main/java/Parser/OracleParser.java
index 61a34e60..472b62f4 100644
--- a/sqlTranslate/src/main/java/Parser/OracleParser.java
+++ b/sqlTranslate/src/main/java/Parser/OracleParser.java
@@ -90,9 +90,6 @@ public class OracleParser {
                     if (j == i + 1) {
                         child.setType(lexer.getTokens().get(j));
                     }
-                    else {
-                        constraint.add(lexer.getTokens().get(j));
-                    }
                     // Check () or REFERENCES other_table(other_column)
                     if (lexer.getTokens().get(j).hasType(Token.TokenType.KEYWORD) &&
                             (lexer.getTokens().get(j).getValue().equalsIgnoreCase("REFERENCES")
@@ -129,6 +126,9 @@ public class OracleParser {
                         break;
                     }
                     tokens.add(lexer.getTokens().get(j));
+                    if (j != i + 1) {
+                        constraint.add(lexer.getTokens().get(j));
+                    }
                 }
                 child.setTokens(tokens);
                 child.setConstraint(constraint);
-- 
Gitee


From 62dfa6da61760e3e3bb54ba0b64b3392a65d5699 Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Sat, 24 Aug 2024 23:00:19 +0800
Subject: [PATCH 020/113] finish the framework of sqltranslate (createTab sql
 is now being supported!)

---
 sqlTranslate/.idea/workspace.xml              | 11 ++-
 .../java/Generator/OpenGaussGenerator.java    | 72 +++++++++++++++++++
 2 files changed, 80 insertions(+), 3 deletions(-)

diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
index 43b9a0ac..c3343419 100644
--- a/sqlTranslate/.idea/workspace.xml
+++ b/sqlTranslate/.idea/workspace.xml
@@ -7,8 +7,6 @@
     <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="coding">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/Generator/OpenGaussGenerator.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Generator/OpenGaussGenerator.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Main.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -232,7 +230,14 @@
       <option name="project" value="LOCAL" />
       <updated>1724507228242</updated>
     </task>
-    <option name="localTasksCounter" value="19" />
+    <task id="LOCAL-00019" summary="coding">
+      <created>1724510094392</created>
+      <option name="number" value="00019" />
+      <option name="presentableId" value="LOCAL-00019" />
+      <option name="project" value="LOCAL" />
+      <updated>1724510094392</updated>
+    </task>
+    <option name="localTasksCounter" value="20" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
diff --git a/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java b/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java
index ff0aa05c..d9eac9a3 100644
--- a/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java
+++ b/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java
@@ -36,9 +36,81 @@ public class OpenGaussGenerator {
     }
 
     private void ColumnTypeConvert(ColumnNode node) {
+        // type convert
         if (node.getType().getValue().equalsIgnoreCase("NUMBER")) {
             node.setType(new Token(Token.TokenType.KEYWORD, "NUMERIC"));
             node.ResetTokensbyNameTypeConstraint();
         }
+        if (node.getType().getValue().matches("(?i)NUMBER\\(.*?\\)")) {
+            node.setType(new Token(Token.TokenType.KEYWORD, node.getType().getValue().replace("NUMBER", "DECIMAL")));
+            node.ResetTokensbyNameTypeConstraint();
+        }
+
+        if (node.getType().getValue().equalsIgnoreCase("VARCHAR2")) {
+            node.setType(new Token(Token.TokenType.KEYWORD, "VARCHAR"));
+            node.ResetTokensbyNameTypeConstraint();
+        }
+        if (node.getType().getValue().matches("(?i)VARCHAR2\\(.*?\\)")) {
+            node.setType(new Token(Token.TokenType.KEYWORD, node.getType().getValue().replace("VARCHAR2", "VARCHAR")));
+            node.ResetTokensbyNameTypeConstraint();
+        }
+
+        if (node.getType().getValue().equalsIgnoreCase("RAW")) {
+            node.setType(new Token(Token.TokenType.KEYWORD, "BYTEA"));
+            node.ResetTokensbyNameTypeConstraint();
+        }
+        if (node.getType().getValue().matches("(?i)RAW\\(.*?\\)")) {
+            node.setType(new Token(Token.TokenType.KEYWORD, node.getType().getValue().replace("RAW", "BYTEA")));
+            node.ResetTokensbyNameTypeConstraint();
+        }
+
+        if (node.getType().getValue().equalsIgnoreCase("BINARY_INTEGER")) {
+            node.setType(new Token(Token.TokenType.KEYWORD, "INTEGER"));
+            node.ResetTokensbyNameTypeConstraint();
+        }
+
+        if (node.getType().getValue().equalsIgnoreCase("NCHAR")) {
+            node.setType(new Token(Token.TokenType.KEYWORD, "VARCHAR"));
+            node.ResetTokensbyNameTypeConstraint();
+        }
+        if (node.getType().getValue().matches("(?i)NCHAR\\(.*?\\)")) {
+            node.setType(new Token(Token.TokenType.KEYWORD, node.getType().getValue().replace("NCHAR", "VARCHAR")));
+            node.ResetTokensbyNameTypeConstraint();
+        }
+
+        if (node.getType().getValue().equalsIgnoreCase("NVARCHAR2")) {
+            node.setType(new Token(Token.TokenType.KEYWORD, "VARCHAR"));
+            node.ResetTokensbyNameTypeConstraint();
+        }
+        if (node.getType().getValue().matches("(?i)NVARCHAR2\\(.*?\\)")) {
+            node.setType(new Token(Token.TokenType.KEYWORD, node.getType().getValue().replace("NVARCHAR2", "VARCHAR")));
+            node.ResetTokensbyNameTypeConstraint();
+        }
+
+        if (node.getType().getValue().equalsIgnoreCase("NCLOB")) {
+            node.setType(new Token(Token.TokenType.KEYWORD, "TEXT"));
+            node.ResetTokensbyNameTypeConstraint();
+        }
+
+        if (node.getType().getValue().equalsIgnoreCase("INTERVAL YEAR TO MONTH")) {
+            node.setType(new Token(Token.TokenType.KEYWORD, "INTERVAL"));
+            node.ResetTokensbyNameTypeConstraint();
+        }
+
+        if (node.getType().getValue().equalsIgnoreCase("INTERVAL DAY TO SECOND")) {
+            node.setType(new Token(Token.TokenType.KEYWORD, "INTERVAL"));
+            node.ResetTokensbyNameTypeConstraint();
+        }
+
+        // Impossible to convert
+        if (
+                node.getType().getValue().equalsIgnoreCase("TIMESTAMP WITH LOCAL TIME ZONE") ||
+                        node.getType().getValue().equalsIgnoreCase("LONG RAW") ||
+                        node.getType().getValue().equalsIgnoreCase("ROWID") ||
+                        node.getType().getValue().equalsIgnoreCase("UROWID") ||
+                        node.getType().getValue().equalsIgnoreCase("REF CURSOR")
+        ) {
+            throw new GenerateFailedException("Unsupported type:" + node.getType().getValue() + "(OpenGauss doesn't support the keyword -- " + node.getType().getValue() + " or have any expression that keeps the same semantic!)");
+        }
     }
 }
-- 
Gitee


From 9b7a3bb85f65478858efed682ed757944a6806f1 Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Sat, 31 Aug 2024 23:11:10 +0800
Subject: [PATCH 021/113] add insert sql

---
 sqlTranslate/.idea/workspace.xml              | 40 ++++++++++++-------
 .../Parser/AST/CreateTable/CreateTabNode.java |  1 -
 .../Parser/AST/Insert/InsertDataNode.java     |  4 ++
 .../java/Parser/AST/Insert/InsertEndNode.java |  4 ++
 .../java/Parser/AST/Insert/InsertNode.java    | 23 +++++++++++
 .../java/Parser/AST/Insert/InsertObjNode.java |  4 ++
 6 files changed, 61 insertions(+), 15 deletions(-)
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/Insert/InsertDataNode.java
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/Insert/InsertEndNode.java
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/Insert/InsertNode.java
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/Insert/InsertObjNode.java

diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
index c3343419..be8738ec 100644
--- a/sqlTranslate/.idea/workspace.xml
+++ b/sqlTranslate/.idea/workspace.xml
@@ -4,9 +4,13 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="coding">
+    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="finish the framework of sqltranslate (createTab sql is now being supported!)">
+      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Insert/InsertDataNode.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Insert/InsertEndNode.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Insert/InsertNode.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Insert/InsertObjNode.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Generator/OpenGaussGenerator.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Generator/OpenGaussGenerator.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/CreateTable/CreateTabNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/CreateTable/CreateTabNode.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -39,17 +43,17 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "RunOnceActivity.OpenProjectViewOnStart": "true",
-    "RunOnceActivity.ShowReadmeOnStart": "true",
-    "last_opened_file_path": "F:/oracle2opengauss/examples/sqlTranslate",
-    "project.structure.last.edited": "模块",
-    "project.structure.proportion": "0.0",
-    "project.structure.side.proportion": "0.0",
-    "settings.editor.selected.configurable": "preferences.fileTypes"
+  <component name="PropertiesComponent">{
+  &quot;keyToString&quot;: {
+    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    &quot;last_opened_file_path&quot;: &quot;F:/oracle2opengauss/examples/sqlTranslate&quot;,
+    &quot;project.structure.last.edited&quot;: &quot;模块&quot;,
+    &quot;project.structure.proportion&quot;: &quot;0.0&quot;,
+    &quot;project.structure.side.proportion&quot;: &quot;0.0&quot;,
+    &quot;settings.editor.selected.configurable&quot;: &quot;preferences.fileTypes&quot;
   }
-}]]></component>
+}</component>
   <component name="RunManager" selected="应用程序.Main">
     <configuration name="App" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
       <option name="MAIN_CLASS_NAME" value="org.example.App" />
@@ -237,7 +241,14 @@
       <option name="project" value="LOCAL" />
       <updated>1724510094392</updated>
     </task>
-    <option name="localTasksCounter" value="20" />
+    <task id="LOCAL-00020" summary="finish the framework of sqltranslate (createTab sql is now being supported!)">
+      <created>1724511620952</created>
+      <option name="number" value="00020" />
+      <option name="presentableId" value="LOCAL-00020" />
+      <option name="project" value="LOCAL" />
+      <updated>1724511620952</updated>
+    </task>
+    <option name="localTasksCounter" value="21" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
@@ -261,7 +272,8 @@
     <MESSAGE value="add parser function" />
     <MESSAGE value="add function" />
     <MESSAGE value="coding" />
-    <option name="LAST_COMMIT_MESSAGE" value="coding" />
+    <MESSAGE value="finish the framework of sqltranslate (createTab sql is now being supported!)" />
+    <option name="LAST_COMMIT_MESSAGE" value="finish the framework of sqltranslate (createTab sql is now being supported!)" />
   </component>
   <component name="XDebuggerManager">
     <watches-manager>
diff --git a/sqlTranslate/src/main/java/Parser/AST/CreateTable/CreateTabNode.java b/sqlTranslate/src/main/java/Parser/AST/CreateTable/CreateTabNode.java
index 5fbc3006..afc7feb0 100644
--- a/sqlTranslate/src/main/java/Parser/AST/CreateTable/CreateTabNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/CreateTable/CreateTabNode.java
@@ -8,7 +8,6 @@ public class CreateTabNode extends ASTNode {
     public CreateTabNode(ASTNode node) {
         super(node);
     }
-
     public CreateTabNode(List<Token> tokens) {
         super(tokens);
     }
diff --git a/sqlTranslate/src/main/java/Parser/AST/Insert/InsertDataNode.java b/sqlTranslate/src/main/java/Parser/AST/Insert/InsertDataNode.java
new file mode 100644
index 00000000..ac8d7e68
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/Insert/InsertDataNode.java
@@ -0,0 +1,4 @@
+package Parser.AST.Insert;
+
+public class InsertDataNode {
+}
diff --git a/sqlTranslate/src/main/java/Parser/AST/Insert/InsertEndNode.java b/sqlTranslate/src/main/java/Parser/AST/Insert/InsertEndNode.java
new file mode 100644
index 00000000..bc50d6ae
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/Insert/InsertEndNode.java
@@ -0,0 +1,4 @@
+package Parser.AST.Insert;
+
+public class InsertEndNode {
+}
diff --git a/sqlTranslate/src/main/java/Parser/AST/Insert/InsertNode.java b/sqlTranslate/src/main/java/Parser/AST/Insert/InsertNode.java
new file mode 100644
index 00000000..ea961887
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/Insert/InsertNode.java
@@ -0,0 +1,23 @@
+package Parser.AST.Insert;
+
+import Lexer.Token;
+import Parser.AST.ASTNode;
+import java.util.List;
+
+public class InsertNode extends ASTNode {
+    public InsertNode(List<Token> tokens)
+    {
+        super(tokens);
+    }
+
+    public InsertNode(ASTNode node)
+    {
+        super(node);
+    }
+
+    public void visit(ASTNode node, StringBuilder queryString)
+    {
+        queryString.append("INSERT INTO ");
+
+    }
+}
diff --git a/sqlTranslate/src/main/java/Parser/AST/Insert/InsertObjNode.java b/sqlTranslate/src/main/java/Parser/AST/Insert/InsertObjNode.java
new file mode 100644
index 00000000..9bf37ad8
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/Insert/InsertObjNode.java
@@ -0,0 +1,4 @@
+package Parser.AST.Insert;
+
+public class InsertObjNode {
+}
-- 
Gitee


From 12ff94828e412b47672262afa7a352eb8f8e1c8d Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Mon, 9 Sep 2024 20:31:54 +0800
Subject: [PATCH 022/113] add insert sql

---
 sqlTranslate/.idea/workspace.xml              | 28 +++++---
 .../java/Document/Select statement in Oracle  |  2 +
 .../java/Generator/OpenGaussGenerator.java    | 15 +++-
 .../src/main/java/Lexer/OracleLexer.java      |  2 +-
 sqlTranslate/src/main/java/Main.java          | 15 ++--
 .../Parser/AST/Insert/InsertDataNode.java     | 21 +++++-
 .../java/Parser/AST/Insert/InsertEndNode.java | 22 +++++-
 .../java/Parser/AST/Insert/InsertNode.java    |  7 +-
 .../java/Parser/AST/Insert/InsertObjNode.java | 21 +++++-
 .../src/main/java/Parser/OracleParser.java    | 69 +++++++++++++++++++
 10 files changed, 179 insertions(+), 23 deletions(-)
 create mode 100644 sqlTranslate/src/main/java/Document/Select statement in Oracle

diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
index be8738ec..f6da9c59 100644
--- a/sqlTranslate/.idea/workspace.xml
+++ b/sqlTranslate/.idea/workspace.xml
@@ -4,13 +4,17 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="finish the framework of sqltranslate (createTab sql is now being supported!)">
-      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Insert/InsertDataNode.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Insert/InsertEndNode.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Insert/InsertNode.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Insert/InsertObjNode.java" afterDir="false" />
+    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add insert sql">
+      <change afterPath="$PROJECT_DIR$/src/main/java/Document/Select statement in Oracle" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/CreateTable/CreateTabNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/CreateTable/CreateTabNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Generator/OpenGaussGenerator.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Generator/OpenGaussGenerator.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Lexer/OracleLexer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Lexer/OracleLexer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Main.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Insert/InsertDataNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Insert/InsertDataNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Insert/InsertEndNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Insert/InsertEndNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Insert/InsertNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Insert/InsertNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Insert/InsertObjNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Insert/InsertObjNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -248,7 +252,14 @@
       <option name="project" value="LOCAL" />
       <updated>1724511620952</updated>
     </task>
-    <option name="localTasksCounter" value="21" />
+    <task id="LOCAL-00021" summary="add insert sql">
+      <created>1725117071687</created>
+      <option name="number" value="00021" />
+      <option name="presentableId" value="LOCAL-00021" />
+      <option name="project" value="LOCAL" />
+      <updated>1725117071687</updated>
+    </task>
+    <option name="localTasksCounter" value="22" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
@@ -273,7 +284,8 @@
     <MESSAGE value="add function" />
     <MESSAGE value="coding" />
     <MESSAGE value="finish the framework of sqltranslate (createTab sql is now being supported!)" />
-    <option name="LAST_COMMIT_MESSAGE" value="finish the framework of sqltranslate (createTab sql is now being supported!)" />
+    <MESSAGE value="add insert sql" />
+    <option name="LAST_COMMIT_MESSAGE" value="add insert sql" />
   </component>
   <component name="XDebuggerManager">
     <watches-manager>
diff --git a/sqlTranslate/src/main/java/Document/Select statement in Oracle b/sqlTranslate/src/main/java/Document/Select statement in Oracle
new file mode 100644
index 00000000..d45fb273
--- /dev/null
+++ b/sqlTranslate/src/main/java/Document/Select statement in Oracle	
@@ -0,0 +1,2 @@
+INSERT INTO employees (first_name, last_name, email) VALUES ('Jane', 'Smith', 'janesm@example.com');
+INSERT INTO employees VALUES ('Jane', 'Smith', 'janesm@example.com');
\ No newline at end of file
diff --git a/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java b/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java
index d9eac9a3..49fa52e1 100644
--- a/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java
+++ b/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java
@@ -5,6 +5,7 @@ import Parser.AST.ASTNode;
 import Parser.AST.CreateTable.ColumnNode;
 import Parser.AST.CreateTable.CreateTabNode;
 import Exception.GenerateFailedException;
+import Parser.AST.Insert.InsertNode;
 
 public class OpenGaussGenerator {
     private ASTNode node;
@@ -15,6 +16,9 @@ public class OpenGaussGenerator {
         if (node instanceof CreateTabNode) {
             return GenCreatTableSQL(node);
         }
+        else if (node instanceof InsertNode) {
+            return GenInsertSQL(node);
+        }
         else {
             throw new GenerateFailedException("Root node:" + node.getClass() + "(Unsupported node type!)");
         }
@@ -22,16 +26,21 @@ public class OpenGaussGenerator {
 
     private String GenCreatTableSQL(ASTNode node) {
         // type convert
-        visit(node);
+        visitCrt(node);
+        return node.toQueryString();
+    }
+
+    private String GenInsertSQL(ASTNode node) {
+        // Insert statements do not need to be converted for the time being
         return node.toQueryString();
     }
 
-    private void visit(ASTNode node) {
+    private void visitCrt(ASTNode node) {
         if (node instanceof ColumnNode) {
             ColumnTypeConvert((ColumnNode) node);
         }
         for (ASTNode child : node.getChildren()) {
-            visit(child);
+            visitCrt(child);
         }
     }
 
diff --git a/sqlTranslate/src/main/java/Lexer/OracleLexer.java b/sqlTranslate/src/main/java/Lexer/OracleLexer.java
index 70fdcaaa..b684e1ba 100644
--- a/sqlTranslate/src/main/java/Lexer/OracleLexer.java
+++ b/sqlTranslate/src/main/java/Lexer/OracleLexer.java
@@ -8,7 +8,7 @@ import java.util.regex.Pattern;
 
 
 public class OracleLexer {
-    public static final String[] keywords = {"SELECT", "FROM", "WHERE", "AND", "OR", "INSERT", "UPDATE", "DELETE",
+    public static final String[] keywords = {"SELECT", "FROM", "WHERE", "AND", "OR", "INSERT", "UPDATE", "DELETE", "VALUES",
             // keywords of creating table
             "CREATE", "TABLE", "TEMPORARY", "GLOBAL",
             "NUMBER", "INTEGER", "SMALLIN", "BINARY_INTEGER", "DECIMAL", "REAL", "FLOAT", "DOUBLE PRECISION", "CHAR", "VARCHAR2",
diff --git a/sqlTranslate/src/main/java/Main.java b/sqlTranslate/src/main/java/Main.java
index f7097627..4e64423f 100644
--- a/sqlTranslate/src/main/java/Main.java
+++ b/sqlTranslate/src/main/java/Main.java
@@ -7,13 +7,14 @@ import Parser.OracleParser;
 
 public class Main {
     public static void main(String[] args) {
-        String sql = "CREATE TABLE employees (\n" +
-                "    employee_id NUMBER PRIMARY KEY,\n" +
-                "    first_name VARCHAR2(20),\n" +
-                "    last_name VARCHAR2(25),\n" +
-                "    email VARCHAR2(25),\n" +
-                "    hire_date DATE\n" +
-                ");";
+//        String sql = "CREATE TABLE employees (\n" +
+//                "    employee_id NUMBER PRIMARY KEY,\n" +
+//                "    first_name VARCHAR2(20),\n" +
+//                "    last_name VARCHAR2(25),\n" +
+//                "    email VARCHAR2(25),\n" +
+//                "    hire_date DATE\n" +
+//                ");";
+        String sql = "INSERT INTO employees (first_name, last_name, email) VALUES ('Jane', 'Smith', 'janesm@example.com');";
         OracleLexer lexer = new OracleLexer(sql);
         lexer.printTokens();
         OracleParser parser = new OracleParser(lexer);
diff --git a/sqlTranslate/src/main/java/Parser/AST/Insert/InsertDataNode.java b/sqlTranslate/src/main/java/Parser/AST/Insert/InsertDataNode.java
index ac8d7e68..79bfef1a 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Insert/InsertDataNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/Insert/InsertDataNode.java
@@ -1,4 +1,23 @@
 package Parser.AST.Insert;
 
-public class InsertDataNode {
+import Lexer.Token;
+import Parser.AST.ASTNode;
+import java.util.List;
+
+public class InsertDataNode extends ASTNode {
+    public InsertDataNode(List<Token> tokens) {
+        super(tokens);
+    }
+
+    public InsertDataNode(ASTNode node) {
+        super(node);
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString) {
+        queryString.append(toString() + " ");
+        for (ASTNode child : getChildren()) {
+            child.visit(child, queryString);
+        }
+    }
 }
diff --git a/sqlTranslate/src/main/java/Parser/AST/Insert/InsertEndNode.java b/sqlTranslate/src/main/java/Parser/AST/Insert/InsertEndNode.java
index bc50d6ae..855800d8 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Insert/InsertEndNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/Insert/InsertEndNode.java
@@ -1,4 +1,24 @@
 package Parser.AST.Insert;
 
-public class InsertEndNode {
+import Lexer.Token;
+import Parser.AST.ASTNode;
+import java.util.List;
+
+public class InsertEndNode extends ASTNode {
+    public InsertEndNode(ASTNode node) {
+        super(node);
+    }
+
+    public InsertEndNode(List<Token> tokens) {
+        super(tokens);
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString) {
+        queryString.append(toString());
+        for (ASTNode child : getChildren())
+        {
+            child.visit(child, queryString);
+        }
+    }
 }
diff --git a/sqlTranslate/src/main/java/Parser/AST/Insert/InsertNode.java b/sqlTranslate/src/main/java/Parser/AST/Insert/InsertNode.java
index ea961887..fec1b697 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Insert/InsertNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/Insert/InsertNode.java
@@ -15,9 +15,14 @@ public class InsertNode extends ASTNode {
         super(node);
     }
 
+    @Override
     public void visit(ASTNode node, StringBuilder queryString)
     {
-        queryString.append("INSERT INTO ");
+        queryString.append(toString() + " ");
+        for (ASTNode child : getChildren())
+        {
+            child.visit(child, queryString);
+        }
 
     }
 }
diff --git a/sqlTranslate/src/main/java/Parser/AST/Insert/InsertObjNode.java b/sqlTranslate/src/main/java/Parser/AST/Insert/InsertObjNode.java
index 9bf37ad8..da42b78b 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Insert/InsertObjNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/Insert/InsertObjNode.java
@@ -1,4 +1,23 @@
 package Parser.AST.Insert;
 
-public class InsertObjNode {
+import Lexer.Token;
+import Parser.AST.ASTNode;
+import java.util.List;
+
+public class InsertObjNode extends ASTNode{
+    public InsertObjNode(List<Token> tokens) {
+        super(tokens);
+    }
+
+    public InsertObjNode(ASTNode node) {
+        super(node);
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString) {
+        queryString.append(toString() + " ");
+        for (ASTNode child : getChildren()) {
+            child.visit(child, queryString);
+        }
+    }
 }
diff --git a/sqlTranslate/src/main/java/Parser/OracleParser.java b/sqlTranslate/src/main/java/Parser/OracleParser.java
index 472b62f4..b85a5475 100644
--- a/sqlTranslate/src/main/java/Parser/OracleParser.java
+++ b/sqlTranslate/src/main/java/Parser/OracleParser.java
@@ -5,6 +5,10 @@ import Lexer.Token;
 import Parser.AST.ASTNode;
 import Exception.ParseFailedException;
 import Parser.AST.CreateTable.*;
+import Parser.AST.Insert.InsertDataNode;
+import Parser.AST.Insert.InsertEndNode;
+import Parser.AST.Insert.InsertNode;
+import Parser.AST.Insert.InsertObjNode;
 
 import java.util.Stack;
 
@@ -25,6 +29,9 @@ public class OracleParser {
                 (tokens.get(0).getValue().equalsIgnoreCase("CREATE") && tokens.get(2).getValue().equalsIgnoreCase("TEMPORARY") && tokens.get(3).getValue().equalsIgnoreCase("TABLE")) ) {
             return parseCreateTab();
         }
+        else if (tokens.get(0).getValue().equalsIgnoreCase("INSERT")) {
+            return parseInsert();
+        }
         else {
             throw new ParseFailedException("Parse failed!");
         }
@@ -205,5 +212,67 @@ public class OracleParser {
         return root;
     }
 
+    private ASTNode parseInsert() {
+        List <Token> tokens = new ArrayList<>();
+        tokens.add(lexer.getTokens().get(0));
+        try {
+            tokens.add(lexer.getTokens().get(1));
+        }
+        catch (ParseFailedException e) {
+            throw new ParseFailedException("Parse failed!");
+        }
+        ASTNode root = new InsertNode(tokens);
+        ASTNode currentNode = root;
+
+        for (int i = 2; i < lexer.getTokens().size(); i++) {
+            if (lexer.getTokens().get(i).hasType(Token.TokenType.IDENTIFIER)) { // table name
+                tokens = new ArrayList<>();
+                tokens.add(lexer.getTokens().get(i));
+                if (i + 1 < lexer.getTokens().size() && ! (lexer.getTokens().get(i + 1).hasType(Token.TokenType.KEYWORD) && lexer.getTokens().get(i + 1).getValue().equalsIgnoreCase("VALUES"))) {
+                    for (int j = i + 1; j < lexer.getTokens().size(); j++) {
+                        tokens.add(lexer.getTokens().get(j));
+                        if (lexer.getTokens().get(j).hasType(Token.TokenType.SYMBOL) && lexer.getTokens().get(j).getValue().equals(")")) {
+                            i = j;
+                            break;
+                        }
+                    }
+                }
+                ASTNode childNode = new InsertObjNode(tokens);
+                currentNode.addChild(childNode);
+                currentNode = childNode;
+            }
+            else if (lexer.getTokens().get(i).hasType(Token.TokenType.KEYWORD) && lexer.getTokens().get(i).getValue().equalsIgnoreCase("VALUES")) {
+                tokens = new ArrayList<>();
+                tokens.add(lexer.getTokens().get(i));
+                for (int j = i + 1; j < lexer.getTokens().size(); j++) {
+                    if (lexer.getTokens().get(j).hasType(Token.TokenType.SYMBOL) && lexer.getTokens().get(j).getValue().equals(";")) {
+                        i = j - 1;
+                        break;
+                    }
+                    tokens.add(lexer.getTokens().get(j));
+                }
+                ASTNode childNode = new InsertDataNode(tokens);
+                currentNode.addChild(childNode);
+                currentNode = childNode;
+            }
+            else if (lexer.getTokens().get(i).hasType(Token.TokenType.SYMBOL) && lexer.getTokens().get(i).getValue().equals(";")) {
+                tokens = new ArrayList<>();
+                tokens.add(lexer.getTokens().get(i));
+                ASTNode childNode = new InsertEndNode(tokens);
+                currentNode.addChild(childNode);
+                currentNode = childNode;
+            }
+            else if (lexer.getTokens().get(i).hasType(Token.TokenType.EOF)) {
+                break;
+            }
+            else {
+                throw new ParseFailedException("Parse failed!");
+            }
+
+        }
+
+        return root;
+    }
+
 
 }
-- 
Gitee


From 18b4711a83b4f3744f2511e70e76f38a7b252a60 Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Mon, 9 Sep 2024 22:07:05 +0800
Subject: [PATCH 023/113] add todolist

---
 sqlTranslate/.idea/workspace.xml             | 19 +++++++-------
 sqlTranslate/src/main/java/Document/Todolist | 27 ++++++++++++++++++++
 2 files changed, 36 insertions(+), 10 deletions(-)
 create mode 100644 sqlTranslate/src/main/java/Document/Todolist

diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
index f6da9c59..7a63a706 100644
--- a/sqlTranslate/.idea/workspace.xml
+++ b/sqlTranslate/.idea/workspace.xml
@@ -5,16 +5,8 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add insert sql">
-      <change afterPath="$PROJECT_DIR$/src/main/java/Document/Select statement in Oracle" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/Document/Todolist" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Generator/OpenGaussGenerator.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Generator/OpenGaussGenerator.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Lexer/OracleLexer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Lexer/OracleLexer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Main.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Insert/InsertDataNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Insert/InsertDataNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Insert/InsertEndNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Insert/InsertEndNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Insert/InsertNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Insert/InsertNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Insert/InsertObjNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Insert/InsertObjNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -259,7 +251,14 @@
       <option name="project" value="LOCAL" />
       <updated>1725117071687</updated>
     </task>
-    <option name="localTasksCounter" value="22" />
+    <task id="LOCAL-00022" summary="add insert sql">
+      <created>1725885115923</created>
+      <option name="number" value="00022" />
+      <option name="presentableId" value="LOCAL-00022" />
+      <option name="project" value="LOCAL" />
+      <updated>1725885115924</updated>
+    </task>
+    <option name="localTasksCounter" value="23" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
diff --git a/sqlTranslate/src/main/java/Document/Todolist b/sqlTranslate/src/main/java/Document/Todolist
new file mode 100644
index 00000000..654a04ab
--- /dev/null
+++ b/sqlTranslate/src/main/java/Document/Todolist
@@ -0,0 +1,27 @@
+Operation
+ select.. from.. where
+ join
+ group by
+ order by
+ union
+ insert into 1
+ update... set
+ delete
+ if... elsif... else... end if
+ case... when... then
+ loop... end loop
+ while... loop... end loop
+ for ... in () loop end loop
+ continue、exit
+ return
+ exception
+ commit、rollback、execute
+ alter table
+ create table 1
+ drop table
+Object
+ table
+ view
+ function
+ procedure
+ trigger
\ No newline at end of file
-- 
Gitee


From 0eea1eef1b5573306ecd89291cc77463a94c07b5 Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Mon, 9 Sep 2024 23:44:45 +0800
Subject: [PATCH 024/113] add todolist

---
 sqlTranslate/.idea/workspace.xml              | 25 +++++-
 sqlTranslate/src/main/java/Document/Todolist  |  2 +-
 .../java/Generator/OpenGaussGenerator.java    | 47 +++++++++-
 .../src/main/java/Lexer/OracleLexer.java      |  3 +-
 sqlTranslate/src/main/java/Main.java          |  3 +-
 .../src/main/java/Parser/AST/ASTNode.java     | 12 +++
 .../AST/DropTable/DropTableEndNode.java       | 23 +++++
 .../AST/DropTable/DropTableNameNode.java      | 24 +++++
 .../Parser/AST/DropTable/DropTableNode.java   | 24 +++++
 .../AST/DropTable/DropTableOptionNode.java    | 25 ++++++
 .../src/main/java/Parser/OracleParser.java    | 90 +++++++++++++++++--
 11 files changed, 263 insertions(+), 15 deletions(-)
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/DropTable/DropTableEndNode.java
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/DropTable/DropTableNameNode.java
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/DropTable/DropTableNode.java
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/DropTable/DropTableOptionNode.java

diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
index 7a63a706..859aff4d 100644
--- a/sqlTranslate/.idea/workspace.xml
+++ b/sqlTranslate/.idea/workspace.xml
@@ -4,9 +4,18 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add insert sql">
-      <change afterPath="$PROJECT_DIR$/src/main/java/Document/Todolist" afterDir="false" />
+    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add todolist">
+      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/DropTable/DropTableEndNode.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/DropTable/DropTableNameNode.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/DropTable/DropTableNode.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/DropTable/DropTableOptionNode.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Document/Todolist" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Document/Todolist" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Generator/OpenGaussGenerator.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Generator/OpenGaussGenerator.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Lexer/OracleLexer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Lexer/OracleLexer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Main.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/ASTNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/ASTNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -258,7 +267,14 @@
       <option name="project" value="LOCAL" />
       <updated>1725885115924</updated>
     </task>
-    <option name="localTasksCounter" value="23" />
+    <task id="LOCAL-00023" summary="add todolist">
+      <created>1725890826442</created>
+      <option name="number" value="00023" />
+      <option name="presentableId" value="LOCAL-00023" />
+      <option name="project" value="LOCAL" />
+      <updated>1725890826442</updated>
+    </task>
+    <option name="localTasksCounter" value="24" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
@@ -284,7 +300,8 @@
     <MESSAGE value="coding" />
     <MESSAGE value="finish the framework of sqltranslate (createTab sql is now being supported!)" />
     <MESSAGE value="add insert sql" />
-    <option name="LAST_COMMIT_MESSAGE" value="add insert sql" />
+    <MESSAGE value="add todolist" />
+    <option name="LAST_COMMIT_MESSAGE" value="add todolist" />
   </component>
   <component name="XDebuggerManager">
     <watches-manager>
diff --git a/sqlTranslate/src/main/java/Document/Todolist b/sqlTranslate/src/main/java/Document/Todolist
index 654a04ab..cbb370f7 100644
--- a/sqlTranslate/src/main/java/Document/Todolist
+++ b/sqlTranslate/src/main/java/Document/Todolist
@@ -18,7 +18,7 @@ Operation
  commit、rollback、execute
  alter table
  create table 1
- drop table
+ drop table 1
 Object
  table
  view
diff --git a/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java b/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java
index 49fa52e1..348ff2ae 100644
--- a/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java
+++ b/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java
@@ -5,8 +5,13 @@ import Parser.AST.ASTNode;
 import Parser.AST.CreateTable.ColumnNode;
 import Parser.AST.CreateTable.CreateTabNode;
 import Exception.GenerateFailedException;
+import Parser.AST.DropTable.DropTableNode;
+import Parser.AST.DropTable.DropTableOptionNode;
 import Parser.AST.Insert.InsertNode;
 
+import java.util.ArrayList;
+import java.util.List;
+
 public class OpenGaussGenerator {
     private ASTNode node;
     public OpenGaussGenerator(ASTNode node) {
@@ -19,8 +24,17 @@ public class OpenGaussGenerator {
         else if (node instanceof InsertNode) {
             return GenInsertSQL(node);
         }
+        else if (node instanceof DropTableNode) {
+            return GenDropTableSQL(node);
+        }
         else {
-            throw new GenerateFailedException("Root node:" + node.getClass() + "(Unsupported node type!)");
+            try {
+                throw new GenerateFailedException("Root node:" + node.getClass() + "(Unsupported node type!)");
+            }
+            catch (Exception e) {
+                e.printStackTrace();
+            }
+            return "";
         }
     }
 
@@ -35,6 +49,11 @@ public class OpenGaussGenerator {
         return node.toQueryString();
     }
 
+    private String GenDropTableSQL(ASTNode node) {
+        visitDrop(node);
+        return node.toQueryString();
+    }
+
     private void visitCrt(ASTNode node) {
         if (node instanceof ColumnNode) {
             ColumnTypeConvert((ColumnNode) node);
@@ -44,6 +63,25 @@ public class OpenGaussGenerator {
         }
     }
 
+    private void visitDrop(ASTNode node) {
+        try {
+            if (node instanceof DropTableOptionNode) {
+                List<Token> tokens = new ArrayList<>();
+                tokens.add(new Token(Token.TokenType.KEYWORD, "CASCADE"));
+                tokens.add(new Token(Token.TokenType.KEYWORD, "CONSTRAINTS"));
+                if (node.tokensEqual(tokens)) {
+                    throw new GenerateFailedException("Unsupported type:" + node.toString() + "(OpenGauss doesn't support the keyword -- " + node.toString() + " or have any expression that keeps the same semantic!)");
+                }
+            }
+        }
+        catch (GenerateFailedException e) {
+            e.printStackTrace();
+        }
+        for (ASTNode child : node.getChildren()) {
+            visitDrop(child);
+        }
+    }
+
     private void ColumnTypeConvert(ColumnNode node) {
         // type convert
         if (node.getType().getValue().equalsIgnoreCase("NUMBER")) {
@@ -119,7 +157,12 @@ public class OpenGaussGenerator {
                         node.getType().getValue().equalsIgnoreCase("UROWID") ||
                         node.getType().getValue().equalsIgnoreCase("REF CURSOR")
         ) {
-            throw new GenerateFailedException("Unsupported type:" + node.getType().getValue() + "(OpenGauss doesn't support the keyword -- " + node.getType().getValue() + " or have any expression that keeps the same semantic!)");
+            try {
+                throw new GenerateFailedException("Unsupported type:" + node.getType().getValue() + "(OpenGauss doesn't support the keyword -- " + node.getType().getValue() + " or have any expression that keeps the same semantic!)");
+            }
+            catch (GenerateFailedException e) {
+                e.printStackTrace();
+            }
         }
     }
 }
diff --git a/sqlTranslate/src/main/java/Lexer/OracleLexer.java b/sqlTranslate/src/main/java/Lexer/OracleLexer.java
index b684e1ba..5d5fe81f 100644
--- a/sqlTranslate/src/main/java/Lexer/OracleLexer.java
+++ b/sqlTranslate/src/main/java/Lexer/OracleLexer.java
@@ -16,7 +16,8 @@ public class OracleLexer {
             "LONG RAW", "BOOLEAN", "INTERVAL YEAR TO MONTH", "INTERVAL DAY TO SECOND", "ROWID", "UROWID", "REF CURSOR",
             "NOT NULL", "PRIMARY KEY", "UNIQUE", "CHECK", "REFERENCES", "DEFAULT",
             "CONSTRAINT", "FOREIGN KEY"
-
+            // keywords of drop table
+            ,"DROP", "CASCADE", "CONSTRAINTS"
     };
     private static final Pattern TOKEN_PATTERN = Pattern.compile(
             "(NUMBER\\(.*?\\))|" +                     // NUMBER() function
diff --git a/sqlTranslate/src/main/java/Main.java b/sqlTranslate/src/main/java/Main.java
index 4e64423f..883902c4 100644
--- a/sqlTranslate/src/main/java/Main.java
+++ b/sqlTranslate/src/main/java/Main.java
@@ -14,7 +14,8 @@ public class Main {
 //                "    email VARCHAR2(25),\n" +
 //                "    hire_date DATE\n" +
 //                ");";
-        String sql = "INSERT INTO employees (first_name, last_name, email) VALUES ('Jane', 'Smith', 'janesm@example.com');";
+//        String sql = "INSERT INTO employees (first_name, last_name, email) VALUES ('Jane', 'Smith', 'janesm@example.com');";
+        String sql = "DROP TABLE employees CASCADE CONSTRAINTS;";
         OracleLexer lexer = new OracleLexer(sql);
         lexer.printTokens();
         OracleParser parser = new OracleParser(lexer);
diff --git a/sqlTranslate/src/main/java/Parser/AST/ASTNode.java b/sqlTranslate/src/main/java/Parser/AST/ASTNode.java
index 5cc95157..87272d96 100644
--- a/sqlTranslate/src/main/java/Parser/AST/ASTNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/ASTNode.java
@@ -31,6 +31,18 @@ public abstract class ASTNode {
         this.tokens = tokens;
     }
 
+    public boolean tokensEqual(List<Token> tokens) {
+        if (this.tokens.size() != tokens.size())
+            return false;
+
+        for (int i = 0; i < tokens.size(); i++) {
+            if (!this.tokens.get(i).getValue().equals(tokens.get(i).getValue()))
+                return false;
+        }
+
+        return true;
+    }
+
     public ASTNode getParent() {
         return parent;
     }
diff --git a/sqlTranslate/src/main/java/Parser/AST/DropTable/DropTableEndNode.java b/sqlTranslate/src/main/java/Parser/AST/DropTable/DropTableEndNode.java
new file mode 100644
index 00000000..818f2aed
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/DropTable/DropTableEndNode.java
@@ -0,0 +1,23 @@
+package Parser.AST.DropTable;
+
+import Lexer.Token;
+import Parser.AST.ASTNode;
+import java.util.List;
+
+public class DropTableEndNode extends ASTNode {
+    public DropTableEndNode(ASTNode node) {
+        super(node);
+    }
+
+    public DropTableEndNode(List<Token> tokens) {
+        super(tokens);
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString) {
+        queryString.append(toString());
+        for (ASTNode child : getChildren()) {
+            child.visit(child, queryString);
+        }
+    }
+}
diff --git a/sqlTranslate/src/main/java/Parser/AST/DropTable/DropTableNameNode.java b/sqlTranslate/src/main/java/Parser/AST/DropTable/DropTableNameNode.java
new file mode 100644
index 00000000..649d24b9
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/DropTable/DropTableNameNode.java
@@ -0,0 +1,24 @@
+package Parser.AST.DropTable;
+
+import Lexer.Token;
+import Parser.AST.ASTNode;
+import java.util.List;
+
+public class DropTableNameNode extends ASTNode {
+    public DropTableNameNode(ASTNode node) {
+        super(node);
+    }
+
+    public DropTableNameNode(List<Token> tokens) {
+        super(tokens);
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString) {
+        queryString.append(toString() + " ");
+        for (ASTNode child : getChildren())
+        {
+            child.visit(child, queryString);
+        }
+    }
+}
diff --git a/sqlTranslate/src/main/java/Parser/AST/DropTable/DropTableNode.java b/sqlTranslate/src/main/java/Parser/AST/DropTable/DropTableNode.java
new file mode 100644
index 00000000..9c4ebf90
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/DropTable/DropTableNode.java
@@ -0,0 +1,24 @@
+package Parser.AST.DropTable;
+
+import Lexer.Token;
+import Parser.AST.ASTNode;
+import java.util.List;
+
+public class DropTableNode extends ASTNode {
+    public DropTableNode(ASTNode node) {
+        super(node);
+    }
+
+    public DropTableNode(List<Token> tokens) {
+        super(tokens);
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString) {
+        queryString.append(toString() + " ");
+        for (ASTNode child : getChildren())
+        {
+            child.visit(child, queryString);
+        }
+    }
+}
diff --git a/sqlTranslate/src/main/java/Parser/AST/DropTable/DropTableOptionNode.java b/sqlTranslate/src/main/java/Parser/AST/DropTable/DropTableOptionNode.java
new file mode 100644
index 00000000..4e21a67f
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/DropTable/DropTableOptionNode.java
@@ -0,0 +1,25 @@
+package Parser.AST.DropTable;
+
+import Lexer.Token;
+import Parser.AST.ASTNode;
+
+import java.util.List;
+
+public class DropTableOptionNode extends ASTNode {
+    public DropTableOptionNode(ASTNode node) {
+        super(node);
+    }
+
+    public DropTableOptionNode(List<Token> tokens) {
+        super(tokens);
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString) {
+        queryString.append(toString() + " ");
+        for (ASTNode child : getChildren())
+        {
+            child.visit(child, queryString);
+        }
+    }
+}
diff --git a/sqlTranslate/src/main/java/Parser/OracleParser.java b/sqlTranslate/src/main/java/Parser/OracleParser.java
index b85a5475..9551149a 100644
--- a/sqlTranslate/src/main/java/Parser/OracleParser.java
+++ b/sqlTranslate/src/main/java/Parser/OracleParser.java
@@ -5,6 +5,10 @@ import Lexer.Token;
 import Parser.AST.ASTNode;
 import Exception.ParseFailedException;
 import Parser.AST.CreateTable.*;
+import Parser.AST.DropTable.DropTableEndNode;
+import Parser.AST.DropTable.DropTableNameNode;
+import Parser.AST.DropTable.DropTableNode;
+import Parser.AST.DropTable.DropTableOptionNode;
 import Parser.AST.Insert.InsertDataNode;
 import Parser.AST.Insert.InsertEndNode;
 import Parser.AST.Insert.InsertNode;
@@ -32,8 +36,17 @@ public class OracleParser {
         else if (tokens.get(0).getValue().equalsIgnoreCase("INSERT")) {
             return parseInsert();
         }
+        else if (tokens.get(0).getValue().equalsIgnoreCase("DROP")) {
+            return parseDrop();
+        }
         else {
-            throw new ParseFailedException("Parse failed!");
+            try {
+                throw new ParseFailedException("Parse failed!");
+            }
+            catch (ParseFailedException e) {
+                e.printStackTrace();
+            }
+            return null;
         }
     }
 
@@ -52,7 +65,7 @@ public class OracleParser {
                     tokens.add(lexer.getTokens().get(i + 1));
                 }
                 catch (ParseFailedException e) {
-                    throw new ParseFailedException("Parse failed!");
+                    e.printStackTrace();
                 }
                 i++;
                 i++; // pass the "("
@@ -74,7 +87,7 @@ public class OracleParser {
                             tokens.add(lexer.getTokens().get(j + 1));
                         }
                         catch (ParseFailedException e) {
-                            throw new ParseFailedException("Parse failed!");
+                            e.printStackTrace();
                         }
                         i = j + 2; // pass the "("
                         break;
@@ -206,7 +219,12 @@ public class OracleParser {
             }
             else {
 //                System.out.println("Fail to parse:" + lexer.getTokens().get(i).getValue());
-                throw new ParseFailedException("Parse failed!");
+                try {
+                    throw new ParseFailedException("Parse failed!");
+                }
+                catch (ParseFailedException e) {
+                    e.printStackTrace();
+                }
             }
         }
         return root;
@@ -219,7 +237,7 @@ public class OracleParser {
             tokens.add(lexer.getTokens().get(1));
         }
         catch (ParseFailedException e) {
-            throw new ParseFailedException("Parse failed!");
+            e.printStackTrace();
         }
         ASTNode root = new InsertNode(tokens);
         ASTNode currentNode = root;
@@ -266,7 +284,12 @@ public class OracleParser {
                 break;
             }
             else {
-                throw new ParseFailedException("Parse failed!");
+                try {
+                    throw new ParseFailedException("Parse failed!");
+                }
+                catch (ParseFailedException e) {
+                    e.printStackTrace();
+                }
             }
 
         }
@@ -274,5 +297,60 @@ public class OracleParser {
         return root;
     }
 
+    // Drop table
+    private ASTNode parseDrop() {
+        List <Token> tokens = new ArrayList<>();
+        tokens.add(lexer.getTokens().get(0));
+        try {
+            tokens.add(lexer.getTokens().get(1));
+        }
+        catch (ParseFailedException e) {
+            e.printStackTrace();
+        }
+        ASTNode root = new DropTableNode(tokens);
+        ASTNode currentNode = root;
+
+        for (int i = 2; i < lexer.getTokens().size(); i++) {
+            if (lexer.getTokens().get(i).hasType(Token.TokenType.IDENTIFIER)) {
+                tokens = new ArrayList<>();
+                tokens.add(lexer.getTokens().get(i));
+                ASTNode childNode = new DropTableNameNode(tokens);
+                currentNode.addChild(childNode);
+                currentNode = childNode;
+            }
+            else if (lexer.getTokens().get(i).hasType(Token.TokenType.KEYWORD) && lexer.getTokens().get(i).getValue().equalsIgnoreCase("CASCADE")) {
+                tokens = new ArrayList<>();
+                tokens.add(lexer.getTokens().get(i));
+                if (i + 1 < lexer.getTokens().size() && (lexer.getTokens().get(i + 1).hasType(Token.TokenType.KEYWORD) && lexer.getTokens().get(i + 1).getValue().equals("CONSTRAINTS"))) {
+                    tokens.add(lexer.getTokens().get(i + 1));
+                    i++;
+                }
+                ASTNode childNode = new DropTableOptionNode(tokens);
+                currentNode.addChild(childNode);
+                currentNode = childNode;
+            }
+            else if (lexer.getTokens().get(i).hasType(Token.TokenType.SYMBOL) && lexer.getTokens().get(i).getValue().equals(";")) {
+                tokens = new ArrayList<>();
+                tokens.add(lexer.getTokens().get(i));
+                ASTNode childNode = new DropTableEndNode(tokens);
+                currentNode.addChild(childNode);
+                currentNode = childNode;
+            }
+            else if (lexer.getTokens().get(i).hasType(Token.TokenType.EOF)) {
+                break;
+            }
+            else {
+                try {
+                    throw new ParseFailedException("Parse failed!");
+                }
+                catch (ParseFailedException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+
+        return root;
+    }
+
 
 }
-- 
Gitee


From ddb4978a32ac425aa253cc73a6d2b58c5fef6671 Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Tue, 10 Sep 2024 11:02:30 +0800
Subject: [PATCH 025/113] add select

---
 sqlTranslate/.idea/workspace.xml              | 25 ++++++-----
 sqlTranslate/src/main/java/Document/Todolist  | 12 +++---
 .../java/Parser/AST/Select/SelectEndNode.java | 28 +++++++++++++
 .../java/Parser/AST/Select/SelectNode.java    | 29 +++++++++++++
 .../java/Parser/AST/Select/SelectObjNode.java | 42 +++++++++++++++++++
 .../Parser/AST/Select/SelectOptionNode.java   | 28 +++++++++++++
 .../Parser/AST/Select/SelectTableNode.java    | 27 ++++++++++++
 .../Parser/AST/Select/SelectUnionNode.java    | 28 +++++++++++++
 .../AST/Select/SelectWhereClauseNode.java     | 28 +++++++++++++
 9 files changed, 231 insertions(+), 16 deletions(-)
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/Select/SelectEndNode.java
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/Select/SelectNode.java
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/Select/SelectObjNode.java
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/Select/SelectOptionNode.java
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/Select/SelectTableNode.java
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/Select/SelectUnionNode.java
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/Select/SelectWhereClauseNode.java

diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
index 859aff4d..fb9ca0c3 100644
--- a/sqlTranslate/.idea/workspace.xml
+++ b/sqlTranslate/.idea/workspace.xml
@@ -5,17 +5,15 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add todolist">
-      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/DropTable/DropTableEndNode.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/DropTable/DropTableNameNode.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/DropTable/DropTableNode.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/DropTable/DropTableOptionNode.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Select/SelectEndNode.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Select/SelectNode.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Select/SelectObjNode.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Select/SelectOptionNode.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Select/SelectTableNode.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Select/SelectUnionNode.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Select/SelectWhereClauseNode.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/Document/Todolist" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Document/Todolist" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Generator/OpenGaussGenerator.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Generator/OpenGaussGenerator.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Lexer/OracleLexer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Lexer/OracleLexer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Main.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/ASTNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/ASTNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -274,7 +272,14 @@
       <option name="project" value="LOCAL" />
       <updated>1725890826442</updated>
     </task>
-    <option name="localTasksCounter" value="24" />
+    <task id="LOCAL-00024" summary="add todolist">
+      <created>1725896687932</created>
+      <option name="number" value="00024" />
+      <option name="presentableId" value="LOCAL-00024" />
+      <option name="project" value="LOCAL" />
+      <updated>1725896687932</updated>
+    </task>
+    <option name="localTasksCounter" value="25" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
diff --git a/sqlTranslate/src/main/java/Document/Todolist b/sqlTranslate/src/main/java/Document/Todolist
index cbb370f7..e5bafb05 100644
--- a/sqlTranslate/src/main/java/Document/Todolist
+++ b/sqlTranslate/src/main/java/Document/Todolist
@@ -1,9 +1,9 @@
 Operation
- select.. from.. where
- join
- group by
- order by
- union
+ select.. from.. where 1
+ join 1
+ group by 1
+ order by 1
+ union 1
  insert into 1
  update... set
  delete
@@ -20,7 +20,7 @@ Operation
  create table 1
  drop table 1
 Object
- table
+ table 1
  view
  function
  procedure
diff --git a/sqlTranslate/src/main/java/Parser/AST/Select/SelectEndNode.java b/sqlTranslate/src/main/java/Parser/AST/Select/SelectEndNode.java
new file mode 100644
index 00000000..3db2798f
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/Select/SelectEndNode.java
@@ -0,0 +1,28 @@
+package Parser.AST.Select;
+
+import Lexer.Token;
+import Parser.AST.ASTNode;
+
+import java.util.List;
+
+public class SelectEndNode extends ASTNode {
+    public SelectEndNode(List<Token> tokens)
+    {
+        super(tokens);
+    }
+
+    public SelectEndNode(ASTNode node)
+    {
+        super(node);
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString)
+    {
+        queryString.append(toString());
+        for (ASTNode child : getChildren())
+        {
+            child.visit(child, queryString);
+        }
+    }
+}
diff --git a/sqlTranslate/src/main/java/Parser/AST/Select/SelectNode.java b/sqlTranslate/src/main/java/Parser/AST/Select/SelectNode.java
new file mode 100644
index 00000000..a56ade48
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/Select/SelectNode.java
@@ -0,0 +1,29 @@
+package Parser.AST.Select;
+
+import Parser.AST.ASTNode;
+import Lexer.Token;
+
+import java.util.List;
+
+public class SelectNode extends ASTNode {
+    public SelectNode(List<Token> tokens)
+    {
+        super(tokens);
+    }
+
+    public SelectNode(ASTNode node)
+    {
+        super(node);
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString)
+    {
+        queryString.append(toString() + " ");
+        for (ASTNode child : getChildren())
+        {
+            child.visit(child, queryString);
+        }
+    }
+
+}
diff --git a/sqlTranslate/src/main/java/Parser/AST/Select/SelectObjNode.java b/sqlTranslate/src/main/java/Parser/AST/Select/SelectObjNode.java
new file mode 100644
index 00000000..3ceb5140
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/Select/SelectObjNode.java
@@ -0,0 +1,42 @@
+package Parser.AST.Select;
+
+import Lexer.Token;
+import Parser.AST.ASTNode;
+
+import java.util.List;
+
+public class SelectObjNode extends ASTNode {
+    public SelectObjNode(List<Token> tokens)
+    {
+        super(tokens);
+    }
+
+    public SelectObjNode(ASTNode node)
+    {
+        super(node);
+    }
+
+    @Override
+    public String toString()
+    {
+        List<Token> tokens = getTokens();
+        String str = "";
+        for (int i = 0; i < tokens.size(); i++) {
+            if (i < tokens.size() - 1)
+                str += tokens.get(i).getValue() + ", ";
+            else
+                str += tokens.get(i).getValue();
+        }
+        return str;
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString)
+    {
+        queryString.append(toString() + " FROM ");
+        for (ASTNode child : getChildren())
+        {
+            child.visit(child, queryString);
+        }
+    }
+}
diff --git a/sqlTranslate/src/main/java/Parser/AST/Select/SelectOptionNode.java b/sqlTranslate/src/main/java/Parser/AST/Select/SelectOptionNode.java
new file mode 100644
index 00000000..a70b71e9
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/Select/SelectOptionNode.java
@@ -0,0 +1,28 @@
+package Parser.AST.Select;
+
+import Lexer.Token;
+import Parser.AST.ASTNode;
+
+import java.util.List;
+
+public class SelectOptionNode extends ASTNode {
+    public SelectOptionNode(List<Token> tokens)
+    {
+        super(tokens);
+    }
+
+    public SelectOptionNode(ASTNode node)
+    {
+        super(node);
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString)
+    {
+        queryString.append(toString() + " ");
+        for (ASTNode child : getChildren())
+        {
+            child.visit(child, queryString);
+        }
+    }
+}
diff --git a/sqlTranslate/src/main/java/Parser/AST/Select/SelectTableNode.java b/sqlTranslate/src/main/java/Parser/AST/Select/SelectTableNode.java
new file mode 100644
index 00000000..86c7ae51
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/Select/SelectTableNode.java
@@ -0,0 +1,27 @@
+package Parser.AST.Select;
+
+import Lexer.Token;
+import Parser.AST.ASTNode;
+
+import java.util.List;
+
+public class SelectTableNode extends ASTNode {
+    public SelectTableNode(List<Token> tokens)
+    {
+        super(tokens);
+    }
+
+    public SelectTableNode(ASTNode node)
+    {
+        super(node);
+    }
+
+    public void visit(ASTNode node, StringBuilder queryString)
+    {
+        queryString.append(toString() + " ");
+        for (ASTNode child : getChildren())
+        {
+            child.visit(child, queryString);
+        }
+    }
+}
diff --git a/sqlTranslate/src/main/java/Parser/AST/Select/SelectUnionNode.java b/sqlTranslate/src/main/java/Parser/AST/Select/SelectUnionNode.java
new file mode 100644
index 00000000..762c5526
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/Select/SelectUnionNode.java
@@ -0,0 +1,28 @@
+package Parser.AST.Select;
+
+import Lexer.Token;
+import Parser.AST.ASTNode;
+
+import java.util.List;
+
+public class SelectUnionNode extends ASTNode {
+    public SelectUnionNode(List<Token> tokens)
+    {
+        super(tokens);
+    }
+
+    public SelectUnionNode(ASTNode node)
+    {
+        super(node);
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString)
+    {
+        queryString.append(toString() + " ");
+        for (ASTNode child : getChildren())
+        {
+            child.visit(child, queryString);
+        }
+    }
+}
diff --git a/sqlTranslate/src/main/java/Parser/AST/Select/SelectWhereClauseNode.java b/sqlTranslate/src/main/java/Parser/AST/Select/SelectWhereClauseNode.java
new file mode 100644
index 00000000..b1f6a0a1
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/Select/SelectWhereClauseNode.java
@@ -0,0 +1,28 @@
+package Parser.AST.Select;
+
+import Lexer.Token;
+import Parser.AST.ASTNode;
+
+import java.util.List;
+
+public class SelectWhereClauseNode extends ASTNode {
+    public SelectWhereClauseNode(List<Token> tokens)
+    {
+        super(tokens);
+    }
+
+    public SelectWhereClauseNode(ASTNode node)
+    {
+        super(node);
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString)
+    {
+        queryString.append(toString() + " ");
+        for (ASTNode child : getChildren())
+        {
+            child.visit(child, queryString);
+        }
+    }
+}
-- 
Gitee


From e9475c0507863062460d4dcc0eea043e1f7ffe6d Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Tue, 10 Sep 2024 16:09:24 +0800
Subject: [PATCH 026/113] add select

---
 sqlTranslate/.idea/workspace.xml              | 25 +++++++++++--------
 .../main/java/Document/DropTable in Oracle    |  1 +
 .../java/Document/Insert statement in Oracle  |  2 ++
 .../java/Document/Select statement in Oracle  | 23 +++++++++++++++--
 sqlTranslate/src/main/java/Document/Todolist  |  2 +-
 .../src/main/java/Lexer/OracleLexer.java      |  4 ++-
 .../java/Parser/AST/Select/SelectObjNode.java | 15 ++++++++++-
 7 files changed, 57 insertions(+), 15 deletions(-)
 create mode 100644 sqlTranslate/src/main/java/Document/DropTable in Oracle
 create mode 100644 sqlTranslate/src/main/java/Document/Insert statement in Oracle

diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
index fb9ca0c3..b0ee1e81 100644
--- a/sqlTranslate/.idea/workspace.xml
+++ b/sqlTranslate/.idea/workspace.xml
@@ -4,16 +4,13 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add todolist">
-      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Select/SelectEndNode.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Select/SelectNode.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Select/SelectObjNode.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Select/SelectOptionNode.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Select/SelectTableNode.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Select/SelectUnionNode.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Select/SelectWhereClauseNode.java" afterDir="false" />
+    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add select">
+      <change afterPath="$PROJECT_DIR$/src/main/java/Document/Insert statement in Oracle" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Document/Select statement in Oracle" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Document/Select statement in Oracle" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/Document/Todolist" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Document/Todolist" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Lexer/OracleLexer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Lexer/OracleLexer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Select/SelectObjNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Select/SelectObjNode.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -279,7 +276,14 @@
       <option name="project" value="LOCAL" />
       <updated>1725896687932</updated>
     </task>
-    <option name="localTasksCounter" value="25" />
+    <task id="LOCAL-00025" summary="add select">
+      <created>1725937361130</created>
+      <option name="number" value="00025" />
+      <option name="presentableId" value="LOCAL-00025" />
+      <option name="project" value="LOCAL" />
+      <updated>1725937361130</updated>
+    </task>
+    <option name="localTasksCounter" value="26" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
@@ -306,7 +310,8 @@
     <MESSAGE value="finish the framework of sqltranslate (createTab sql is now being supported!)" />
     <MESSAGE value="add insert sql" />
     <MESSAGE value="add todolist" />
-    <option name="LAST_COMMIT_MESSAGE" value="add todolist" />
+    <MESSAGE value="add select" />
+    <option name="LAST_COMMIT_MESSAGE" value="add select" />
   </component>
   <component name="XDebuggerManager">
     <watches-manager>
diff --git a/sqlTranslate/src/main/java/Document/DropTable in Oracle b/sqlTranslate/src/main/java/Document/DropTable in Oracle
new file mode 100644
index 00000000..a78f4257
--- /dev/null
+++ b/sqlTranslate/src/main/java/Document/DropTable in Oracle	
@@ -0,0 +1 @@
+DROP TABLE _table (CASCADE CONSTRAINTS)?
\ No newline at end of file
diff --git a/sqlTranslate/src/main/java/Document/Insert statement in Oracle b/sqlTranslate/src/main/java/Document/Insert statement in Oracle
new file mode 100644
index 00000000..d45fb273
--- /dev/null
+++ b/sqlTranslate/src/main/java/Document/Insert statement in Oracle	
@@ -0,0 +1,2 @@
+INSERT INTO employees (first_name, last_name, email) VALUES ('Jane', 'Smith', 'janesm@example.com');
+INSERT INTO employees VALUES ('Jane', 'Smith', 'janesm@example.com');
\ No newline at end of file
diff --git a/sqlTranslate/src/main/java/Document/Select statement in Oracle b/sqlTranslate/src/main/java/Document/Select statement in Oracle
index d45fb273..562fc927 100644
--- a/sqlTranslate/src/main/java/Document/Select statement in Oracle	
+++ b/sqlTranslate/src/main/java/Document/Select statement in Oracle	
@@ -1,2 +1,21 @@
-INSERT INTO employees (first_name, last_name, email) VALUES ('Jane', 'Smith', 'janesm@example.com');
-INSERT INTO employees VALUES ('Jane', 'Smith', 'janesm@example.com');
\ No newline at end of file
+SELECT DISTINCT? select_obj FROM select_tab where_clause? select_option? union_clause? ;
+select_obj = * | column* | function
+select_tab = table join_clause?
+select_option = GROUP BY | ORDER BY | HAVING
+function = COUNT() | SUM() | AVG() | MAX() | MIN()
+
+example:
+    SELECT * FROM employees;
+    SELECT employee_id, first_name, last_name FROM employees;
+    SELECT * FROM employees WHERE department_id = 10;
+    SELECT * FROM employees ORDER BY hire_date DESC;
+    SELECT COUNT(*), AVG(salary) FROM employees;
+    SELECT department_id, COUNT(*) FROM employees GROUP BY department_id;
+    SELECT e.first_name, d.department_name FROM employees e JOIN departments d ON e.department_id = d.department_id;
+    SELECT
+        column1,
+        CASE WHEN column2 > 0 THEN 'Positive' ELSE 'Non-positive' END as status,
+        SUBSTR(column3, 1, 5) as substring_column3
+    FROM table_name;
+    SELECT column1, COUNT(column2) FROM table_name GROUP BY column1 HAVING COUNT(column2) > 10;
+
diff --git a/sqlTranslate/src/main/java/Document/Todolist b/sqlTranslate/src/main/java/Document/Todolist
index e5bafb05..bc134a5e 100644
--- a/sqlTranslate/src/main/java/Document/Todolist
+++ b/sqlTranslate/src/main/java/Document/Todolist
@@ -8,7 +8,7 @@ Operation
  update... set
  delete
  if... elsif... else... end if
- case... when... then
+ case... when... then 1
  loop... end loop
  while... loop... end loop
  for ... in () loop end loop
diff --git a/sqlTranslate/src/main/java/Lexer/OracleLexer.java b/sqlTranslate/src/main/java/Lexer/OracleLexer.java
index 5d5fe81f..e0f4ef89 100644
--- a/sqlTranslate/src/main/java/Lexer/OracleLexer.java
+++ b/sqlTranslate/src/main/java/Lexer/OracleLexer.java
@@ -17,7 +17,9 @@ public class OracleLexer {
             "NOT NULL", "PRIMARY KEY", "UNIQUE", "CHECK", "REFERENCES", "DEFAULT",
             "CONSTRAINT", "FOREIGN KEY"
             // keywords of drop table
-            ,"DROP", "CASCADE", "CONSTRAINTS"
+            , "DROP", "CASCADE", "CONSTRAINTS"
+            // keywords of select
+            , "DISTINCT", "JOIN", "GROUP BY", "ORDER BY", "HAVING", "UNION", "CASE", "WHEN", "END", "AS"
     };
     private static final Pattern TOKEN_PATTERN = Pattern.compile(
             "(NUMBER\\(.*?\\))|" +                     // NUMBER() function
diff --git a/sqlTranslate/src/main/java/Parser/AST/Select/SelectObjNode.java b/sqlTranslate/src/main/java/Parser/AST/Select/SelectObjNode.java
index 3ceb5140..a6e22f9b 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Select/SelectObjNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/Select/SelectObjNode.java
@@ -9,11 +9,24 @@ public class SelectObjNode extends ASTNode {
     public SelectObjNode(List<Token> tokens)
     {
         super(tokens);
+        this.isDistinct = "";
     }
 
     public SelectObjNode(ASTNode node)
     {
         super(node);
+        this.isDistinct = "";
+    }
+
+    private String isDistinct;
+
+    public String getIsDistinct()
+    {
+        return isDistinct;
+    }
+
+    public void setIsDistinct(String isDistinct) {
+        this.isDistinct = isDistinct + " ";
     }
 
     @Override
@@ -33,7 +46,7 @@ public class SelectObjNode extends ASTNode {
     @Override
     public void visit(ASTNode node, StringBuilder queryString)
     {
-        queryString.append(toString() + " FROM ");
+        queryString.append(isDistinct + toString() + " FROM ");
         for (ASTNode child : getChildren())
         {
             child.visit(child, queryString);
-- 
Gitee


From 15ef28ad4f5262588d531593cf3bbb09ee63bb8f Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Tue, 10 Sep 2024 16:20:14 +0800
Subject: [PATCH 027/113] add case when

---
 sqlTranslate/.idea/workspace.xml              | 19 ++++++++-----
 .../AST/CaseWhen/CaseConditionNode.java       | 25 +++++++++++++++++
 .../Parser/AST/CaseWhen/CaseElseNode.java     | 24 +++++++++++++++++
 .../java/Parser/AST/CaseWhen/CaseEndNode.java | 27 +++++++++++++++++++
 .../Parser/AST/CaseWhen/CaseThenNode.java     | 25 +++++++++++++++++
 .../src/main/java/Parser/OracleParser.java    | 22 +++++++++++++++
 6 files changed, 136 insertions(+), 6 deletions(-)
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/CaseWhen/CaseConditionNode.java
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/CaseWhen/CaseElseNode.java
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/CaseWhen/CaseEndNode.java
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/CaseWhen/CaseThenNode.java

diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
index b0ee1e81..c2120bd1 100644
--- a/sqlTranslate/.idea/workspace.xml
+++ b/sqlTranslate/.idea/workspace.xml
@@ -5,12 +5,12 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add select">
-      <change afterPath="$PROJECT_DIR$/src/main/java/Document/Insert statement in Oracle" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/CaseWhen/CaseConditionNode.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/CaseWhen/CaseElseNode.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/CaseWhen/CaseEndNode.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/CaseWhen/CaseThenNode.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Document/Select statement in Oracle" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Document/Select statement in Oracle" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Document/Todolist" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Document/Todolist" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Lexer/OracleLexer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Lexer/OracleLexer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Select/SelectObjNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Select/SelectObjNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -283,7 +283,14 @@
       <option name="project" value="LOCAL" />
       <updated>1725937361130</updated>
     </task>
-    <option name="localTasksCounter" value="26" />
+    <task id="LOCAL-00026" summary="add select">
+      <created>1725955766774</created>
+      <option name="number" value="00026" />
+      <option name="presentableId" value="LOCAL-00026" />
+      <option name="project" value="LOCAL" />
+      <updated>1725955766774</updated>
+    </task>
+    <option name="localTasksCounter" value="27" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
diff --git a/sqlTranslate/src/main/java/Parser/AST/CaseWhen/CaseConditionNode.java b/sqlTranslate/src/main/java/Parser/AST/CaseWhen/CaseConditionNode.java
new file mode 100644
index 00000000..7a9bf1af
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/CaseWhen/CaseConditionNode.java
@@ -0,0 +1,25 @@
+package Parser.AST.CaseWhen;
+
+import Lexer.Token;
+import Parser.AST.ASTNode;
+
+import java.util.List;
+
+public class CaseConditionNode extends ASTNode {
+    public CaseConditionNode(ASTNode node) {
+        super(node);
+    }
+
+    public CaseConditionNode(List<Token> tokens) {
+        super(tokens);
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString) {
+        queryString.append("CASE WHEN " + toString() + " ");
+        for (ASTNode child : getChildren())
+        {
+            child.visit(child, queryString);
+        }
+    }
+}
diff --git a/sqlTranslate/src/main/java/Parser/AST/CaseWhen/CaseElseNode.java b/sqlTranslate/src/main/java/Parser/AST/CaseWhen/CaseElseNode.java
new file mode 100644
index 00000000..2ec12f76
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/CaseWhen/CaseElseNode.java
@@ -0,0 +1,24 @@
+package Parser.AST.CaseWhen;
+
+import Lexer.Token;
+import Parser.AST.ASTNode;
+
+import java.util.List;
+
+public class CaseElseNode extends ASTNode {
+    public CaseElseNode(ASTNode node) {
+        super(node);
+    }
+
+    public CaseElseNode(List<Token> tokens) {
+        super(tokens);
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString) {
+        queryString.append("ELSE " + toString() + " ");
+        for (ASTNode child : getChildren()) {
+            child.visit(child, queryString);
+        }
+    }
+}
diff --git a/sqlTranslate/src/main/java/Parser/AST/CaseWhen/CaseEndNode.java b/sqlTranslate/src/main/java/Parser/AST/CaseWhen/CaseEndNode.java
new file mode 100644
index 00000000..927cc51b
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/CaseWhen/CaseEndNode.java
@@ -0,0 +1,27 @@
+package Parser.AST.CaseWhen;
+
+import Lexer.Token;
+import Parser.AST.ASTNode;
+
+import java.util.List;
+
+public class CaseEndNode extends ASTNode {
+    public CaseEndNode(ASTNode node)
+    {
+        super(node);
+    }
+
+    public CaseEndNode(List<Token> tokens)
+    {
+        super(tokens);
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString) {
+        queryString.append(toString());
+        for (ASTNode child : getChildren())
+        {
+            child.visit(child, queryString);
+        }
+    }
+}
diff --git a/sqlTranslate/src/main/java/Parser/AST/CaseWhen/CaseThenNode.java b/sqlTranslate/src/main/java/Parser/AST/CaseWhen/CaseThenNode.java
new file mode 100644
index 00000000..9c71911f
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/CaseWhen/CaseThenNode.java
@@ -0,0 +1,25 @@
+package Parser.AST.CaseWhen;
+
+import Lexer.Token;
+import Parser.AST.ASTNode;
+
+import java.util.List;
+
+public class CaseThenNode extends ASTNode {
+    public CaseThenNode(ASTNode node) {
+        super(node);
+    }
+
+    public CaseThenNode(List<Token> tokens) {
+        super(tokens);
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString) {
+        queryString.append("THEN " + toString() + " ");
+        for (ASTNode child : getChildren())
+        {
+            child.visit(child, queryString);
+        }
+    }
+}
diff --git a/sqlTranslate/src/main/java/Parser/OracleParser.java b/sqlTranslate/src/main/java/Parser/OracleParser.java
index 9551149a..c5034ede 100644
--- a/sqlTranslate/src/main/java/Parser/OracleParser.java
+++ b/sqlTranslate/src/main/java/Parser/OracleParser.java
@@ -13,6 +13,7 @@ import Parser.AST.Insert.InsertDataNode;
 import Parser.AST.Insert.InsertEndNode;
 import Parser.AST.Insert.InsertNode;
 import Parser.AST.Insert.InsertObjNode;
+import Parser.AST.Select.SelectNode;
 
 import java.util.Stack;
 
@@ -39,6 +40,9 @@ public class OracleParser {
         else if (tokens.get(0).getValue().equalsIgnoreCase("DROP")) {
             return parseDrop();
         }
+        else if (tokens.get(0).getValue().equalsIgnoreCase("SELECT")) {
+            return parseSelect();
+        }
         else {
             try {
                 throw new ParseFailedException("Parse failed!");
@@ -352,5 +356,23 @@ public class OracleParser {
         return root;
     }
 
+    private ASTNode parseSelect() {
+        List <Token> tokens = new ArrayList<>();
+        tokens.add(lexer.getTokens().get(0));
+        ASTNode root = new SelectNode(tokens);
+        ASTNode currentNode = root;
+
+        return root;
+    }
+
+    private ASTNode parseCaseWhen() {
+        List <Token> tokens = new ArrayList<>();
+        tokens.add(lexer.getTokens().get(0));
+        ASTNode root = new SelectNode(tokens);
+        ASTNode currentNode = root;
+
+        return root;
+    }
+
 
 }
-- 
Gitee


From 54a4bf3db0d327b79e9ad3fa550feb1e2fd987e9 Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Tue, 10 Sep 2024 16:48:55 +0800
Subject: [PATCH 028/113] revise

---
 sqlTranslate/.idea/workspace.xml              |  19 +-
 sqlTranslate/src/main/java/Main.java          |  16 +-
 .../src/main/java/Parser/OracleParser.java    | 280 +++++++++++-------
 3 files changed, 193 insertions(+), 122 deletions(-)

diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
index c2120bd1..4aae095a 100644
--- a/sqlTranslate/.idea/workspace.xml
+++ b/sqlTranslate/.idea/workspace.xml
@@ -4,12 +4,9 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add select">
-      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/CaseWhen/CaseConditionNode.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/CaseWhen/CaseElseNode.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/CaseWhen/CaseEndNode.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/CaseWhen/CaseThenNode.java" afterDir="false" />
+    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add case when">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Main.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -290,7 +287,14 @@
       <option name="project" value="LOCAL" />
       <updated>1725955766774</updated>
     </task>
-    <option name="localTasksCounter" value="27" />
+    <task id="LOCAL-00027" summary="add case when">
+      <created>1725956415475</created>
+      <option name="number" value="00027" />
+      <option name="presentableId" value="LOCAL-00027" />
+      <option name="project" value="LOCAL" />
+      <updated>1725956415475</updated>
+    </task>
+    <option name="localTasksCounter" value="28" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
@@ -318,7 +322,8 @@
     <MESSAGE value="add insert sql" />
     <MESSAGE value="add todolist" />
     <MESSAGE value="add select" />
-    <option name="LAST_COMMIT_MESSAGE" value="add select" />
+    <MESSAGE value="add case when" />
+    <option name="LAST_COMMIT_MESSAGE" value="add case when" />
   </component>
   <component name="XDebuggerManager">
     <watches-manager>
diff --git a/sqlTranslate/src/main/java/Main.java b/sqlTranslate/src/main/java/Main.java
index 883902c4..12a70a15 100644
--- a/sqlTranslate/src/main/java/Main.java
+++ b/sqlTranslate/src/main/java/Main.java
@@ -7,15 +7,15 @@ import Parser.OracleParser;
 
 public class Main {
     public static void main(String[] args) {
-//        String sql = "CREATE TABLE employees (\n" +
-//                "    employee_id NUMBER PRIMARY KEY,\n" +
-//                "    first_name VARCHAR2(20),\n" +
-//                "    last_name VARCHAR2(25),\n" +
-//                "    email VARCHAR2(25),\n" +
-//                "    hire_date DATE\n" +
-//                ");";
+        String sql = "CREATE TABLE employees (\n" +
+                "    employee_id NUMBER PRIMARY KEY,\n" +
+                "    first_name VARCHAR2(20),\n" +
+                "    last_name VARCHAR2(25),\n" +
+                "    email VARCHAR2(25),\n" +
+                "    hire_date DATE\n" +
+                ");";
 //        String sql = "INSERT INTO employees (first_name, last_name, email) VALUES ('Jane', 'Smith', 'janesm@example.com');";
-        String sql = "DROP TABLE employees CASCADE CONSTRAINTS;";
+//        String sql = "DROP TABLE employees CASCADE CONSTRAINTS;";
         OracleLexer lexer = new OracleLexer(sql);
         lexer.printTokens();
         OracleParser parser = new OracleParser(lexer);
diff --git a/sqlTranslate/src/main/java/Parser/OracleParser.java b/sqlTranslate/src/main/java/Parser/OracleParser.java
index c5034ede..38d615c3 100644
--- a/sqlTranslate/src/main/java/Parser/OracleParser.java
+++ b/sqlTranslate/src/main/java/Parser/OracleParser.java
@@ -4,6 +4,10 @@ import Lexer.OracleLexer;
 import Lexer.Token;
 import Parser.AST.ASTNode;
 import Exception.ParseFailedException;
+import Parser.AST.CaseWhen.CaseConditionNode;
+import Parser.AST.CaseWhen.CaseElseNode;
+import Parser.AST.CaseWhen.CaseEndNode;
+import Parser.AST.CaseWhen.CaseThenNode;
 import Parser.AST.CreateTable.*;
 import Parser.AST.DropTable.DropTableEndNode;
 import Parser.AST.DropTable.DropTableNameNode;
@@ -28,20 +32,19 @@ public class OracleParser {
     }
     public ASTNode parse()
     {
-        List<Token> tokens = lexer.getTokens();
         // check if the input is a create table statement
-        if ((tokens.get(0).getValue().equalsIgnoreCase("CREATE") && tokens.get(1).getValue().equalsIgnoreCase("TABLE")) ||
-                (tokens.get(0).getValue().equalsIgnoreCase("CREATE") && tokens.get(2).getValue().equalsIgnoreCase("TEMPORARY") && tokens.get(3).getValue().equalsIgnoreCase("TABLE")) ) {
-            return parseCreateTab();
+        if ((lexer.getTokens().get(0).getValue().equalsIgnoreCase("CREATE") && lexer.getTokens().get(1).getValue().equalsIgnoreCase("TABLE")) ||
+                (lexer.getTokens().get(0).getValue().equalsIgnoreCase("CREATE") && lexer.getTokens().get(2).getValue().equalsIgnoreCase("TEMPORARY") && lexer.getTokens().get(3).getValue().equalsIgnoreCase("TABLE")) ) {
+            return parseCreateTab(lexer.getTokens());
         }
-        else if (tokens.get(0).getValue().equalsIgnoreCase("INSERT")) {
-            return parseInsert();
+        else if (lexer.getTokens().get(0).getValue().equalsIgnoreCase("INSERT")) {
+            return parseInsert(lexer.getTokens());
         }
-        else if (tokens.get(0).getValue().equalsIgnoreCase("DROP")) {
-            return parseDrop();
+        else if (lexer.getTokens().get(0).getValue().equalsIgnoreCase("DROP")) {
+            return parseDrop(lexer.getTokens());
         }
-        else if (tokens.get(0).getValue().equalsIgnoreCase("SELECT")) {
-            return parseSelect();
+        else if (lexer.getTokens().get(0).getValue().equalsIgnoreCase("SELECT")) {
+            return parseSelect(lexer.getTokens());
         }
         else {
             try {
@@ -54,19 +57,19 @@ public class OracleParser {
         }
     }
 
-    private ASTNode parseCreateTab() {
+    private ASTNode parseCreateTab(List<Token> parseTokens) {
         List <Token> tokens = new ArrayList<>();
-        tokens.add(lexer.getTokens().get(0));
+        tokens.add(parseTokens.get(0));
         ASTNode root = new CreateTabNode(tokens);
         ASTNode currentNode = null;
-        for (int i = 1; i < lexer.getTokens().size(); i++) {
-//            System.out.println("Parsing the token: " + lexer.getTokens().get(i).getValue());
-            if (i == 1 && lexer.getTokens().get(i).getValue().equalsIgnoreCase("TABLE")) {
+        for (int i = 1; i < parseTokens.size(); i++) {
+//            System.out.println("Parsing the token: " + parseTokens.get(i).getValue());
+            if (i == 1 && parseTokens.get(i).getValue().equalsIgnoreCase("TABLE")) {
                 tokens = new ArrayList<>();
 
-                tokens.add(lexer.getTokens().get(i));
+                tokens.add(parseTokens.get(i));
                 try {
-                    tokens.add(lexer.getTokens().get(i + 1));
+                    tokens.add(parseTokens.get(i + 1));
                 }
                 catch (ParseFailedException e) {
                     e.printStackTrace();
@@ -77,18 +80,18 @@ public class OracleParser {
                 root.addChild(child);
                 currentNode = child;
             }
-            else if (i == 1 && !lexer.getTokens().get(i).getValue().equalsIgnoreCase("TABLE")){
+            else if (i == 1 && !parseTokens.get(i).getValue().equalsIgnoreCase("TABLE")){
                 tokens = new ArrayList<>();
-                tokens.add(lexer.getTokens().get(i));
-                for (int j = i + 1; j < lexer.getTokens().size(); j++) {
-                    if (lexer.getTokens().get(j).getValue().equalsIgnoreCase("TABLE")) {
+                tokens.add(parseTokens.get(i));
+                for (int j = i + 1; j < parseTokens.size(); j++) {
+                    if (parseTokens.get(j).getValue().equalsIgnoreCase("TABLE")) {
                         ASTNode child = new TableTypeNode(tokens);
                         root.addChild(child);
                         currentNode = child;
                         tokens = new ArrayList<>();
-                        tokens.add(lexer.getTokens().get(j));
+                        tokens.add(parseTokens.get(j));
                         try {
-                            tokens.add(lexer.getTokens().get(j + 1));
+                            tokens.add(parseTokens.get(j + 1));
                         }
                         catch (ParseFailedException e) {
                             e.printStackTrace();
@@ -96,42 +99,42 @@ public class OracleParser {
                         i = j + 2; // pass the "("
                         break;
                     }
-                    tokens.add(lexer.getTokens().get(j));
+                    tokens.add(parseTokens.get(j));
                 }
 
                 ASTNode child = new TableNode(tokens);
                 currentNode.addChild(child);
                 currentNode = child;
             }
-            else if (lexer.getTokens().get(i).hasType(Token.TokenType.IDENTIFIER)) {
+            else if (parseTokens.get(i).hasType(Token.TokenType.IDENTIFIER)) {
                 // Token.TokenType.IDENTIFIER ... , -> column node
                 tokens = new ArrayList<>();
                 ColumnNode child = new ColumnNode();
-                child.setName(lexer.getTokens().get(i));
-                tokens.add(lexer.getTokens().get(i));
+                child.setName(parseTokens.get(i));
+                tokens.add(parseTokens.get(i));
                 List <Token> constraint = new ArrayList<>();
-                for (int j = i + 1; j < lexer.getTokens().size(); j++) {
+                for (int j = i + 1; j < parseTokens.size(); j++) {
                     if (j == i + 1) {
-                        child.setType(lexer.getTokens().get(j));
+                        child.setType(parseTokens.get(j));
                     }
                     // Check () or REFERENCES other_table(other_column)
-                    if (lexer.getTokens().get(j).hasType(Token.TokenType.KEYWORD) &&
-                            (lexer.getTokens().get(j).getValue().equalsIgnoreCase("REFERENCES")
-                                    || lexer.getTokens().get(j).getValue().equalsIgnoreCase("CHECK"))) {
-                        tokens.add(lexer.getTokens().get(j));
+                    if (parseTokens.get(j).hasType(Token.TokenType.KEYWORD) &&
+                            (parseTokens.get(j).getValue().equalsIgnoreCase("REFERENCES")
+                                    || parseTokens.get(j).getValue().equalsIgnoreCase("CHECK"))) {
+                        tokens.add(parseTokens.get(j));
                         Stack<String> stack = new Stack<>();
-                        for (int k = j + 1; k < lexer.getTokens().size(); k++) {
-                            tokens.add(lexer.getTokens().get(k));
-                            constraint.add(lexer.getTokens().get(k));
-                            if (lexer.getTokens().get(k).getValue().equals("(")) {
+                        for (int k = j + 1; k < parseTokens.size(); k++) {
+                            tokens.add(parseTokens.get(k));
+                            constraint.add(parseTokens.get(k));
+                            if (parseTokens.get(k).getValue().equals("(")) {
                                 stack.push("(");
-                                for (int t = k + 1; t < lexer.getTokens().size(); t++) {
-                                    tokens.add(lexer.getTokens().get(t));
-                                    constraint.add(lexer.getTokens().get(t));
-                                    if (lexer.getTokens().get(t).getValue().equals("(")) {
+                                for (int t = k + 1; t < parseTokens.size(); t++) {
+                                    tokens.add(parseTokens.get(t));
+                                    constraint.add(parseTokens.get(t));
+                                    if (parseTokens.get(t).getValue().equals("(")) {
                                         stack.push("(");
                                     }
-                                    else if (lexer.getTokens().get(t).getValue().equals(")")) {
+                                    else if (parseTokens.get(t).getValue().equals(")")) {
                                         stack.pop();
                                         if (stack.empty()) {
                                             i = t;
@@ -144,14 +147,14 @@ public class OracleParser {
                         }
                         break;
                     }
-                    if ((lexer.getTokens().get(j).hasType(Token.TokenType.SYMBOL) && lexer.getTokens().get(j).getValue().equals(",")) ||
-                            (lexer.getTokens().get(j).hasType(Token.TokenType.SYMBOL) && lexer.getTokens().get(j).getValue().equals(")")) ) {
+                    if ((parseTokens.get(j).hasType(Token.TokenType.SYMBOL) && parseTokens.get(j).getValue().equals(",")) ||
+                            (parseTokens.get(j).hasType(Token.TokenType.SYMBOL) && parseTokens.get(j).getValue().equals(")")) ) {
                         i = j;
                         break;
                     }
-                    tokens.add(lexer.getTokens().get(j));
+                    tokens.add(parseTokens.get(j));
                     if (j != i + 1) {
-                        constraint.add(lexer.getTokens().get(j));
+                        constraint.add(parseTokens.get(j));
                     }
                 }
                 child.setTokens(tokens);
@@ -159,36 +162,36 @@ public class OracleParser {
                 currentNode.addChild(child);
                 currentNode = child;
             }
-            else if (lexer.getTokens().get(i).hasType(Token.TokenType.KEYWORD)
-                    && lexer.getTokens().get(i).getValue().equalsIgnoreCase("CONSTRAINT")) {
+            else if (parseTokens.get(i).hasType(Token.TokenType.KEYWORD)
+                    && parseTokens.get(i).getValue().equalsIgnoreCase("CONSTRAINT")) {
                 // Table constraint
                 tokens = new ArrayList<>();
-                tokens.add(lexer.getTokens().get(i));
-                for (int j = i + 1; j < lexer.getTokens().size(); j++) {
+                tokens.add(parseTokens.get(i));
+                for (int j = i + 1; j < parseTokens.size(); j++) {
                     /**
                      * CONSTRAINT pk_example PRIMARY KEY (column1, column2)
                      * CONSTRAINT uk_example UNIQUE (column1)
                      * CONSTRAINT fk_example FOREIGN KEY (column1) REFERENCES other_table(column2)
                      * CONSTRAINT chk_example CHECK (column1 > 0)
                      */
-                    if (lexer.getTokens().get(j).hasType(Token.TokenType.KEYWORD) &&
-                            (lexer.getTokens().get(j).getValue().equalsIgnoreCase("UNIQUE")
-                                    || lexer.getTokens().get(j).getValue().equalsIgnoreCase("CHECK")
-                                    || lexer.getTokens().get(j).getValue().equalsIgnoreCase("PRIMARY KEY")
-                                    || lexer.getTokens().get(j).getValue().equalsIgnoreCase("FOREIGN KEY")
-                                    || lexer.getTokens().get(j).getValue().equalsIgnoreCase("REFERENCES"))) {
-                        tokens.add(lexer.getTokens().get(j));
+                    if (parseTokens.get(j).hasType(Token.TokenType.KEYWORD) &&
+                            (parseTokens.get(j).getValue().equalsIgnoreCase("UNIQUE")
+                                    || parseTokens.get(j).getValue().equalsIgnoreCase("CHECK")
+                                    || parseTokens.get(j).getValue().equalsIgnoreCase("PRIMARY KEY")
+                                    || parseTokens.get(j).getValue().equalsIgnoreCase("FOREIGN KEY")
+                                    || parseTokens.get(j).getValue().equalsIgnoreCase("REFERENCES"))) {
+                        tokens.add(parseTokens.get(j));
                         Stack<String> stack = new Stack<>();
-                        for (int k = j + 1; k < lexer.getTokens().size(); k++) {
-                            tokens.add(lexer.getTokens().get(k));
-                            if (lexer.getTokens().get(k).getValue().equals("(")) {
+                        for (int k = j + 1; k < parseTokens.size(); k++) {
+                            tokens.add(parseTokens.get(k));
+                            if (parseTokens.get(k).getValue().equals("(")) {
                                 stack.push("(");
-                                for (int t = k + 1; t < lexer.getTokens().size(); t++) {
-                                    tokens.add(lexer.getTokens().get(t));
-                                    if (lexer.getTokens().get(t).getValue().equals("(")) {
+                                for (int t = k + 1; t < parseTokens.size(); t++) {
+                                    tokens.add(parseTokens.get(t));
+                                    if (parseTokens.get(t).getValue().equals("(")) {
                                         stack.push("(");
                                     }
-                                    else if (lexer.getTokens().get(t).getValue().equals(")")) {
+                                    else if (parseTokens.get(t).getValue().equals(")")) {
                                         stack.pop();
                                         if (stack.empty()) {
                                             i = t;
@@ -202,27 +205,27 @@ public class OracleParser {
                         }
                         continue;
                     }
-                    if ((lexer.getTokens().get(j).hasType(Token.TokenType.SYMBOL) && lexer.getTokens().get(j).getValue().equals(",")) ||
-                            (lexer.getTokens().get(j).hasType(Token.TokenType.SYMBOL) && lexer.getTokens().get(j).getValue().equals(")")) ) {
+                    if ((parseTokens.get(j).hasType(Token.TokenType.SYMBOL) && parseTokens.get(j).getValue().equals(",")) ||
+                            (parseTokens.get(j).hasType(Token.TokenType.SYMBOL) && parseTokens.get(j).getValue().equals(")")) ) {
                         i = j;
                         break;
                     }
-                    tokens.add(lexer.getTokens().get(j));
+                    tokens.add(parseTokens.get(j));
                 }
 
             }
-            else if (lexer.getTokens().get(i).hasType(Token.TokenType.SYMBOL) && lexer.getTokens().get(i).getValue().equals(";")) {
+            else if (parseTokens.get(i).hasType(Token.TokenType.SYMBOL) && parseTokens.get(i).getValue().equals(";")) {
                 tokens = new ArrayList<>();
-                tokens.add(lexer.getTokens().get(i));
+                tokens.add(parseTokens.get(i));
                 ASTNode EndNode = new CRTEndNode(tokens);
                 currentNode.addChild(EndNode);
                 currentNode = EndNode;
             }
-            else if (lexer.getTokens().get(i).hasType(Token.TokenType.EOF)) {
+            else if (parseTokens.get(i).hasType(Token.TokenType.EOF)) {
                 break;
             }
             else {
-//                System.out.println("Fail to parse:" + lexer.getTokens().get(i).getValue());
+//                System.out.println("Fail to parse:" + parseTokens.get(i).getValue());
                 try {
                     throw new ParseFailedException("Parse failed!");
                 }
@@ -234,11 +237,11 @@ public class OracleParser {
         return root;
     }
 
-    private ASTNode parseInsert() {
+    private ASTNode parseInsert(List<Token> parseTokens) {
         List <Token> tokens = new ArrayList<>();
-        tokens.add(lexer.getTokens().get(0));
+        tokens.add(parseTokens.get(0));
         try {
-            tokens.add(lexer.getTokens().get(1));
+            tokens.add(parseTokens.get(1));
         }
         catch (ParseFailedException e) {
             e.printStackTrace();
@@ -246,14 +249,14 @@ public class OracleParser {
         ASTNode root = new InsertNode(tokens);
         ASTNode currentNode = root;
 
-        for (int i = 2; i < lexer.getTokens().size(); i++) {
-            if (lexer.getTokens().get(i).hasType(Token.TokenType.IDENTIFIER)) { // table name
+        for (int i = 2; i < parseTokens.size(); i++) {
+            if (parseTokens.get(i).hasType(Token.TokenType.IDENTIFIER)) { // table name
                 tokens = new ArrayList<>();
-                tokens.add(lexer.getTokens().get(i));
-                if (i + 1 < lexer.getTokens().size() && ! (lexer.getTokens().get(i + 1).hasType(Token.TokenType.KEYWORD) && lexer.getTokens().get(i + 1).getValue().equalsIgnoreCase("VALUES"))) {
-                    for (int j = i + 1; j < lexer.getTokens().size(); j++) {
-                        tokens.add(lexer.getTokens().get(j));
-                        if (lexer.getTokens().get(j).hasType(Token.TokenType.SYMBOL) && lexer.getTokens().get(j).getValue().equals(")")) {
+                tokens.add(parseTokens.get(i));
+                if (i + 1 < parseTokens.size() && ! (parseTokens.get(i + 1).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i + 1).getValue().equalsIgnoreCase("VALUES"))) {
+                    for (int j = i + 1; j < parseTokens.size(); j++) {
+                        tokens.add(parseTokens.get(j));
+                        if (parseTokens.get(j).hasType(Token.TokenType.SYMBOL) && parseTokens.get(j).getValue().equals(")")) {
                             i = j;
                             break;
                         }
@@ -263,28 +266,28 @@ public class OracleParser {
                 currentNode.addChild(childNode);
                 currentNode = childNode;
             }
-            else if (lexer.getTokens().get(i).hasType(Token.TokenType.KEYWORD) && lexer.getTokens().get(i).getValue().equalsIgnoreCase("VALUES")) {
+            else if (parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("VALUES")) {
                 tokens = new ArrayList<>();
-                tokens.add(lexer.getTokens().get(i));
-                for (int j = i + 1; j < lexer.getTokens().size(); j++) {
-                    if (lexer.getTokens().get(j).hasType(Token.TokenType.SYMBOL) && lexer.getTokens().get(j).getValue().equals(";")) {
+                tokens.add(parseTokens.get(i));
+                for (int j = i + 1; j < parseTokens.size(); j++) {
+                    if (parseTokens.get(j).hasType(Token.TokenType.SYMBOL) && parseTokens.get(j).getValue().equals(";")) {
                         i = j - 1;
                         break;
                     }
-                    tokens.add(lexer.getTokens().get(j));
+                    tokens.add(parseTokens.get(j));
                 }
                 ASTNode childNode = new InsertDataNode(tokens);
                 currentNode.addChild(childNode);
                 currentNode = childNode;
             }
-            else if (lexer.getTokens().get(i).hasType(Token.TokenType.SYMBOL) && lexer.getTokens().get(i).getValue().equals(";")) {
+            else if (parseTokens.get(i).hasType(Token.TokenType.SYMBOL) && parseTokens.get(i).getValue().equals(";")) {
                 tokens = new ArrayList<>();
-                tokens.add(lexer.getTokens().get(i));
+                tokens.add(parseTokens.get(i));
                 ASTNode childNode = new InsertEndNode(tokens);
                 currentNode.addChild(childNode);
                 currentNode = childNode;
             }
-            else if (lexer.getTokens().get(i).hasType(Token.TokenType.EOF)) {
+            else if (parseTokens.get(i).hasType(Token.TokenType.EOF)) {
                 break;
             }
             else {
@@ -302,11 +305,11 @@ public class OracleParser {
     }
 
     // Drop table
-    private ASTNode parseDrop() {
+    private ASTNode parseDrop(List<Token> parseTokens) {
         List <Token> tokens = new ArrayList<>();
-        tokens.add(lexer.getTokens().get(0));
+        tokens.add(parseTokens.get(0));
         try {
-            tokens.add(lexer.getTokens().get(1));
+            tokens.add(parseTokens.get(1));
         }
         catch (ParseFailedException e) {
             e.printStackTrace();
@@ -314,33 +317,33 @@ public class OracleParser {
         ASTNode root = new DropTableNode(tokens);
         ASTNode currentNode = root;
 
-        for (int i = 2; i < lexer.getTokens().size(); i++) {
-            if (lexer.getTokens().get(i).hasType(Token.TokenType.IDENTIFIER)) {
+        for (int i = 2; i < parseTokens.size(); i++) {
+            if (parseTokens.get(i).hasType(Token.TokenType.IDENTIFIER)) {
                 tokens = new ArrayList<>();
-                tokens.add(lexer.getTokens().get(i));
+                tokens.add(parseTokens.get(i));
                 ASTNode childNode = new DropTableNameNode(tokens);
                 currentNode.addChild(childNode);
                 currentNode = childNode;
             }
-            else if (lexer.getTokens().get(i).hasType(Token.TokenType.KEYWORD) && lexer.getTokens().get(i).getValue().equalsIgnoreCase("CASCADE")) {
+            else if (parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("CASCADE")) {
                 tokens = new ArrayList<>();
-                tokens.add(lexer.getTokens().get(i));
-                if (i + 1 < lexer.getTokens().size() && (lexer.getTokens().get(i + 1).hasType(Token.TokenType.KEYWORD) && lexer.getTokens().get(i + 1).getValue().equals("CONSTRAINTS"))) {
-                    tokens.add(lexer.getTokens().get(i + 1));
+                tokens.add(parseTokens.get(i));
+                if (i + 1 < parseTokens.size() && (parseTokens.get(i + 1).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i + 1).getValue().equals("CONSTRAINTS"))) {
+                    tokens.add(parseTokens.get(i + 1));
                     i++;
                 }
                 ASTNode childNode = new DropTableOptionNode(tokens);
                 currentNode.addChild(childNode);
                 currentNode = childNode;
             }
-            else if (lexer.getTokens().get(i).hasType(Token.TokenType.SYMBOL) && lexer.getTokens().get(i).getValue().equals(";")) {
+            else if (parseTokens.get(i).hasType(Token.TokenType.SYMBOL) && parseTokens.get(i).getValue().equals(";")) {
                 tokens = new ArrayList<>();
-                tokens.add(lexer.getTokens().get(i));
+                tokens.add(parseTokens.get(i));
                 ASTNode childNode = new DropTableEndNode(tokens);
                 currentNode.addChild(childNode);
                 currentNode = childNode;
             }
-            else if (lexer.getTokens().get(i).hasType(Token.TokenType.EOF)) {
+            else if (parseTokens.get(i).hasType(Token.TokenType.EOF)) {
                 break;
             }
             else {
@@ -356,21 +359,84 @@ public class OracleParser {
         return root;
     }
 
-    private ASTNode parseSelect() {
+    private ASTNode parseSelect(List<Token> parseTokens) {
         List <Token> tokens = new ArrayList<>();
-        tokens.add(lexer.getTokens().get(0));
+        tokens.add(parseTokens.get(0));
         ASTNode root = new SelectNode(tokens);
         ASTNode currentNode = root;
 
         return root;
     }
 
-    private ASTNode parseCaseWhen() {
+    /**
+     * CASE WHEN expr THEN expr [ELSE expr] END
+     */
+    private ASTNode parseCaseWhen(List<Token> parseTokens) {
         List <Token> tokens = new ArrayList<>();
-        tokens.add(lexer.getTokens().get(0));
-        ASTNode root = new SelectNode(tokens);
+        tokens.add(parseTokens.get(0));
+
+        try {
+            tokens.add(parseTokens.get(1));
+        }
+        catch (ParseFailedException e) {
+            e.printStackTrace();
+        }
+        int currentIndex = 2;
+        for (int i = currentIndex; i < parseTokens.size(); i++) {
+            tokens.add(parseTokens.get(i));
+            if (parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("THEN")) {
+                currentIndex = i;
+                break;
+            }
+        }
+        ASTNode root = new CaseConditionNode(tokens);
         ASTNode currentNode = root;
 
+        tokens = new ArrayList<>();
+        for (int i = currentIndex; i < parseTokens.size(); i++) {
+            tokens.add(parseTokens.get(i));
+            if ( (parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("ELSE"))
+            || (parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("END")) ) {
+                currentIndex = i;
+                break;
+            }
+        }
+        ASTNode childNode = new CaseThenNode(tokens);
+        currentNode.addChild(childNode);
+        currentNode = childNode;
+
+        tokens = new ArrayList<>();
+        for (int i = currentIndex; i < parseTokens.size(); i++) {
+            if (parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("ELSE")) {
+                for (int j = i; j < parseTokens.size(); j++) {
+                    tokens.add(parseTokens.get(j));
+                    if (parseTokens.get(j).hasType(Token.TokenType.KEYWORD) && parseTokens.get(j).getValue().equalsIgnoreCase("END")) {
+                        childNode = new CaseElseNode(tokens);
+                        currentNode.addChild(childNode);
+                        currentNode = childNode;
+                        i = j;
+                        break;
+                    }
+                }
+            }
+            else if (parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("END")) {
+                tokens = new ArrayList<>();
+                tokens.add(parseTokens.get(i));
+                childNode = new CaseEndNode(tokens);
+                currentNode.addChild(childNode);
+                currentNode = childNode;
+                break;
+            }
+            else {
+                try {
+                    throw new ParseFailedException("Parse failed!");
+                }
+                catch (ParseFailedException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+
         return root;
     }
 
-- 
Gitee


From b4c48ae0851a3d368108a770f9dff4bdcae75c65 Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Tue, 10 Sep 2024 22:29:41 +0800
Subject: [PATCH 029/113] revise

---
 sqlTranslate/src/main/java/Lexer/OracleLexer.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/sqlTranslate/src/main/java/Lexer/OracleLexer.java b/sqlTranslate/src/main/java/Lexer/OracleLexer.java
index e0f4ef89..e1b6e263 100644
--- a/sqlTranslate/src/main/java/Lexer/OracleLexer.java
+++ b/sqlTranslate/src/main/java/Lexer/OracleLexer.java
@@ -14,8 +14,7 @@ public class OracleLexer {
             "NUMBER", "INTEGER", "SMALLIN", "BINARY_INTEGER", "DECIMAL", "REAL", "FLOAT", "DOUBLE PRECISION", "CHAR", "VARCHAR2",
             "NCHAR", "NVARCHAR2", "CLOB", "NCLOB", "DATE", "TIMESTAMP", "TIMESTAMP WITH TIME ZONE", "TIMESTAMP WITH LOCAL TIME ZONE", "BLOB", "RAW",
             "LONG RAW", "BOOLEAN", "INTERVAL YEAR TO MONTH", "INTERVAL DAY TO SECOND", "ROWID", "UROWID", "REF CURSOR",
-            "NOT NULL", "PRIMARY KEY", "UNIQUE", "CHECK", "REFERENCES", "DEFAULT",
-            "CONSTRAINT", "FOREIGN KEY"
+            "NOT NULL", "PRIMARY KEY", "UNIQUE", "CHECK", "REFERENCES", "DEFAULT", "CONSTRAINT", "FOREIGN KEY"
             // keywords of drop table
             , "DROP", "CASCADE", "CONSTRAINTS"
             // keywords of select
-- 
Gitee


From 1155fd3b423a9b017f90c1a7336d25124afb1372 Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Tue, 10 Sep 2024 23:11:01 +0800
Subject: [PATCH 030/113] add pattern of functions in select

---
 sqlTranslate/.idea/workspace.xml              | 25 +++++++++++----
 .../src/main/java/Lexer/OracleLexer.java      | 31 ++++++++++++++++++-
 2 files changed, 49 insertions(+), 7 deletions(-)

diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
index 4aae095a..7fd597c4 100644
--- a/sqlTranslate/.idea/workspace.xml
+++ b/sqlTranslate/.idea/workspace.xml
@@ -4,10 +4,9 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add case when">
+    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="revise">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Main.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Lexer/OracleLexer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Lexer/OracleLexer.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -294,7 +293,21 @@
       <option name="project" value="LOCAL" />
       <updated>1725956415475</updated>
     </task>
-    <option name="localTasksCounter" value="28" />
+    <task id="LOCAL-00028" summary="revise">
+      <created>1725958136981</created>
+      <option name="number" value="00028" />
+      <option name="presentableId" value="LOCAL-00028" />
+      <option name="project" value="LOCAL" />
+      <updated>1725958136981</updated>
+    </task>
+    <task id="LOCAL-00029" summary="revise">
+      <created>1725978582486</created>
+      <option name="number" value="00029" />
+      <option name="presentableId" value="LOCAL-00029" />
+      <option name="project" value="LOCAL" />
+      <updated>1725978582486</updated>
+    </task>
+    <option name="localTasksCounter" value="30" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
@@ -314,7 +327,6 @@
     <MESSAGE value="AST node" />
     <MESSAGE value="add AST node" />
     <MESSAGE value="add functions" />
-    <MESSAGE value="revise" />
     <MESSAGE value="add parser function" />
     <MESSAGE value="add function" />
     <MESSAGE value="coding" />
@@ -323,7 +335,8 @@
     <MESSAGE value="add todolist" />
     <MESSAGE value="add select" />
     <MESSAGE value="add case when" />
-    <option name="LAST_COMMIT_MESSAGE" value="add case when" />
+    <MESSAGE value="revise" />
+    <option name="LAST_COMMIT_MESSAGE" value="revise" />
   </component>
   <component name="XDebuggerManager">
     <watches-manager>
diff --git a/sqlTranslate/src/main/java/Lexer/OracleLexer.java b/sqlTranslate/src/main/java/Lexer/OracleLexer.java
index e1b6e263..95ef462b 100644
--- a/sqlTranslate/src/main/java/Lexer/OracleLexer.java
+++ b/sqlTranslate/src/main/java/Lexer/OracleLexer.java
@@ -29,9 +29,24 @@ public class OracleLexer {
                     "(NCHAR\\(.*?\\))|" +                     // NCHAR() function
                     "(NVARCHAR2\\(.*?\\))|" +                     // NVARCHAR2() function
                     "(RAW\\(.*?\\))|" +                     // RAW() function
+
+                    "(COUNT\\(.*?\\))|" +                     // COUNT() function
+                    "(SUM\\(.*?\\))|" +                     // SUM() function
+                    "(AVG\\(.*?\\))|" +                     // AVG() function
+                    "(MAX\\(.*?\\))|" +                     // MAX() function
+                    "(MIN\\(.*?\\))|" +                     // MIN() function
+
                     "(NOT NULL)|" +
                     "(PRIMARY KEY)|" +
                     "(FOREIGN KEY)|" +
+                    "(DOUBLE PRECISION)|" +
+                    "(TIMESTAMP WITH TIME ZONE)|" +
+                    "(TIMESTAMP WITH LOCAL TIME ZONE)|" +
+                    "(LONG RAW)|" +
+                    "(INTERVAL YEAR TO MONTH)|" +
+                    "(INTERVAL DAY TO SECOND)|" +
+                    "(REF CURSOR)|" +
+
 
                     "(\\b[A-Za-z_][A-Za-z0-9_]*\\b)|" + // Keywords and identifiers
                     "(\\d+\\.?\\d*)|" +                 // Numbers (integer or decimal)
@@ -107,9 +122,23 @@ public class OracleLexer {
         }else if (tokenValue.matches("(?i)RAW\\(.*?\\)")) {
             // RAW() function, CASE_INSENSITIVE
             return new Token(Token.TokenType.KEYWORD, tokenValue);
+        }else if (tokenValue.matches("(?i)COUNT\\(.*?\\)")) {
+            // RAW() function, CASE_INSENSITIVE
+            return new Token(Token.TokenType.KEYWORD, tokenValue);
+        }else if (tokenValue.matches("(?i)SUM\\(.*?\\)")) {
+            // RAW() function, CASE_INSENSITIVE
+            return new Token(Token.TokenType.KEYWORD, tokenValue);
+        }else if (tokenValue.matches("(?i)AVG\\(.*?\\)")) {
+            // RAW() function, CASE_INSENSITIVE
+            return new Token(Token.TokenType.KEYWORD, tokenValue);
+        }else if (tokenValue.matches("(?i)MAX\\(.*?\\)")) {
+            // RAW() function, CASE_INSENSITIVE
+            return new Token(Token.TokenType.KEYWORD, tokenValue);
+        }else if (tokenValue.matches("(?i)MIN\\(.*?\\)")) {
+            // RAW() function, CASE_INSENSITIVE
+            return new Token(Token.TokenType.KEYWORD, tokenValue);
         }
 
-
         else if (isKeyword(tokenValue)) {
             return new Token(Token.TokenType.KEYWORD, tokenValue);
         } else if (tokenValue.matches("[a-zA-Z_][a-zA-Z0-9_]*")) {
-- 
Gitee


From f009be079a0079f8adda5257ef385ce5efd43445 Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Tue, 10 Sep 2024 23:18:30 +0800
Subject: [PATCH 031/113] add some comments

---
 .../src/main/java/Parser/OracleParser.java       | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/sqlTranslate/src/main/java/Parser/OracleParser.java b/sqlTranslate/src/main/java/Parser/OracleParser.java
index 38d615c3..0e5a2825 100644
--- a/sqlTranslate/src/main/java/Parser/OracleParser.java
+++ b/sqlTranslate/src/main/java/Parser/OracleParser.java
@@ -57,6 +57,9 @@ public class OracleParser {
         }
     }
 
+    /**
+     * CREATE TEMPORARY? TABLE _table ( _column _type [, _column _type]... ) [CONSTRAINT _constraint] [, _column _type [, _column _type]...]
+     */
     private ASTNode parseCreateTab(List<Token> parseTokens) {
         List <Token> tokens = new ArrayList<>();
         tokens.add(parseTokens.get(0));
@@ -237,6 +240,9 @@ public class OracleParser {
         return root;
     }
 
+    /**
+     * INSERT INTO table_name VALUES (value1, value2, ...)
+     */
     private ASTNode parseInsert(List<Token> parseTokens) {
         List <Token> tokens = new ArrayList<>();
         tokens.add(parseTokens.get(0));
@@ -304,7 +310,9 @@ public class OracleParser {
         return root;
     }
 
-    // Drop table
+    /**
+     * DROP TABLE _table (CASCADE CONSTRAINTS)?
+     */
     private ASTNode parseDrop(List<Token> parseTokens) {
         List <Token> tokens = new ArrayList<>();
         tokens.add(parseTokens.get(0));
@@ -359,11 +367,17 @@ public class OracleParser {
         return root;
     }
 
+    /**
+     * SELECT DISTINCT? select_obj FROM select_tab where_clause? select_option? union_clause?
+     */
     private ASTNode parseSelect(List<Token> parseTokens) {
         List <Token> tokens = new ArrayList<>();
         tokens.add(parseTokens.get(0));
         ASTNode root = new SelectNode(tokens);
         ASTNode currentNode = root;
+        for(int i = 1; i < parseTokens.size(); i++) {
+            // match select_obj
+        }
 
         return root;
     }
-- 
Gitee


From 995516a90de20c89bd9dc4f1296d19d44aa25cd8 Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Tue, 10 Sep 2024 23:26:09 +0800
Subject: [PATCH 032/113] add parseSelect

---
 .../src/main/java/Parser/AST/Select/SelectObjNode.java    | 4 ++++
 sqlTranslate/src/main/java/Parser/OracleParser.java       | 8 ++++++++
 2 files changed, 12 insertions(+)

diff --git a/sqlTranslate/src/main/java/Parser/AST/Select/SelectObjNode.java b/sqlTranslate/src/main/java/Parser/AST/Select/SelectObjNode.java
index a6e22f9b..4b430099 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Select/SelectObjNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/Select/SelectObjNode.java
@@ -20,6 +20,10 @@ public class SelectObjNode extends ASTNode {
 
     private String isDistinct;
 
+    public SelectObjNode() {
+        super();
+    }
+
     public String getIsDistinct()
     {
         return isDistinct;
diff --git a/sqlTranslate/src/main/java/Parser/OracleParser.java b/sqlTranslate/src/main/java/Parser/OracleParser.java
index 0e5a2825..f1f65796 100644
--- a/sqlTranslate/src/main/java/Parser/OracleParser.java
+++ b/sqlTranslate/src/main/java/Parser/OracleParser.java
@@ -18,6 +18,7 @@ import Parser.AST.Insert.InsertEndNode;
 import Parser.AST.Insert.InsertNode;
 import Parser.AST.Insert.InsertObjNode;
 import Parser.AST.Select.SelectNode;
+import Parser.AST.Select.SelectObjNode;
 
 import java.util.Stack;
 
@@ -377,6 +378,13 @@ public class OracleParser {
         ASTNode currentNode = root;
         for(int i = 1; i < parseTokens.size(); i++) {
             // match select_obj
+            if (i == 1 && parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("DISTINCT")) {
+                SelectObjNode childNode = new SelectObjNode();
+                childNode.setIsDistinct(parseTokens.get(i).getValue());
+                for (int j = i + 1; j < parseTokens.size(); j++) {
+                    //TODO: match select_obj and reindex i
+                }
+            }
         }
 
         return root;
-- 
Gitee


From e6cc96a21f8bc1ea9b2b869ad50a2bf7edb8ce10 Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Wed, 11 Sep 2024 15:55:54 +0800
Subject: [PATCH 033/113] add parseSelect

---
 sqlTranslate/.idea/workspace.xml              |  32 ++++-
 .../src/main/java/Parser/OracleParser.java    | 122 +++++++++++++++++-
 2 files changed, 146 insertions(+), 8 deletions(-)

diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
index 7fd597c4..3c8fca74 100644
--- a/sqlTranslate/.idea/workspace.xml
+++ b/sqlTranslate/.idea/workspace.xml
@@ -4,9 +4,9 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="revise">
+    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add parseSelect">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Lexer/OracleLexer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Lexer/OracleLexer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -307,7 +307,28 @@
       <option name="project" value="LOCAL" />
       <updated>1725978582486</updated>
     </task>
-    <option name="localTasksCounter" value="30" />
+    <task id="LOCAL-00030" summary="add pattern of functions in select">
+      <created>1725981063195</created>
+      <option name="number" value="00030" />
+      <option name="presentableId" value="LOCAL-00030" />
+      <option name="project" value="LOCAL" />
+      <updated>1725981063195</updated>
+    </task>
+    <task id="LOCAL-00031" summary="add some comments">
+      <created>1725981511612</created>
+      <option name="number" value="00031" />
+      <option name="presentableId" value="LOCAL-00031" />
+      <option name="project" value="LOCAL" />
+      <updated>1725981511612</updated>
+    </task>
+    <task id="LOCAL-00032" summary="add parseSelect">
+      <created>1725981975960</created>
+      <option name="number" value="00032" />
+      <option name="presentableId" value="LOCAL-00032" />
+      <option name="project" value="LOCAL" />
+      <updated>1725981975960</updated>
+    </task>
+    <option name="localTasksCounter" value="33" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
@@ -336,7 +357,10 @@
     <MESSAGE value="add select" />
     <MESSAGE value="add case when" />
     <MESSAGE value="revise" />
-    <option name="LAST_COMMIT_MESSAGE" value="revise" />
+    <MESSAGE value="add pattern of functions in select" />
+    <MESSAGE value="add some comments" />
+    <MESSAGE value="add parseSelect" />
+    <option name="LAST_COMMIT_MESSAGE" value="add parseSelect" />
   </component>
   <component name="XDebuggerManager">
     <watches-manager>
diff --git a/sqlTranslate/src/main/java/Parser/OracleParser.java b/sqlTranslate/src/main/java/Parser/OracleParser.java
index f1f65796..b441c3c2 100644
--- a/sqlTranslate/src/main/java/Parser/OracleParser.java
+++ b/sqlTranslate/src/main/java/Parser/OracleParser.java
@@ -17,8 +17,7 @@ import Parser.AST.Insert.InsertDataNode;
 import Parser.AST.Insert.InsertEndNode;
 import Parser.AST.Insert.InsertNode;
 import Parser.AST.Insert.InsertObjNode;
-import Parser.AST.Select.SelectNode;
-import Parser.AST.Select.SelectObjNode;
+import Parser.AST.Select.*;
 
 import java.util.Stack;
 
@@ -381,8 +380,123 @@ public class OracleParser {
             if (i == 1 && parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("DISTINCT")) {
                 SelectObjNode childNode = new SelectObjNode();
                 childNode.setIsDistinct(parseTokens.get(i).getValue());
+                tokens = new ArrayList<>();
                 for (int j = i + 1; j < parseTokens.size(); j++) {
-                    //TODO: match select_obj and reindex i
+                    tokens.add(parseTokens.get(j));
+                    if (parseTokens.get(j).hasType(Token.TokenType.KEYWORD) && parseTokens.get(j).getValue().equalsIgnoreCase("FROM")) {
+                        i = j;
+                        break;
+                    }
+                }
+                childNode.setTokens(tokens);
+                currentNode.addChild(childNode);
+                currentNode = childNode;
+            }
+            else if (i == 1 && parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && !parseTokens.get(i).getValue().equalsIgnoreCase("DISTINCT")) {
+                tokens = new ArrayList<>();
+                for (int j = i; j < parseTokens.size(); j++) {
+                    tokens.add(parseTokens.get(j));
+                    if (parseTokens.get(j).hasType(Token.TokenType.KEYWORD) && parseTokens.get(j).getValue().equalsIgnoreCase("FROM")) {
+                        i = j;
+                        break;
+                    }
+                }
+                ASTNode childNode = new SelectObjNode(tokens);
+                currentNode.addChild(childNode);
+                currentNode = childNode;
+            }
+            // match select_tab (possible last token: ; | GROUP | ORDER | HAVING | WHERE | UNION)
+            else if (currentNode instanceof SelectObjNode) {
+                tokens = new ArrayList<>();
+                for (int j = i; j < parseTokens.size(); j++) {
+                    tokens.add(parseTokens.get(j));
+                    if (
+                            (parseTokens.get(j).hasType(Token.TokenType.KEYWORD) && parseTokens.get(j).getValue().equalsIgnoreCase("WHERE"))
+                            || (parseTokens.get(j).hasType(Token.TokenType.KEYWORD) && parseTokens.get(j).getValue().equalsIgnoreCase("GROUP"))
+                            || (parseTokens.get(j).hasType(Token.TokenType.KEYWORD) && parseTokens.get(j).getValue().equalsIgnoreCase("ORDER"))
+                            || (parseTokens.get(j).hasType(Token.TokenType.KEYWORD) && parseTokens.get(j).getValue().equalsIgnoreCase("HAVING"))
+                            || (parseTokens.get(j).hasType(Token.TokenType.KEYWORD) && parseTokens.get(j).getValue().equalsIgnoreCase("UNION"))
+                            || (parseTokens.get(j).hasType(Token.TokenType.SYMBOL) && parseTokens.get(j).getValue().equals(";"))
+                    ) {
+                        i = j - 1;
+                        break;
+                    }
+                }
+                ASTNode childNode = new SelectTableNode(tokens);
+                currentNode.addChild(childNode);
+                currentNode = childNode;
+            }
+            // match where_clause (possible last token: ; | GROUP | ORDER | HAVING | UNION)
+            else if (parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("WHERE")) {
+                tokens = new ArrayList<>();
+                for (int j = i; j < parseTokens.size(); j++) {
+                    tokens.add(parseTokens.get(j));
+                    if (
+                            (parseTokens.get(j).hasType(Token.TokenType.KEYWORD) && parseTokens.get(j).getValue().equalsIgnoreCase("GROUP"))
+                            || (parseTokens.get(j).hasType(Token.TokenType.KEYWORD) && parseTokens.get(j).getValue().equalsIgnoreCase("ORDER"))
+                            || (parseTokens.get(j).hasType(Token.TokenType.KEYWORD) && parseTokens.get(j).getValue().equalsIgnoreCase("HAVING"))
+                            || (parseTokens.get(j).hasType(Token.TokenType.KEYWORD) && parseTokens.get(j).getValue().equalsIgnoreCase("UNION"))
+                            || (parseTokens.get(j).hasType(Token.TokenType.SYMBOL) && parseTokens.get(j).getValue().equals(";"))
+                    ) {
+                        i = j - 1;
+                        break;
+                    }
+                    ASTNode childNode = new SelectWhereClauseNode(tokens);
+                    currentNode.addChild(childNode);
+                    currentNode = childNode;
+                }
+            }
+            // match select_option
+            else if (
+                    (parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("GROUP"))
+                    || (parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("ORDER"))
+                    || (parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("HAVING"))
+            ) {
+                tokens = new ArrayList<>();
+                for (int j = i; j < parseTokens.size(); j++) {
+                    tokens.add(parseTokens.get(j));
+                    if (
+                          (parseTokens.get(j).hasType(Token.TokenType.KEYWORD) && parseTokens.get(j).getValue().equalsIgnoreCase("UNION"))
+                          || (parseTokens.get(j).hasType(Token.TokenType.SYMBOL) && parseTokens.get(j).getValue().equals(";"))
+                    ) {
+                        i = j - 1;
+                        break;
+                    }
+                    ASTNode childNode = new SelectOptionNode(tokens);
+                    currentNode.addChild(childNode);
+                    currentNode = childNode;
+                }
+            }
+            // match union_clause
+            else if (parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("UNION")) {
+                tokens = new ArrayList<>();
+                tokens.add(parseTokens.get(i));
+                ASTNode childNode = new SelectUnionNode(tokens);
+                currentNode.addChild(childNode);
+                currentNode = childNode;
+                List <Token> unionTokens = parseTokens.subList(i + 1, parseTokens.size());
+                ASTNode unionChildNode = parseSelect(unionTokens);
+                currentNode.addChild(unionChildNode);
+                currentNode = unionChildNode;
+                break;
+            }
+            // match ;
+            else if (parseTokens.get(i).hasType(Token.TokenType.SYMBOL) && parseTokens.get(i).getValue().equals(";")) {
+                tokens = new ArrayList<>();
+                tokens.add(parseTokens.get(i));
+                ASTNode childNode = new SelectEndNode(tokens);
+                currentNode.addChild(childNode);
+                currentNode = childNode;
+            }
+            else if (parseTokens.get(i).hasType(Token.TokenType.EOF)) {
+                break;
+            }
+            else {
+                try {
+                    throw new ParseFailedException("Parse failed!");
+                }
+                catch (ParseFailedException e) {
+                    e.printStackTrace();
                 }
             }
         }
@@ -393,7 +507,7 @@ public class OracleParser {
     /**
      * CASE WHEN expr THEN expr [ELSE expr] END
      */
-    private ASTNode parseCaseWhen(List<Token> parseTokens) {
+    public static ASTNode parseCaseWhen(List<Token> parseTokens) {
         List <Token> tokens = new ArrayList<>();
         tokens.add(parseTokens.get(0));
 
-- 
Gitee


From 0998a3aa29b7aceaa0fe852b4f128043551a5ef8 Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Wed, 11 Sep 2024 20:59:05 +0800
Subject: [PATCH 034/113] revise

---
 sqlTranslate/.idea/workspace.xml              | 13 +++++++++-
 .../java/Generator/OpenGaussGenerator.java    |  9 +++++++
 .../src/main/java/Lexer/OracleLexer.java      |  5 ++++
 sqlTranslate/src/main/java/Main.java          | 15 ++++++-----
 .../java/Parser/AST/Select/SelectObjNode.java | 14 ----------
 .../src/main/java/Parser/OracleParser.java    | 26 +++++++++----------
 6 files changed, 47 insertions(+), 35 deletions(-)

diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
index 3c8fca74..05e23705 100644
--- a/sqlTranslate/.idea/workspace.xml
+++ b/sqlTranslate/.idea/workspace.xml
@@ -6,6 +6,10 @@
   <component name="ChangeListManager">
     <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add parseSelect">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Generator/OpenGaussGenerator.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Generator/OpenGaussGenerator.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Lexer/OracleLexer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Lexer/OracleLexer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Main.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Select/SelectObjNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Select/SelectObjNode.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -328,7 +332,14 @@
       <option name="project" value="LOCAL" />
       <updated>1725981975960</updated>
     </task>
-    <option name="localTasksCounter" value="33" />
+    <task id="LOCAL-00033" summary="add parseSelect">
+      <created>1726041355829</created>
+      <option name="number" value="00033" />
+      <option name="presentableId" value="LOCAL-00033" />
+      <option name="project" value="LOCAL" />
+      <updated>1726041355829</updated>
+    </task>
+    <option name="localTasksCounter" value="34" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
diff --git a/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java b/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java
index 348ff2ae..868b92b9 100644
--- a/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java
+++ b/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java
@@ -8,6 +8,7 @@ import Exception.GenerateFailedException;
 import Parser.AST.DropTable.DropTableNode;
 import Parser.AST.DropTable.DropTableOptionNode;
 import Parser.AST.Insert.InsertNode;
+import Parser.AST.Select.SelectNode;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -27,6 +28,9 @@ public class OpenGaussGenerator {
         else if (node instanceof DropTableNode) {
             return GenDropTableSQL(node);
         }
+        else if (node instanceof SelectNode) {
+            return GenSelectSQL(node);
+        }
         else {
             try {
                 throw new GenerateFailedException("Root node:" + node.getClass() + "(Unsupported node type!)");
@@ -54,6 +58,11 @@ public class OpenGaussGenerator {
         return node.toQueryString();
     }
 
+    private String GenSelectSQL(ASTNode node) {
+        // Select statements do not need to be converted for the time being
+        return node.toQueryString();
+    }
+
     private void visitCrt(ASTNode node) {
         if (node instanceof ColumnNode) {
             ColumnTypeConvert((ColumnNode) node);
diff --git a/sqlTranslate/src/main/java/Lexer/OracleLexer.java b/sqlTranslate/src/main/java/Lexer/OracleLexer.java
index 95ef462b..3e01431d 100644
--- a/sqlTranslate/src/main/java/Lexer/OracleLexer.java
+++ b/sqlTranslate/src/main/java/Lexer/OracleLexer.java
@@ -19,6 +19,8 @@ public class OracleLexer {
             , "DROP", "CASCADE", "CONSTRAINTS"
             // keywords of select
             , "DISTINCT", "JOIN", "GROUP BY", "ORDER BY", "HAVING", "UNION", "CASE", "WHEN", "END", "AS"
+            // keywords of join
+
     };
     private static final Pattern TOKEN_PATTERN = Pattern.compile(
             "(NUMBER\\(.*?\\))|" +                     // NUMBER() function
@@ -48,6 +50,7 @@ public class OracleLexer {
                     "(REF CURSOR)|" +
 
 
+                    "(\\b[A-Za-z_][A-Za-z0-9_]*(\\.[A-Za-z_][A-Za-z0-9_]*)*\\b)|" + // Keywords and identifiers
                     "(\\b[A-Za-z_][A-Za-z0-9_]*\\b)|" + // Keywords and identifiers
                     "(\\d+\\.?\\d*)|" +                 // Numbers (integer or decimal)
                     "(\"[^\"]*\")|" +                   // Double-quoted strings
@@ -141,6 +144,8 @@ public class OracleLexer {
 
         else if (isKeyword(tokenValue)) {
             return new Token(Token.TokenType.KEYWORD, tokenValue);
+        } else if (tokenValue.matches("[A-Za-z_][A-Za-z0-9_]*(\\.[A-Za-z_][A-Za-z0-9_]*)*")) {
+            return new Token(Token.TokenType.IDENTIFIER, tokenValue);
         } else if (tokenValue.matches("[a-zA-Z_][a-zA-Z0-9_]*")) {
             return new Token(Token.TokenType.IDENTIFIER, tokenValue);
         }
diff --git a/sqlTranslate/src/main/java/Main.java b/sqlTranslate/src/main/java/Main.java
index 12a70a15..470998c8 100644
--- a/sqlTranslate/src/main/java/Main.java
+++ b/sqlTranslate/src/main/java/Main.java
@@ -7,15 +7,16 @@ import Parser.OracleParser;
 
 public class Main {
     public static void main(String[] args) {
-        String sql = "CREATE TABLE employees (\n" +
-                "    employee_id NUMBER PRIMARY KEY,\n" +
-                "    first_name VARCHAR2(20),\n" +
-                "    last_name VARCHAR2(25),\n" +
-                "    email VARCHAR2(25),\n" +
-                "    hire_date DATE\n" +
-                ");";
+//        String sql = "CREATE TABLE employees (\n" +
+//                "    employee_id NUMBER PRIMARY KEY,\n" +
+//                "    first_name VARCHAR2(20),\n" +
+//                "    last_name VARCHAR2(25),\n" +
+//                "    email VARCHAR2(25),\n" +
+//                "    hire_date DATE\n" +
+//                ");";
 //        String sql = "INSERT INTO employees (first_name, last_name, email) VALUES ('Jane', 'Smith', 'janesm@example.com');";
 //        String sql = "DROP TABLE employees CASCADE CONSTRAINTS;";
+        String sql = "SELECT e.first_name, d.department_name FROM employees e JOIN departments d ON e.department_id = d.department_id;";
         OracleLexer lexer = new OracleLexer(sql);
         lexer.printTokens();
         OracleParser parser = new OracleParser(lexer);
diff --git a/sqlTranslate/src/main/java/Parser/AST/Select/SelectObjNode.java b/sqlTranslate/src/main/java/Parser/AST/Select/SelectObjNode.java
index 4b430099..7ab20b34 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Select/SelectObjNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/Select/SelectObjNode.java
@@ -33,20 +33,6 @@ public class SelectObjNode extends ASTNode {
         this.isDistinct = isDistinct + " ";
     }
 
-    @Override
-    public String toString()
-    {
-        List<Token> tokens = getTokens();
-        String str = "";
-        for (int i = 0; i < tokens.size(); i++) {
-            if (i < tokens.size() - 1)
-                str += tokens.get(i).getValue() + ", ";
-            else
-                str += tokens.get(i).getValue();
-        }
-        return str;
-    }
-
     @Override
     public void visit(ASTNode node, StringBuilder queryString)
     {
diff --git a/sqlTranslate/src/main/java/Parser/OracleParser.java b/sqlTranslate/src/main/java/Parser/OracleParser.java
index b441c3c2..425b6333 100644
--- a/sqlTranslate/src/main/java/Parser/OracleParser.java
+++ b/sqlTranslate/src/main/java/Parser/OracleParser.java
@@ -382,24 +382,24 @@ public class OracleParser {
                 childNode.setIsDistinct(parseTokens.get(i).getValue());
                 tokens = new ArrayList<>();
                 for (int j = i + 1; j < parseTokens.size(); j++) {
-                    tokens.add(parseTokens.get(j));
                     if (parseTokens.get(j).hasType(Token.TokenType.KEYWORD) && parseTokens.get(j).getValue().equalsIgnoreCase("FROM")) {
                         i = j;
                         break;
                     }
+                    tokens.add(parseTokens.get(j));
                 }
                 childNode.setTokens(tokens);
                 currentNode.addChild(childNode);
                 currentNode = childNode;
             }
-            else if (i == 1 && parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && !parseTokens.get(i).getValue().equalsIgnoreCase("DISTINCT")) {
+            else if (i == 1 && parseTokens.get(i).hasType(Token.TokenType.IDENTIFIER)) {
                 tokens = new ArrayList<>();
                 for (int j = i; j < parseTokens.size(); j++) {
-                    tokens.add(parseTokens.get(j));
                     if (parseTokens.get(j).hasType(Token.TokenType.KEYWORD) && parseTokens.get(j).getValue().equalsIgnoreCase("FROM")) {
                         i = j;
                         break;
                     }
+                    tokens.add(parseTokens.get(j));
                 }
                 ASTNode childNode = new SelectObjNode(tokens);
                 currentNode.addChild(childNode);
@@ -409,7 +409,6 @@ public class OracleParser {
             else if (currentNode instanceof SelectObjNode) {
                 tokens = new ArrayList<>();
                 for (int j = i; j < parseTokens.size(); j++) {
-                    tokens.add(parseTokens.get(j));
                     if (
                             (parseTokens.get(j).hasType(Token.TokenType.KEYWORD) && parseTokens.get(j).getValue().equalsIgnoreCase("WHERE"))
                             || (parseTokens.get(j).hasType(Token.TokenType.KEYWORD) && parseTokens.get(j).getValue().equalsIgnoreCase("GROUP"))
@@ -421,6 +420,7 @@ public class OracleParser {
                         i = j - 1;
                         break;
                     }
+                    tokens.add(parseTokens.get(j));
                 }
                 ASTNode childNode = new SelectTableNode(tokens);
                 currentNode.addChild(childNode);
@@ -430,7 +430,6 @@ public class OracleParser {
             else if (parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("WHERE")) {
                 tokens = new ArrayList<>();
                 for (int j = i; j < parseTokens.size(); j++) {
-                    tokens.add(parseTokens.get(j));
                     if (
                             (parseTokens.get(j).hasType(Token.TokenType.KEYWORD) && parseTokens.get(j).getValue().equalsIgnoreCase("GROUP"))
                             || (parseTokens.get(j).hasType(Token.TokenType.KEYWORD) && parseTokens.get(j).getValue().equalsIgnoreCase("ORDER"))
@@ -441,10 +440,11 @@ public class OracleParser {
                         i = j - 1;
                         break;
                     }
-                    ASTNode childNode = new SelectWhereClauseNode(tokens);
-                    currentNode.addChild(childNode);
-                    currentNode = childNode;
+                    tokens.add(parseTokens.get(j));
                 }
+                ASTNode childNode = new SelectWhereClauseNode(tokens);
+                currentNode.addChild(childNode);
+                currentNode = childNode;
             }
             // match select_option
             else if (
@@ -454,7 +454,6 @@ public class OracleParser {
             ) {
                 tokens = new ArrayList<>();
                 for (int j = i; j < parseTokens.size(); j++) {
-                    tokens.add(parseTokens.get(j));
                     if (
                           (parseTokens.get(j).hasType(Token.TokenType.KEYWORD) && parseTokens.get(j).getValue().equalsIgnoreCase("UNION"))
                           || (parseTokens.get(j).hasType(Token.TokenType.SYMBOL) && parseTokens.get(j).getValue().equals(";"))
@@ -462,10 +461,11 @@ public class OracleParser {
                         i = j - 1;
                         break;
                     }
-                    ASTNode childNode = new SelectOptionNode(tokens);
-                    currentNode.addChild(childNode);
-                    currentNode = childNode;
+                    tokens.add(parseTokens.get(j));
                 }
+                ASTNode childNode = new SelectOptionNode(tokens);
+                currentNode.addChild(childNode);
+                currentNode = childNode;
             }
             // match union_clause
             else if (parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("UNION")) {
@@ -545,7 +545,6 @@ public class OracleParser {
         for (int i = currentIndex; i < parseTokens.size(); i++) {
             if (parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("ELSE")) {
                 for (int j = i; j < parseTokens.size(); j++) {
-                    tokens.add(parseTokens.get(j));
                     if (parseTokens.get(j).hasType(Token.TokenType.KEYWORD) && parseTokens.get(j).getValue().equalsIgnoreCase("END")) {
                         childNode = new CaseElseNode(tokens);
                         currentNode.addChild(childNode);
@@ -553,6 +552,7 @@ public class OracleParser {
                         i = j;
                         break;
                     }
+                    tokens.add(parseTokens.get(j));
                 }
             }
             else if (parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("END")) {
-- 
Gitee


From f1e06e3650b02e0b6bfb6643c21e180fa2e62e42 Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Wed, 11 Sep 2024 22:37:08 +0800
Subject: [PATCH 035/113] revise

---
 sqlTranslate/.idea/workspace.xml              | 17 +++++++++-----
 .../src/main/java/Lexer/OracleLexer.java      |  2 ++
 sqlTranslate/src/main/java/Main.java          |  2 +-
 .../src/main/java/Parser/OracleParser.java    | 23 +++++++++++--------
 4 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
index 05e23705..2fc6ac4d 100644
--- a/sqlTranslate/.idea/workspace.xml
+++ b/sqlTranslate/.idea/workspace.xml
@@ -4,12 +4,10 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add parseSelect">
+    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="revise">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Generator/OpenGaussGenerator.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Generator/OpenGaussGenerator.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/Lexer/OracleLexer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Lexer/OracleLexer.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Main.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Select/SelectObjNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Select/SelectObjNode.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -339,7 +337,14 @@
       <option name="project" value="LOCAL" />
       <updated>1726041355829</updated>
     </task>
-    <option name="localTasksCounter" value="34" />
+    <task id="LOCAL-00034" summary="revise">
+      <created>1726059547456</created>
+      <option name="number" value="00034" />
+      <option name="presentableId" value="LOCAL-00034" />
+      <option name="project" value="LOCAL" />
+      <updated>1726059547457</updated>
+    </task>
+    <option name="localTasksCounter" value="35" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
@@ -367,11 +372,11 @@
     <MESSAGE value="add todolist" />
     <MESSAGE value="add select" />
     <MESSAGE value="add case when" />
-    <MESSAGE value="revise" />
     <MESSAGE value="add pattern of functions in select" />
     <MESSAGE value="add some comments" />
     <MESSAGE value="add parseSelect" />
-    <option name="LAST_COMMIT_MESSAGE" value="add parseSelect" />
+    <MESSAGE value="revise" />
+    <option name="LAST_COMMIT_MESSAGE" value="revise" />
   </component>
   <component name="XDebuggerManager">
     <watches-manager>
diff --git a/sqlTranslate/src/main/java/Lexer/OracleLexer.java b/sqlTranslate/src/main/java/Lexer/OracleLexer.java
index 3e01431d..87deec53 100644
--- a/sqlTranslate/src/main/java/Lexer/OracleLexer.java
+++ b/sqlTranslate/src/main/java/Lexer/OracleLexer.java
@@ -48,6 +48,8 @@ public class OracleLexer {
                     "(INTERVAL YEAR TO MONTH)|" +
                     "(INTERVAL DAY TO SECOND)|" +
                     "(REF CURSOR)|" +
+                    "(GROUP BY)|" +
+                    "(ORDER BY)|" +
 
 
                     "(\\b[A-Za-z_][A-Za-z0-9_]*(\\.[A-Za-z_][A-Za-z0-9_]*)*\\b)|" + // Keywords and identifiers
diff --git a/sqlTranslate/src/main/java/Main.java b/sqlTranslate/src/main/java/Main.java
index 470998c8..4cdf9d9f 100644
--- a/sqlTranslate/src/main/java/Main.java
+++ b/sqlTranslate/src/main/java/Main.java
@@ -16,7 +16,7 @@ public class Main {
 //                ");";
 //        String sql = "INSERT INTO employees (first_name, last_name, email) VALUES ('Jane', 'Smith', 'janesm@example.com');";
 //        String sql = "DROP TABLE employees CASCADE CONSTRAINTS;";
-        String sql = "SELECT e.first_name, d.department_name FROM employees e JOIN departments d ON e.department_id = d.department_id;";
+        String sql = "SELECT column1, COUNT(column2) FROM table_name GROUP BY column1 HAVING COUNT(column2) > 10;";
         OracleLexer lexer = new OracleLexer(sql);
         lexer.printTokens();
         OracleParser parser = new OracleParser(lexer);
diff --git a/sqlTranslate/src/main/java/Parser/OracleParser.java b/sqlTranslate/src/main/java/Parser/OracleParser.java
index 425b6333..d0c442a8 100644
--- a/sqlTranslate/src/main/java/Parser/OracleParser.java
+++ b/sqlTranslate/src/main/java/Parser/OracleParser.java
@@ -405,14 +405,14 @@ public class OracleParser {
                 currentNode.addChild(childNode);
                 currentNode = childNode;
             }
-            // match select_tab (possible last token: ; | GROUP | ORDER | HAVING | WHERE | UNION)
+            // match select_tab (possible last token: ; | GROUP BY | ORDER BY | HAVING | WHERE | UNION)
             else if (currentNode instanceof SelectObjNode) {
                 tokens = new ArrayList<>();
                 for (int j = i; j < parseTokens.size(); j++) {
                     if (
                             (parseTokens.get(j).hasType(Token.TokenType.KEYWORD) && parseTokens.get(j).getValue().equalsIgnoreCase("WHERE"))
-                            || (parseTokens.get(j).hasType(Token.TokenType.KEYWORD) && parseTokens.get(j).getValue().equalsIgnoreCase("GROUP"))
-                            || (parseTokens.get(j).hasType(Token.TokenType.KEYWORD) && parseTokens.get(j).getValue().equalsIgnoreCase("ORDER"))
+                            || (parseTokens.get(j).hasType(Token.TokenType.KEYWORD) && parseTokens.get(j).getValue().equalsIgnoreCase("GROUP BY"))
+                            || (parseTokens.get(j).hasType(Token.TokenType.KEYWORD) && parseTokens.get(j).getValue().equalsIgnoreCase("ORDER BY"))
                             || (parseTokens.get(j).hasType(Token.TokenType.KEYWORD) && parseTokens.get(j).getValue().equalsIgnoreCase("HAVING"))
                             || (parseTokens.get(j).hasType(Token.TokenType.KEYWORD) && parseTokens.get(j).getValue().equalsIgnoreCase("UNION"))
                             || (parseTokens.get(j).hasType(Token.TokenType.SYMBOL) && parseTokens.get(j).getValue().equals(";"))
@@ -431,8 +431,8 @@ public class OracleParser {
                 tokens = new ArrayList<>();
                 for (int j = i; j < parseTokens.size(); j++) {
                     if (
-                            (parseTokens.get(j).hasType(Token.TokenType.KEYWORD) && parseTokens.get(j).getValue().equalsIgnoreCase("GROUP"))
-                            || (parseTokens.get(j).hasType(Token.TokenType.KEYWORD) && parseTokens.get(j).getValue().equalsIgnoreCase("ORDER"))
+                            (parseTokens.get(j).hasType(Token.TokenType.KEYWORD) && parseTokens.get(j).getValue().equalsIgnoreCase("GROUP BY"))
+                            || (parseTokens.get(j).hasType(Token.TokenType.KEYWORD) && parseTokens.get(j).getValue().equalsIgnoreCase("ORDER BY"))
                             || (parseTokens.get(j).hasType(Token.TokenType.KEYWORD) && parseTokens.get(j).getValue().equalsIgnoreCase("HAVING"))
                             || (parseTokens.get(j).hasType(Token.TokenType.KEYWORD) && parseTokens.get(j).getValue().equalsIgnoreCase("UNION"))
                             || (parseTokens.get(j).hasType(Token.TokenType.SYMBOL) && parseTokens.get(j).getValue().equals(";"))
@@ -448,15 +448,20 @@ public class OracleParser {
             }
             // match select_option
             else if (
-                    (parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("GROUP"))
-                    || (parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("ORDER"))
+                    (parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("GROUP BY"))
+                    || (parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("ORDER BY"))
                     || (parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("HAVING"))
             ) {
                 tokens = new ArrayList<>();
+                String optionName = parseTokens.get(i).getValue();
                 for (int j = i; j < parseTokens.size(); j++) {
                     if (
-                          (parseTokens.get(j).hasType(Token.TokenType.KEYWORD) && parseTokens.get(j).getValue().equalsIgnoreCase("UNION"))
+                            j != i && !parseTokens.get(j).getValue().equalsIgnoreCase(optionName) &&
+                            ((parseTokens.get(j).hasType(Token.TokenType.KEYWORD) && parseTokens.get(j).getValue().equalsIgnoreCase("UNION"))
                           || (parseTokens.get(j).hasType(Token.TokenType.SYMBOL) && parseTokens.get(j).getValue().equals(";"))
+                          || (parseTokens.get(j).hasType(Token.TokenType.KEYWORD) && parseTokens.get(j).getValue().equalsIgnoreCase("GROUP BY"))
+                          || (parseTokens.get(j).hasType(Token.TokenType.KEYWORD) && parseTokens.get(j).getValue().equalsIgnoreCase("ORDER BY"))
+                          || (parseTokens.get(j).hasType(Token.TokenType.KEYWORD) && parseTokens.get(j).getValue().equalsIgnoreCase("HAVING")))
                     ) {
                         i = j - 1;
                         break;
@@ -493,7 +498,7 @@ public class OracleParser {
             }
             else {
                 try {
-                    throw new ParseFailedException("Parse failed!");
+                    throw new ParseFailedException("Parse failed!--" + parseTokens.get(i).getValue());
                 }
                 catch (ParseFailedException e) {
                     e.printStackTrace();
-- 
Gitee


From 5623109565c2897dcb88aa852987c3a656430410 Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Wed, 11 Sep 2024 23:00:05 +0800
Subject: [PATCH 036/113] revise

---
 sqlTranslate/.idea/workspace.xml                    | 10 ++++++++--
 sqlTranslate/src/main/java/Main.java                |  2 +-
 sqlTranslate/src/main/java/Parser/OracleParser.java |  2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
index 2fc6ac4d..8179e88d 100644
--- a/sqlTranslate/.idea/workspace.xml
+++ b/sqlTranslate/.idea/workspace.xml
@@ -6,7 +6,6 @@
   <component name="ChangeListManager">
     <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="revise">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Lexer/OracleLexer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Lexer/OracleLexer.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Main.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" afterDir="false" />
     </list>
@@ -344,7 +343,14 @@
       <option name="project" value="LOCAL" />
       <updated>1726059547457</updated>
     </task>
-    <option name="localTasksCounter" value="35" />
+    <task id="LOCAL-00035" summary="revise">
+      <created>1726065430463</created>
+      <option name="number" value="00035" />
+      <option name="presentableId" value="LOCAL-00035" />
+      <option name="project" value="LOCAL" />
+      <updated>1726065430463</updated>
+    </task>
+    <option name="localTasksCounter" value="36" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
diff --git a/sqlTranslate/src/main/java/Main.java b/sqlTranslate/src/main/java/Main.java
index 4cdf9d9f..470998c8 100644
--- a/sqlTranslate/src/main/java/Main.java
+++ b/sqlTranslate/src/main/java/Main.java
@@ -16,7 +16,7 @@ public class Main {
 //                ");";
 //        String sql = "INSERT INTO employees (first_name, last_name, email) VALUES ('Jane', 'Smith', 'janesm@example.com');";
 //        String sql = "DROP TABLE employees CASCADE CONSTRAINTS;";
-        String sql = "SELECT column1, COUNT(column2) FROM table_name GROUP BY column1 HAVING COUNT(column2) > 10;";
+        String sql = "SELECT e.first_name, d.department_name FROM employees e JOIN departments d ON e.department_id = d.department_id;";
         OracleLexer lexer = new OracleLexer(sql);
         lexer.printTokens();
         OracleParser parser = new OracleParser(lexer);
diff --git a/sqlTranslate/src/main/java/Parser/OracleParser.java b/sqlTranslate/src/main/java/Parser/OracleParser.java
index d0c442a8..150b3881 100644
--- a/sqlTranslate/src/main/java/Parser/OracleParser.java
+++ b/sqlTranslate/src/main/java/Parser/OracleParser.java
@@ -392,7 +392,7 @@ public class OracleParser {
                 currentNode.addChild(childNode);
                 currentNode = childNode;
             }
-            else if (i == 1 && parseTokens.get(i).hasType(Token.TokenType.IDENTIFIER)) {
+            else if (i == 1 && (!parseTokens.get(i).hasType(Token.TokenType.KEYWORD) || !parseTokens.get(i).getValue().equalsIgnoreCase("DISTINCT"))) {
                 tokens = new ArrayList<>();
                 for (int j = i; j < parseTokens.size(); j++) {
                     if (parseTokens.get(j).hasType(Token.TokenType.KEYWORD) && parseTokens.get(j).getValue().equalsIgnoreCase("FROM")) {
-- 
Gitee


From bd1cec8fbd0792cb60296df188581a97870ec0f3 Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Wed, 11 Sep 2024 23:34:42 +0800
Subject: [PATCH 037/113] add join pattern

---
 sqlTranslate/.idea/workspace.xml                  | 13 +++++++++----
 sqlTranslate/src/main/java/Lexer/OracleLexer.java | 10 +++++++++-
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
index 8179e88d..b09a789a 100644
--- a/sqlTranslate/.idea/workspace.xml
+++ b/sqlTranslate/.idea/workspace.xml
@@ -5,9 +5,7 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="revise">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Main.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Lexer/OracleLexer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Lexer/OracleLexer.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -350,7 +348,14 @@
       <option name="project" value="LOCAL" />
       <updated>1726065430463</updated>
     </task>
-    <option name="localTasksCounter" value="36" />
+    <task id="LOCAL-00036" summary="revise">
+      <created>1726066806993</created>
+      <option name="number" value="00036" />
+      <option name="presentableId" value="LOCAL-00036" />
+      <option name="project" value="LOCAL" />
+      <updated>1726066806993</updated>
+    </task>
+    <option name="localTasksCounter" value="37" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
diff --git a/sqlTranslate/src/main/java/Lexer/OracleLexer.java b/sqlTranslate/src/main/java/Lexer/OracleLexer.java
index 87deec53..8d958c5e 100644
--- a/sqlTranslate/src/main/java/Lexer/OracleLexer.java
+++ b/sqlTranslate/src/main/java/Lexer/OracleLexer.java
@@ -20,7 +20,7 @@ public class OracleLexer {
             // keywords of select
             , "DISTINCT", "JOIN", "GROUP BY", "ORDER BY", "HAVING", "UNION", "CASE", "WHEN", "END", "AS"
             // keywords of join
-
+            , "INNER JOIN", "LEFT JOIN", "LEFT OUTER JOIN", "RIGHT JOIN", "RIGHT OUTER JOIN", "FULL JOIN", "FULL OUTER JOIN", "CROSS JOIN"
     };
     private static final Pattern TOKEN_PATTERN = Pattern.compile(
             "(NUMBER\\(.*?\\))|" +                     // NUMBER() function
@@ -50,6 +50,14 @@ public class OracleLexer {
                     "(REF CURSOR)|" +
                     "(GROUP BY)|" +
                     "(ORDER BY)|" +
+                    "(INNER JOIN)|" +
+                    "(LEFT JOIN)|" +
+                    "(LEFT OUTER JOIN)|" +
+                    "(RIGHT JOIN)|" +
+                    "(RIGHT OUTER JOIN)|" +
+                    "(FULL JOIN)|" +
+                    "(FULL OUTER JOIN)|" +
+                    "(CROSS JOIN)|" +
 
 
                     "(\\b[A-Za-z_][A-Za-z0-9_]*(\\.[A-Za-z_][A-Za-z0-9_]*)*\\b)|" + // Keywords and identifiers
-- 
Gitee


From 34023bc8e838007338eaae267538cbe43957c5d6 Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Thu, 12 Sep 2024 11:35:56 +0800
Subject: [PATCH 038/113] add join class

---
 sqlTranslate/.idea/workspace.xml              | 20 ++++++++---
 .../java/Parser/AST/Join/JoinColumnNode.java  | 34 +++++++++++++++++++
 .../Parser/AST/Join/JoinSourceTabNode.java    | 23 +++++++++++++
 .../Parser/AST/Join/JoinTargetTabNode.java    | 23 +++++++++++++
 .../java/Parser/AST/Join/JoinTypeNode.java    | 24 +++++++++++++
 5 files changed, 120 insertions(+), 4 deletions(-)
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/Join/JoinColumnNode.java
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/Join/JoinSourceTabNode.java
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/Join/JoinTargetTabNode.java
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/Join/JoinTypeNode.java

diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
index b09a789a..c80ee9da 100644
--- a/sqlTranslate/.idea/workspace.xml
+++ b/sqlTranslate/.idea/workspace.xml
@@ -4,8 +4,12 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="revise">
-      <change beforePath="$PROJECT_DIR$/src/main/java/Lexer/OracleLexer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Lexer/OracleLexer.java" afterDir="false" />
+    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add join pattern">
+      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Join/JoinColumnNode.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Join/JoinSourceTabNode.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Join/JoinTargetTabNode.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Join/JoinTypeNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -355,7 +359,14 @@
       <option name="project" value="LOCAL" />
       <updated>1726066806993</updated>
     </task>
-    <option name="localTasksCounter" value="37" />
+    <task id="LOCAL-00037" summary="add join pattern">
+      <created>1726068883795</created>
+      <option name="number" value="00037" />
+      <option name="presentableId" value="LOCAL-00037" />
+      <option name="project" value="LOCAL" />
+      <updated>1726068883795</updated>
+    </task>
+    <option name="localTasksCounter" value="38" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
@@ -387,7 +398,8 @@
     <MESSAGE value="add some comments" />
     <MESSAGE value="add parseSelect" />
     <MESSAGE value="revise" />
-    <option name="LAST_COMMIT_MESSAGE" value="revise" />
+    <MESSAGE value="add join pattern" />
+    <option name="LAST_COMMIT_MESSAGE" value="add join pattern" />
   </component>
   <component name="XDebuggerManager">
     <watches-manager>
diff --git a/sqlTranslate/src/main/java/Parser/AST/Join/JoinColumnNode.java b/sqlTranslate/src/main/java/Parser/AST/Join/JoinColumnNode.java
new file mode 100644
index 00000000..e0a59f5e
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/Join/JoinColumnNode.java
@@ -0,0 +1,34 @@
+package Parser.AST.Join;
+
+import Lexer.Token;
+import Parser.AST.ASTNode;
+import java.util.List;
+
+public class JoinColumnNode extends ASTNode {
+    private String keyword;
+    public JoinColumnNode(List<Token> tokens)
+    {
+        super(tokens);
+        this.keyword = "";
+    }
+
+    public JoinColumnNode(ASTNode node)
+    {
+        super(node);
+        this.keyword = "";
+    }
+
+    public void setKeyword(String keyword) {
+        this.keyword = keyword + " ";
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString)
+    {
+        queryString.append(this.keyword + toString() + " ");
+        for (ASTNode child : getChildren())
+        {
+            child.visit(child, queryString);
+        }
+    }
+}
diff --git a/sqlTranslate/src/main/java/Parser/AST/Join/JoinSourceTabNode.java b/sqlTranslate/src/main/java/Parser/AST/Join/JoinSourceTabNode.java
new file mode 100644
index 00000000..1a07b676
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/Join/JoinSourceTabNode.java
@@ -0,0 +1,23 @@
+package Parser.AST.Join;
+
+import Lexer.Token;
+import Parser.AST.ASTNode;
+import java.util.List;
+
+public class JoinSourceTabNode extends ASTNode {
+    public JoinSourceTabNode(List<Token> tokens) {
+        super(tokens);
+    }
+
+    public JoinSourceTabNode(ASTNode node) {
+        super(node);
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString) {
+        queryString.append(toString() + " ");
+        for (ASTNode child : getChildren()) {
+            child.visit(child, queryString);
+        }
+    }
+}
diff --git a/sqlTranslate/src/main/java/Parser/AST/Join/JoinTargetTabNode.java b/sqlTranslate/src/main/java/Parser/AST/Join/JoinTargetTabNode.java
new file mode 100644
index 00000000..e4becba2
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/Join/JoinTargetTabNode.java
@@ -0,0 +1,23 @@
+package Parser.AST.Join;
+
+import Lexer.Token;
+import Parser.AST.ASTNode;
+import java.util.List;
+
+public class JoinTargetTabNode extends ASTNode {
+    public JoinTargetTabNode(List<Token> tokens) {
+        super(tokens);
+    }
+
+    public JoinTargetTabNode(ASTNode node) {
+        super(node);
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString) {
+        queryString.append(toString() + " ");
+        for (ASTNode child : getChildren()) {
+            child.visit(child, queryString);
+        }
+    }
+}
diff --git a/sqlTranslate/src/main/java/Parser/AST/Join/JoinTypeNode.java b/sqlTranslate/src/main/java/Parser/AST/Join/JoinTypeNode.java
new file mode 100644
index 00000000..9d559069
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/Join/JoinTypeNode.java
@@ -0,0 +1,24 @@
+package Parser.AST.Join;
+
+import Lexer.Token;
+import Parser.AST.ASTNode;
+import java.util.List;
+
+public class JoinTypeNode extends ASTNode {
+    public JoinTypeNode(List<Token> tokens) {
+        super(tokens);
+    }
+
+    public JoinTypeNode(ASTNode node) {
+        super(node);
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString) {
+        queryString.append(toString() + " ");
+        for (ASTNode child : getChildren())
+        {
+            child.visit(child, queryString);
+        }
+    }
+}
-- 
Gitee


From 6fcb0541d0c8c4bfd05e0cc6d183b66fa2b36b3c Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Thu, 12 Sep 2024 15:55:26 +0800
Subject: [PATCH 039/113] add join

---
 sqlTranslate/.idea/workspace.xml              |  23 ++-
 .../src/main/java/Lexer/OracleLexer.java      |   2 +-
 sqlTranslate/src/main/java/Main.java          |   3 +
 .../src/main/java/Parser/AST/ASTNode.java     |  12 +-
 ...ColumnNode.java => JoinConditionNode.java} |  10 +-
 .../java/Parser/AST/Join/JoinEndNode.java     |  24 +++
 .../src/main/java/Parser/OracleParser.java    | 165 +++++++++++++++++-
 7 files changed, 222 insertions(+), 17 deletions(-)
 rename sqlTranslate/src/main/java/Parser/AST/Join/{JoinColumnNode.java => JoinConditionNode.java} (75%)
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/Join/JoinEndNode.java

diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
index c80ee9da..4d84cba6 100644
--- a/sqlTranslate/.idea/workspace.xml
+++ b/sqlTranslate/.idea/workspace.xml
@@ -4,12 +4,13 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add join pattern">
-      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Join/JoinColumnNode.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Join/JoinSourceTabNode.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Join/JoinTargetTabNode.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Join/JoinTypeNode.java" afterDir="false" />
+    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add join class">
+      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Join/JoinEndNode.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Lexer/OracleLexer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Lexer/OracleLexer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Main.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Join/JoinColumnNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Join/JoinConditionNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -366,7 +367,14 @@
       <option name="project" value="LOCAL" />
       <updated>1726068883795</updated>
     </task>
-    <option name="localTasksCounter" value="38" />
+    <task id="LOCAL-00038" summary="add join class">
+      <created>1726112198383</created>
+      <option name="number" value="00038" />
+      <option name="presentableId" value="LOCAL-00038" />
+      <option name="project" value="LOCAL" />
+      <updated>1726112198384</updated>
+    </task>
+    <option name="localTasksCounter" value="39" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
@@ -399,7 +407,8 @@
     <MESSAGE value="add parseSelect" />
     <MESSAGE value="revise" />
     <MESSAGE value="add join pattern" />
-    <option name="LAST_COMMIT_MESSAGE" value="add join pattern" />
+    <MESSAGE value="add join class" />
+    <option name="LAST_COMMIT_MESSAGE" value="add join class" />
   </component>
   <component name="XDebuggerManager">
     <watches-manager>
diff --git a/sqlTranslate/src/main/java/Lexer/OracleLexer.java b/sqlTranslate/src/main/java/Lexer/OracleLexer.java
index 8d958c5e..90b2554c 100644
--- a/sqlTranslate/src/main/java/Lexer/OracleLexer.java
+++ b/sqlTranslate/src/main/java/Lexer/OracleLexer.java
@@ -20,7 +20,7 @@ public class OracleLexer {
             // keywords of select
             , "DISTINCT", "JOIN", "GROUP BY", "ORDER BY", "HAVING", "UNION", "CASE", "WHEN", "END", "AS"
             // keywords of join
-            , "INNER JOIN", "LEFT JOIN", "LEFT OUTER JOIN", "RIGHT JOIN", "RIGHT OUTER JOIN", "FULL JOIN", "FULL OUTER JOIN", "CROSS JOIN"
+            , "INNER JOIN", "LEFT JOIN", "LEFT OUTER JOIN", "RIGHT JOIN", "RIGHT OUTER JOIN", "FULL JOIN", "FULL OUTER JOIN", "CROSS JOIN", "JOIN", "ON", "USING"
     };
     private static final Pattern TOKEN_PATTERN = Pattern.compile(
             "(NUMBER\\(.*?\\))|" +                     // NUMBER() function
diff --git a/sqlTranslate/src/main/java/Main.java b/sqlTranslate/src/main/java/Main.java
index 470998c8..86a947bf 100644
--- a/sqlTranslate/src/main/java/Main.java
+++ b/sqlTranslate/src/main/java/Main.java
@@ -17,10 +17,13 @@ public class Main {
 //        String sql = "INSERT INTO employees (first_name, last_name, email) VALUES ('Jane', 'Smith', 'janesm@example.com');";
 //        String sql = "DROP TABLE employees CASCADE CONSTRAINTS;";
         String sql = "SELECT e.first_name, d.department_name FROM employees e JOIN departments d ON e.department_id = d.department_id;";
+//        String sql = "Customers\n" +
+//                "LEFT JOIN Orders ON Customers.CustomerID = Orders.CustomerID where";
         OracleLexer lexer = new OracleLexer(sql);
         lexer.printTokens();
         OracleParser parser = new OracleParser(lexer);
         ASTNode root = parser.parse();
+//        ASTNode root = OracleParser.parseJoin(lexer.getTokens());
         System.out.println(root.toQueryString());
         System.out.println(root.getASTString());
         OpenGaussGenerator generator = new OpenGaussGenerator(root);
diff --git a/sqlTranslate/src/main/java/Parser/AST/ASTNode.java b/sqlTranslate/src/main/java/Parser/AST/ASTNode.java
index 87272d96..14d5b11e 100644
--- a/sqlTranslate/src/main/java/Parser/AST/ASTNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/ASTNode.java
@@ -123,11 +123,13 @@ public abstract class ASTNode {
     @Override
     public String toString() {
         String str = "";
-        for (int i = 0; i < tokens.size(); i++) {
-            if (i < tokens.size() - 1)
-                str += tokens.get(i).getValue() + " ";
-            else
-                str += tokens.get(i).getValue();
+        if (tokens != null) {
+            for (int i = 0; i < tokens.size(); i++) {
+                if (i < tokens.size() - 1)
+                    str += tokens.get(i).getValue() + " ";
+                else
+                    str += tokens.get(i).getValue();
+            }
         }
         return str;
     }
diff --git a/sqlTranslate/src/main/java/Parser/AST/Join/JoinColumnNode.java b/sqlTranslate/src/main/java/Parser/AST/Join/JoinConditionNode.java
similarity index 75%
rename from sqlTranslate/src/main/java/Parser/AST/Join/JoinColumnNode.java
rename to sqlTranslate/src/main/java/Parser/AST/Join/JoinConditionNode.java
index e0a59f5e..b2bfea11 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Join/JoinColumnNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/Join/JoinConditionNode.java
@@ -4,20 +4,24 @@ import Lexer.Token;
 import Parser.AST.ASTNode;
 import java.util.List;
 
-public class JoinColumnNode extends ASTNode {
+public class JoinConditionNode extends ASTNode {
     private String keyword;
-    public JoinColumnNode(List<Token> tokens)
+    public JoinConditionNode(List<Token> tokens)
     {
         super(tokens);
         this.keyword = "";
     }
 
-    public JoinColumnNode(ASTNode node)
+    public JoinConditionNode(ASTNode node)
     {
         super(node);
         this.keyword = "";
     }
 
+    public JoinConditionNode() {
+        super();
+    }
+
     public void setKeyword(String keyword) {
         this.keyword = keyword + " ";
     }
diff --git a/sqlTranslate/src/main/java/Parser/AST/Join/JoinEndNode.java b/sqlTranslate/src/main/java/Parser/AST/Join/JoinEndNode.java
new file mode 100644
index 00000000..53ca8eda
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/Join/JoinEndNode.java
@@ -0,0 +1,24 @@
+package Parser.AST.Join;
+
+import Lexer.Token;
+import Parser.AST.ASTNode;
+import java.util.List;
+
+public class JoinEndNode extends ASTNode {
+    public JoinEndNode(List<Token> tokens) {
+        super(tokens);
+    }
+
+    public JoinEndNode(ASTNode node) {
+        super(node);
+    }
+
+    public JoinEndNode() {
+        super();
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString) {
+        queryString.append(toString());
+    }
+}
diff --git a/sqlTranslate/src/main/java/Parser/OracleParser.java b/sqlTranslate/src/main/java/Parser/OracleParser.java
index 150b3881..68a78a06 100644
--- a/sqlTranslate/src/main/java/Parser/OracleParser.java
+++ b/sqlTranslate/src/main/java/Parser/OracleParser.java
@@ -17,12 +17,12 @@ import Parser.AST.Insert.InsertDataNode;
 import Parser.AST.Insert.InsertEndNode;
 import Parser.AST.Insert.InsertNode;
 import Parser.AST.Insert.InsertObjNode;
+import Parser.AST.Join.*;
 import Parser.AST.Select.*;
 
 import java.util.Stack;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 public class OracleParser {
@@ -581,5 +581,168 @@ public class OracleParser {
         return root;
     }
 
+    /**
+     * JOIN clause
+     * For example: table1 t1 JOIN table2 t2 ON|USING t1.id = t2.id (parseTokens should start with table)
+     */
+    public static ASTNode parseJoin(List<Token> parseTokens) {
+        List <Token> tokens = new ArrayList<>();
+        int index = 0;
+        boolean parseState = false;
+        ASTNode currentNode = null;
+        ASTNode root = null;
+        // match table 1
+        for (int i = index; i < parseTokens.size(); i++) {
+            if (
+                    (parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("JOIN"))
+                    || (parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("INNER JOIN"))
+                    || (parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("LEFT JOIN"))
+                    || (parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("RIGHT JOIN"))
+                    || (parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("FULL JOIN"))
+                    || (parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("LEFT OUTER JOIN"))
+                    || (parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("RIGHT OUTER JOIN"))
+                    || (parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("FULL OUTER JOIN"))
+                    || (parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("CROSS JOIN"))
+            ) {
+                index = i;
+                parseState = true;
+                break;
+            }
+            tokens.add(parseTokens.get(i));
+        }
+        if (parseState) {
+            root = new JoinSourceTabNode(tokens);
+            currentNode = root;
+        }
+        else {
+            try {
+                throw new ParseFailedException("Fail to parse:" + parseTokens.get(index));
+            }
+            catch (ParseFailedException e) {
+                e.printStackTrace();
+            }
+        }
 
+        // match join type
+        if (parseState) {
+            tokens = new ArrayList<>();
+            tokens.add(parseTokens.get(index));
+            index++;
+            ASTNode childNode = new JoinTypeNode(tokens);
+            currentNode.addChild(childNode);
+            currentNode = childNode;
+        }
+        else {
+            try {
+                throw new ParseFailedException("Fail to parse:" + parseTokens.get(index));
+            }
+            catch (ParseFailedException e) {
+                e.printStackTrace();
+            }
+        }
+
+        // match table 2
+        tokens = new ArrayList<>();
+        parseState = false;
+        for (int i = index; i < parseTokens.size(); i++) {
+            if (
+                    (parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("ON"))
+                    || (parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("USING"))
+                    || (parseTokens.get(i).hasType(Token.TokenType.SYMBOL) && parseTokens.get(i).getValue().equalsIgnoreCase(";"))
+                    || (parseTokens.get(i).hasType(Token.TokenType.KEYWORD))
+            ) {
+                index = i;
+                parseState = true;
+                break;
+            }
+            tokens.add(parseTokens.get(i));
+        }
+        if (parseState) {
+            ASTNode childNode = new JoinTargetTabNode(tokens);
+            currentNode.addChild(childNode);
+            currentNode = childNode;
+        }
+        else {
+            try {
+                throw new ParseFailedException("Fail to parse:" + parseTokens.get(index));
+            }
+            catch (ParseFailedException e) {
+                e.printStackTrace();
+            }
+        }
+
+        // match join condition
+        if (parseState) {
+            // match end
+            if (parseTokens.get(index).hasType(Token.TokenType.SYMBOL) && parseTokens.get(index).getValue().equalsIgnoreCase(";")) {
+                tokens = new ArrayList<>();
+                tokens.add(parseTokens.get(index));
+                ASTNode childNode = new JoinEndNode(tokens);
+                currentNode.addChild(childNode);
+                currentNode = childNode;
+            }
+            // match end with keyword
+            else if (parseTokens.get(index).hasType(Token.TokenType.KEYWORD) && !parseTokens.get(index).getValue().equalsIgnoreCase("ON") && !parseTokens.get(index).getValue().equalsIgnoreCase("USING")) {
+                ASTNode childNode = new JoinEndNode();
+                currentNode.addChild(childNode);
+                currentNode = childNode;
+            }
+            else {
+                parseState = false;
+                JoinConditionNode joinConditionNode = new JoinConditionNode();
+                joinConditionNode.setKeyword(parseTokens.get(index).getValue());
+                index++;
+                tokens = new ArrayList<>();
+                for (int i = index; i < parseTokens.size(); i++) {
+                    if (
+                            parseTokens.get(i).hasType(Token.TokenType.KEYWORD)
+                            || (parseTokens.get(i).hasType(Token.TokenType.SYMBOL) && parseTokens.get(i).getValue().equalsIgnoreCase(";"))
+                    )
+                    {
+                        index = i;
+                        parseState = true;
+                        break;
+                    }
+                    tokens.add(parseTokens.get(i));
+                }
+                if (parseState) {
+                    joinConditionNode.setTokens(tokens);
+                    currentNode.addChild(joinConditionNode);
+                    currentNode = joinConditionNode;
+                    // match end
+                    if (parseTokens.get(index).hasType(Token.TokenType.SYMBOL) && parseTokens.get(index).getValue().equalsIgnoreCase(";")) {
+                        tokens = new ArrayList<>();
+                        tokens.add(parseTokens.get(index));
+                        ASTNode childNode = new JoinEndNode(tokens);
+                        currentNode.addChild(childNode);
+                        currentNode = childNode;
+                    }
+                    // match end with keyword
+                    else if (parseTokens.get(index).hasType(Token.TokenType.KEYWORD)) {
+                        ASTNode childNode = new JoinEndNode();
+                        currentNode.addChild(childNode);
+                        currentNode = childNode;
+                    }
+                }
+                else {
+                    try {
+                        throw new ParseFailedException("Fail to parse:" + parseTokens.get(index));
+                    }
+                    catch (ParseFailedException e) {
+                        e.printStackTrace();
+                    }
+                }
+            }
+        }
+        else {
+            try {
+                throw new ParseFailedException("Fail to parse:" + parseTokens.get(index));
+            }
+            catch (ParseFailedException e) {
+                e.printStackTrace();
+            }
+        }
+
+        return root;
+    }
 }
-- 
Gitee


From d4dca20bb9d4db5b89042a3ee833d8c5410e7c79 Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Thu, 12 Sep 2024 16:18:41 +0800
Subject: [PATCH 040/113] add join convert rule

---
 sqlTranslate/.idea/workspace.xml              | 20 +++++++++-----
 .../java/Generator/OpenGaussGenerator.java    | 27 +++++++++++++++++++
 sqlTranslate/src/main/java/Main.java          | 10 +++----
 .../Parser/AST/Join/JoinConditionNode.java    |  4 +++
 4 files changed, 49 insertions(+), 12 deletions(-)

diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
index 4d84cba6..13d21d8f 100644
--- a/sqlTranslate/.idea/workspace.xml
+++ b/sqlTranslate/.idea/workspace.xml
@@ -4,13 +4,11 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add join class">
-      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Join/JoinEndNode.java" afterDir="false" />
+    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add join">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Lexer/OracleLexer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Lexer/OracleLexer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Generator/OpenGaussGenerator.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Generator/OpenGaussGenerator.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Main.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Join/JoinColumnNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Join/JoinConditionNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Join/JoinConditionNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Join/JoinConditionNode.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -374,7 +372,14 @@
       <option name="project" value="LOCAL" />
       <updated>1726112198384</updated>
     </task>
-    <option name="localTasksCounter" value="39" />
+    <task id="LOCAL-00039" summary="add join">
+      <created>1726127728384</created>
+      <option name="number" value="00039" />
+      <option name="presentableId" value="LOCAL-00039" />
+      <option name="project" value="LOCAL" />
+      <updated>1726127728384</updated>
+    </task>
+    <option name="localTasksCounter" value="40" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
@@ -408,7 +413,8 @@
     <MESSAGE value="revise" />
     <MESSAGE value="add join pattern" />
     <MESSAGE value="add join class" />
-    <option name="LAST_COMMIT_MESSAGE" value="add join class" />
+    <MESSAGE value="add join" />
+    <option name="LAST_COMMIT_MESSAGE" value="add join" />
   </component>
   <component name="XDebuggerManager">
     <watches-manager>
diff --git a/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java b/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java
index 868b92b9..03ce3eed 100644
--- a/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java
+++ b/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java
@@ -8,6 +8,9 @@ import Exception.GenerateFailedException;
 import Parser.AST.DropTable.DropTableNode;
 import Parser.AST.DropTable.DropTableOptionNode;
 import Parser.AST.Insert.InsertNode;
+import Parser.AST.Join.JoinConditionNode;
+import Parser.AST.Join.JoinSourceTabNode;
+import Parser.AST.Join.JoinTypeNode;
 import Parser.AST.Select.SelectNode;
 
 import java.util.ArrayList;
@@ -18,6 +21,11 @@ public class OpenGaussGenerator {
     public OpenGaussGenerator(ASTNode node) {
         this.node = node;
     }
+
+    public void setNode(ASTNode node) {
+        this.node = node;
+    }
+
     public String generate() {
         if (node instanceof CreateTabNode) {
             return GenCreatTableSQL(node);
@@ -31,6 +39,9 @@ public class OpenGaussGenerator {
         else if (node instanceof SelectNode) {
             return GenSelectSQL(node);
         }
+        else if (node instanceof JoinSourceTabNode) {
+            return GenJoinSQL(node);
+        }
         else {
             try {
                 throw new GenerateFailedException("Root node:" + node.getClass() + "(Unsupported node type!)");
@@ -63,6 +74,11 @@ public class OpenGaussGenerator {
         return node.toQueryString();
     }
 
+    private String GenJoinSQL(ASTNode node) {
+        visitJoin(node);
+        return node.toQueryString();
+    }
+
     private void visitCrt(ASTNode node) {
         if (node instanceof ColumnNode) {
             ColumnTypeConvert((ColumnNode) node);
@@ -91,6 +107,17 @@ public class OpenGaussGenerator {
         }
     }
 
+    private void visitJoin(ASTNode node) {
+        if (node instanceof JoinConditionNode) {
+           if (((JoinConditionNode) node).getKeyword().equalsIgnoreCase("USING")) {
+               ((JoinConditionNode) node).setKeyword("ON");
+           }
+        }
+        for (ASTNode child : node.getChildren()) {
+            visitJoin(child);
+        }
+    }
+
     private void ColumnTypeConvert(ColumnNode node) {
         // type convert
         if (node.getType().getValue().equalsIgnoreCase("NUMBER")) {
diff --git a/sqlTranslate/src/main/java/Main.java b/sqlTranslate/src/main/java/Main.java
index 86a947bf..875f3ac7 100644
--- a/sqlTranslate/src/main/java/Main.java
+++ b/sqlTranslate/src/main/java/Main.java
@@ -16,14 +16,14 @@ public class Main {
 //                ");";
 //        String sql = "INSERT INTO employees (first_name, last_name, email) VALUES ('Jane', 'Smith', 'janesm@example.com');";
 //        String sql = "DROP TABLE employees CASCADE CONSTRAINTS;";
-        String sql = "SELECT e.first_name, d.department_name FROM employees e JOIN departments d ON e.department_id = d.department_id;";
-//        String sql = "Customers\n" +
-//                "LEFT JOIN Orders ON Customers.CustomerID = Orders.CustomerID where";
+//        String sql = "SELECT e.first_name, d.department_name FROM employees e JOIN departments d ON e.department_id = d.department_id;";
+        String sql = "Customers\n" +
+                "LEFT JOIN Orders USING Customers.CustomerID = Orders.CustomerID where";
         OracleLexer lexer = new OracleLexer(sql);
         lexer.printTokens();
         OracleParser parser = new OracleParser(lexer);
-        ASTNode root = parser.parse();
-//        ASTNode root = OracleParser.parseJoin(lexer.getTokens());
+//        ASTNode root = parser.parse();
+        ASTNode root = OracleParser.parseJoin(lexer.getTokens());
         System.out.println(root.toQueryString());
         System.out.println(root.getASTString());
         OpenGaussGenerator generator = new OpenGaussGenerator(root);
diff --git a/sqlTranslate/src/main/java/Parser/AST/Join/JoinConditionNode.java b/sqlTranslate/src/main/java/Parser/AST/Join/JoinConditionNode.java
index b2bfea11..413dff0e 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Join/JoinConditionNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/Join/JoinConditionNode.java
@@ -22,6 +22,10 @@ public class JoinConditionNode extends ASTNode {
         super();
     }
 
+    public String getKeyword() {
+        return keyword.replace(" ", "");
+    }
+
     public void setKeyword(String keyword) {
         this.keyword = keyword + " ";
     }
-- 
Gitee


From 3c0cbcdad8c20df722a1f9930cbd31902f4012e2 Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Thu, 12 Sep 2024 20:21:52 +0800
Subject: [PATCH 041/113] refractor

---
 sqlTranslate/.idea/workspace.xml              | 16 ++++++++----
 sqlTranslate/src/main/java/Main.java          | 10 +++----
 ...tTableNode.java => SelectContentNode.java} | 26 ++++++++++++++++---
 .../java/Parser/AST/Select/SelectObjNode.java | 20 +-------------
 .../src/main/java/Parser/OracleParser.java    |  8 +++---
 5 files changed, 43 insertions(+), 37 deletions(-)
 rename sqlTranslate/src/main/java/Parser/AST/Select/{SelectTableNode.java => SelectContentNode.java} (39%)

diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
index 13d21d8f..f4f35446 100644
--- a/sqlTranslate/.idea/workspace.xml
+++ b/sqlTranslate/.idea/workspace.xml
@@ -4,11 +4,9 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add join">
+    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add join convert rule">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Generator/OpenGaussGenerator.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Generator/OpenGaussGenerator.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Main.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Join/JoinConditionNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Join/JoinConditionNode.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -379,7 +377,14 @@
       <option name="project" value="LOCAL" />
       <updated>1726127728384</updated>
     </task>
-    <option name="localTasksCounter" value="40" />
+    <task id="LOCAL-00040" summary="add join convert rule">
+      <created>1726129122571</created>
+      <option name="number" value="00040" />
+      <option name="presentableId" value="LOCAL-00040" />
+      <option name="project" value="LOCAL" />
+      <updated>1726129122571</updated>
+    </task>
+    <option name="localTasksCounter" value="41" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
@@ -414,7 +419,8 @@
     <MESSAGE value="add join pattern" />
     <MESSAGE value="add join class" />
     <MESSAGE value="add join" />
-    <option name="LAST_COMMIT_MESSAGE" value="add join" />
+    <MESSAGE value="add join convert rule" />
+    <option name="LAST_COMMIT_MESSAGE" value="add join convert rule" />
   </component>
   <component name="XDebuggerManager">
     <watches-manager>
diff --git a/sqlTranslate/src/main/java/Main.java b/sqlTranslate/src/main/java/Main.java
index 875f3ac7..33ce176a 100644
--- a/sqlTranslate/src/main/java/Main.java
+++ b/sqlTranslate/src/main/java/Main.java
@@ -16,14 +16,14 @@ public class Main {
 //                ");";
 //        String sql = "INSERT INTO employees (first_name, last_name, email) VALUES ('Jane', 'Smith', 'janesm@example.com');";
 //        String sql = "DROP TABLE employees CASCADE CONSTRAINTS;";
-//        String sql = "SELECT e.first_name, d.department_name FROM employees e JOIN departments d ON e.department_id = d.department_id;";
-        String sql = "Customers\n" +
-                "LEFT JOIN Orders USING Customers.CustomerID = Orders.CustomerID where";
+        String sql = "SELECT e.first_name, d.department_name FROM employees e JOIN departments d ON e.department_id = d.department_id;";
+//        String sql = "Customers\n" +
+//                "LEFT JOIN Orders USING Customers.CustomerID = Orders.CustomerID where";
         OracleLexer lexer = new OracleLexer(sql);
         lexer.printTokens();
         OracleParser parser = new OracleParser(lexer);
-//        ASTNode root = parser.parse();
-        ASTNode root = OracleParser.parseJoin(lexer.getTokens());
+        ASTNode root = parser.parse();
+//        ASTNode root = OracleParser.parseJoin(lexer.getTokens());
         System.out.println(root.toQueryString());
         System.out.println(root.getASTString());
         OpenGaussGenerator generator = new OpenGaussGenerator(root);
diff --git a/sqlTranslate/src/main/java/Parser/AST/Select/SelectTableNode.java b/sqlTranslate/src/main/java/Parser/AST/Select/SelectContentNode.java
similarity index 39%
rename from sqlTranslate/src/main/java/Parser/AST/Select/SelectTableNode.java
rename to sqlTranslate/src/main/java/Parser/AST/Select/SelectContentNode.java
index 86c7ae51..d8183835 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Select/SelectTableNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/Select/SelectContentNode.java
@@ -5,20 +5,38 @@ import Parser.AST.ASTNode;
 
 import java.util.List;
 
-public class SelectTableNode extends ASTNode {
-    public SelectTableNode(List<Token> tokens)
+public class SelectContentNode extends ASTNode {
+    public SelectContentNode(List<Token> tokens)
     {
         super(tokens);
+        this.isDistinct = "";
     }
 
-    public SelectTableNode(ASTNode node)
+    public SelectContentNode(ASTNode node)
     {
         super(node);
+        this.isDistinct = "";
     }
 
+    private String isDistinct;
+
+    public SelectContentNode() {
+        super();
+    }
+
+    public String getIsDistinct()
+    {
+        return isDistinct;
+    }
+
+    public void setIsDistinct(String isDistinct) {
+        this.isDistinct = isDistinct + " ";
+    }
+
+    @Override
     public void visit(ASTNode node, StringBuilder queryString)
     {
-        queryString.append(toString() + " ");
+        queryString.append(isDistinct + toString() + " FROM ");
         for (ASTNode child : getChildren())
         {
             child.visit(child, queryString);
diff --git a/sqlTranslate/src/main/java/Parser/AST/Select/SelectObjNode.java b/sqlTranslate/src/main/java/Parser/AST/Select/SelectObjNode.java
index 7ab20b34..1164e571 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Select/SelectObjNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/Select/SelectObjNode.java
@@ -9,34 +9,16 @@ public class SelectObjNode extends ASTNode {
     public SelectObjNode(List<Token> tokens)
     {
         super(tokens);
-        this.isDistinct = "";
     }
 
     public SelectObjNode(ASTNode node)
     {
         super(node);
-        this.isDistinct = "";
     }
 
-    private String isDistinct;
-
-    public SelectObjNode() {
-        super();
-    }
-
-    public String getIsDistinct()
-    {
-        return isDistinct;
-    }
-
-    public void setIsDistinct(String isDistinct) {
-        this.isDistinct = isDistinct + " ";
-    }
-
-    @Override
     public void visit(ASTNode node, StringBuilder queryString)
     {
-        queryString.append(isDistinct + toString() + " FROM ");
+        queryString.append(toString() + " ");
         for (ASTNode child : getChildren())
         {
             child.visit(child, queryString);
diff --git a/sqlTranslate/src/main/java/Parser/OracleParser.java b/sqlTranslate/src/main/java/Parser/OracleParser.java
index 68a78a06..4cdac2a8 100644
--- a/sqlTranslate/src/main/java/Parser/OracleParser.java
+++ b/sqlTranslate/src/main/java/Parser/OracleParser.java
@@ -378,7 +378,7 @@ public class OracleParser {
         for(int i = 1; i < parseTokens.size(); i++) {
             // match select_obj
             if (i == 1 && parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("DISTINCT")) {
-                SelectObjNode childNode = new SelectObjNode();
+                SelectContentNode childNode = new SelectContentNode();
                 childNode.setIsDistinct(parseTokens.get(i).getValue());
                 tokens = new ArrayList<>();
                 for (int j = i + 1; j < parseTokens.size(); j++) {
@@ -401,12 +401,12 @@ public class OracleParser {
                     }
                     tokens.add(parseTokens.get(j));
                 }
-                ASTNode childNode = new SelectObjNode(tokens);
+                ASTNode childNode = new SelectContentNode(tokens);
                 currentNode.addChild(childNode);
                 currentNode = childNode;
             }
             // match select_tab (possible last token: ; | GROUP BY | ORDER BY | HAVING | WHERE | UNION)
-            else if (currentNode instanceof SelectObjNode) {
+            else if (currentNode instanceof SelectContentNode) {
                 tokens = new ArrayList<>();
                 for (int j = i; j < parseTokens.size(); j++) {
                     if (
@@ -422,7 +422,7 @@ public class OracleParser {
                     }
                     tokens.add(parseTokens.get(j));
                 }
-                ASTNode childNode = new SelectTableNode(tokens);
+                ASTNode childNode = new SelectObjNode(tokens);
                 currentNode.addChild(childNode);
                 currentNode = childNode;
             }
-- 
Gitee


From 3db285b4cff124e62633fb2445cb3eb099cf331c Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Thu, 12 Sep 2024 20:25:05 +0800
Subject: [PATCH 042/113] refractor

---
 .../main/java/Generator/OpenGaussGenerator.java  |  9 ++++-----
 .../DropEndNode.java}                            |  8 ++++----
 .../DropTableNode.java => Drop/DropNode.java}    |  8 ++++----
 .../DropObjNameNode.java}                        |  8 ++++----
 .../DropOptionNode.java}                         |  8 ++++----
 .../src/main/java/Parser/OracleParser.java       | 16 ++++++++--------
 6 files changed, 28 insertions(+), 29 deletions(-)
 rename sqlTranslate/src/main/java/Parser/AST/{DropTable/DropTableEndNode.java => Drop/DropEndNode.java} (67%)
 rename sqlTranslate/src/main/java/Parser/AST/{DropTable/DropTableNode.java => Drop/DropNode.java} (69%)
 rename sqlTranslate/src/main/java/Parser/AST/{DropTable/DropTableNameNode.java => Drop/DropObjNameNode.java} (68%)
 rename sqlTranslate/src/main/java/Parser/AST/{DropTable/DropTableOptionNode.java => Drop/DropOptionNode.java} (67%)

diff --git a/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java b/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java
index 03ce3eed..9718f986 100644
--- a/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java
+++ b/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java
@@ -5,12 +5,11 @@ import Parser.AST.ASTNode;
 import Parser.AST.CreateTable.ColumnNode;
 import Parser.AST.CreateTable.CreateTabNode;
 import Exception.GenerateFailedException;
-import Parser.AST.DropTable.DropTableNode;
-import Parser.AST.DropTable.DropTableOptionNode;
+import Parser.AST.Drop.DropNode;
+import Parser.AST.Drop.DropOptionNode;
 import Parser.AST.Insert.InsertNode;
 import Parser.AST.Join.JoinConditionNode;
 import Parser.AST.Join.JoinSourceTabNode;
-import Parser.AST.Join.JoinTypeNode;
 import Parser.AST.Select.SelectNode;
 
 import java.util.ArrayList;
@@ -33,7 +32,7 @@ public class OpenGaussGenerator {
         else if (node instanceof InsertNode) {
             return GenInsertSQL(node);
         }
-        else if (node instanceof DropTableNode) {
+        else if (node instanceof DropNode) {
             return GenDropTableSQL(node);
         }
         else if (node instanceof SelectNode) {
@@ -90,7 +89,7 @@ public class OpenGaussGenerator {
 
     private void visitDrop(ASTNode node) {
         try {
-            if (node instanceof DropTableOptionNode) {
+            if (node instanceof DropOptionNode) {
                 List<Token> tokens = new ArrayList<>();
                 tokens.add(new Token(Token.TokenType.KEYWORD, "CASCADE"));
                 tokens.add(new Token(Token.TokenType.KEYWORD, "CONSTRAINTS"));
diff --git a/sqlTranslate/src/main/java/Parser/AST/DropTable/DropTableEndNode.java b/sqlTranslate/src/main/java/Parser/AST/Drop/DropEndNode.java
similarity index 67%
rename from sqlTranslate/src/main/java/Parser/AST/DropTable/DropTableEndNode.java
rename to sqlTranslate/src/main/java/Parser/AST/Drop/DropEndNode.java
index 818f2aed..25e40b27 100644
--- a/sqlTranslate/src/main/java/Parser/AST/DropTable/DropTableEndNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/Drop/DropEndNode.java
@@ -1,15 +1,15 @@
-package Parser.AST.DropTable;
+package Parser.AST.Drop;
 
 import Lexer.Token;
 import Parser.AST.ASTNode;
 import java.util.List;
 
-public class DropTableEndNode extends ASTNode {
-    public DropTableEndNode(ASTNode node) {
+public class DropEndNode extends ASTNode {
+    public DropEndNode(ASTNode node) {
         super(node);
     }
 
-    public DropTableEndNode(List<Token> tokens) {
+    public DropEndNode(List<Token> tokens) {
         super(tokens);
     }
 
diff --git a/sqlTranslate/src/main/java/Parser/AST/DropTable/DropTableNode.java b/sqlTranslate/src/main/java/Parser/AST/Drop/DropNode.java
similarity index 69%
rename from sqlTranslate/src/main/java/Parser/AST/DropTable/DropTableNode.java
rename to sqlTranslate/src/main/java/Parser/AST/Drop/DropNode.java
index 9c4ebf90..6ed93096 100644
--- a/sqlTranslate/src/main/java/Parser/AST/DropTable/DropTableNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/Drop/DropNode.java
@@ -1,15 +1,15 @@
-package Parser.AST.DropTable;
+package Parser.AST.Drop;
 
 import Lexer.Token;
 import Parser.AST.ASTNode;
 import java.util.List;
 
-public class DropTableNode extends ASTNode {
-    public DropTableNode(ASTNode node) {
+public class DropNode extends ASTNode {
+    public DropNode(ASTNode node) {
         super(node);
     }
 
-    public DropTableNode(List<Token> tokens) {
+    public DropNode(List<Token> tokens) {
         super(tokens);
     }
 
diff --git a/sqlTranslate/src/main/java/Parser/AST/DropTable/DropTableNameNode.java b/sqlTranslate/src/main/java/Parser/AST/Drop/DropObjNameNode.java
similarity index 68%
rename from sqlTranslate/src/main/java/Parser/AST/DropTable/DropTableNameNode.java
rename to sqlTranslate/src/main/java/Parser/AST/Drop/DropObjNameNode.java
index 649d24b9..3fb4e88a 100644
--- a/sqlTranslate/src/main/java/Parser/AST/DropTable/DropTableNameNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/Drop/DropObjNameNode.java
@@ -1,15 +1,15 @@
-package Parser.AST.DropTable;
+package Parser.AST.Drop;
 
 import Lexer.Token;
 import Parser.AST.ASTNode;
 import java.util.List;
 
-public class DropTableNameNode extends ASTNode {
-    public DropTableNameNode(ASTNode node) {
+public class DropObjNameNode extends ASTNode {
+    public DropObjNameNode(ASTNode node) {
         super(node);
     }
 
-    public DropTableNameNode(List<Token> tokens) {
+    public DropObjNameNode(List<Token> tokens) {
         super(tokens);
     }
 
diff --git a/sqlTranslate/src/main/java/Parser/AST/DropTable/DropTableOptionNode.java b/sqlTranslate/src/main/java/Parser/AST/Drop/DropOptionNode.java
similarity index 67%
rename from sqlTranslate/src/main/java/Parser/AST/DropTable/DropTableOptionNode.java
rename to sqlTranslate/src/main/java/Parser/AST/Drop/DropOptionNode.java
index 4e21a67f..30d0ed42 100644
--- a/sqlTranslate/src/main/java/Parser/AST/DropTable/DropTableOptionNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/Drop/DropOptionNode.java
@@ -1,16 +1,16 @@
-package Parser.AST.DropTable;
+package Parser.AST.Drop;
 
 import Lexer.Token;
 import Parser.AST.ASTNode;
 
 import java.util.List;
 
-public class DropTableOptionNode extends ASTNode {
-    public DropTableOptionNode(ASTNode node) {
+public class DropOptionNode extends ASTNode {
+    public DropOptionNode(ASTNode node) {
         super(node);
     }
 
-    public DropTableOptionNode(List<Token> tokens) {
+    public DropOptionNode(List<Token> tokens) {
         super(tokens);
     }
 
diff --git a/sqlTranslate/src/main/java/Parser/OracleParser.java b/sqlTranslate/src/main/java/Parser/OracleParser.java
index 4cdac2a8..82eb914c 100644
--- a/sqlTranslate/src/main/java/Parser/OracleParser.java
+++ b/sqlTranslate/src/main/java/Parser/OracleParser.java
@@ -9,10 +9,10 @@ import Parser.AST.CaseWhen.CaseElseNode;
 import Parser.AST.CaseWhen.CaseEndNode;
 import Parser.AST.CaseWhen.CaseThenNode;
 import Parser.AST.CreateTable.*;
-import Parser.AST.DropTable.DropTableEndNode;
-import Parser.AST.DropTable.DropTableNameNode;
-import Parser.AST.DropTable.DropTableNode;
-import Parser.AST.DropTable.DropTableOptionNode;
+import Parser.AST.Drop.DropEndNode;
+import Parser.AST.Drop.DropObjNameNode;
+import Parser.AST.Drop.DropNode;
+import Parser.AST.Drop.DropOptionNode;
 import Parser.AST.Insert.InsertDataNode;
 import Parser.AST.Insert.InsertEndNode;
 import Parser.AST.Insert.InsertNode;
@@ -322,14 +322,14 @@ public class OracleParser {
         catch (ParseFailedException e) {
             e.printStackTrace();
         }
-        ASTNode root = new DropTableNode(tokens);
+        ASTNode root = new DropNode(tokens);
         ASTNode currentNode = root;
 
         for (int i = 2; i < parseTokens.size(); i++) {
             if (parseTokens.get(i).hasType(Token.TokenType.IDENTIFIER)) {
                 tokens = new ArrayList<>();
                 tokens.add(parseTokens.get(i));
-                ASTNode childNode = new DropTableNameNode(tokens);
+                ASTNode childNode = new DropObjNameNode(tokens);
                 currentNode.addChild(childNode);
                 currentNode = childNode;
             }
@@ -340,14 +340,14 @@ public class OracleParser {
                     tokens.add(parseTokens.get(i + 1));
                     i++;
                 }
-                ASTNode childNode = new DropTableOptionNode(tokens);
+                ASTNode childNode = new DropOptionNode(tokens);
                 currentNode.addChild(childNode);
                 currentNode = childNode;
             }
             else if (parseTokens.get(i).hasType(Token.TokenType.SYMBOL) && parseTokens.get(i).getValue().equals(";")) {
                 tokens = new ArrayList<>();
                 tokens.add(parseTokens.get(i));
-                ASTNode childNode = new DropTableEndNode(tokens);
+                ASTNode childNode = new DropEndNode(tokens);
                 currentNode.addChild(childNode);
                 currentNode = childNode;
             }
-- 
Gitee


From 66b46f52a749be1a58358970c869e1d54798638a Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Thu, 12 Sep 2024 21:34:51 +0800
Subject: [PATCH 043/113] add select convert rules

---
 sqlTranslate/.idea/workspace.xml              | 25 ++++++++++++++--
 .../java/Generator/OpenGaussGenerator.java    | 23 +++++++++++++-
 sqlTranslate/src/main/java/Lexer/Token.java   | 10 +++++++
 sqlTranslate/src/main/java/Main.java          |  5 ++--
 .../src/main/java/Parser/AST/ASTNode.java     | 14 +++++++++
 .../src/main/java/Parser/OracleParser.java    | 30 ++++++++-----------
 6 files changed, 82 insertions(+), 25 deletions(-)

diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
index f4f35446..e11c9ee9 100644
--- a/sqlTranslate/.idea/workspace.xml
+++ b/sqlTranslate/.idea/workspace.xml
@@ -4,9 +4,13 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add join convert rule">
+    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="refractor">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Generator/OpenGaussGenerator.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Generator/OpenGaussGenerator.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Lexer/Token.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Lexer/Token.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Main.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/ASTNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/ASTNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -384,7 +388,21 @@
       <option name="project" value="LOCAL" />
       <updated>1726129122571</updated>
     </task>
-    <option name="localTasksCounter" value="41" />
+    <task id="LOCAL-00041" summary="refractor">
+      <created>1726143715098</created>
+      <option name="number" value="00041" />
+      <option name="presentableId" value="LOCAL-00041" />
+      <option name="project" value="LOCAL" />
+      <updated>1726143715098</updated>
+    </task>
+    <task id="LOCAL-00042" summary="refractor">
+      <created>1726143907403</created>
+      <option name="number" value="00042" />
+      <option name="presentableId" value="LOCAL-00042" />
+      <option name="project" value="LOCAL" />
+      <updated>1726143907403</updated>
+    </task>
+    <option name="localTasksCounter" value="43" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
@@ -420,7 +438,8 @@
     <MESSAGE value="add join class" />
     <MESSAGE value="add join" />
     <MESSAGE value="add join convert rule" />
-    <option name="LAST_COMMIT_MESSAGE" value="add join convert rule" />
+    <MESSAGE value="refractor" />
+    <option name="LAST_COMMIT_MESSAGE" value="refractor" />
   </component>
   <component name="XDebuggerManager">
     <watches-manager>
diff --git a/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java b/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java
index 9718f986..87cd440c 100644
--- a/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java
+++ b/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java
@@ -11,6 +11,8 @@ import Parser.AST.Insert.InsertNode;
 import Parser.AST.Join.JoinConditionNode;
 import Parser.AST.Join.JoinSourceTabNode;
 import Parser.AST.Select.SelectNode;
+import Parser.AST.Select.SelectObjNode;
+import Parser.OracleParser;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -69,7 +71,8 @@ public class OpenGaussGenerator {
     }
 
     private String GenSelectSQL(ASTNode node) {
-        // Select statements do not need to be converted for the time being
+        visitSelect(node, null);
+        System.out.println(node.getASTString());
         return node.toQueryString();
     }
 
@@ -117,6 +120,24 @@ public class OpenGaussGenerator {
         }
     }
 
+    private void visitSelect(ASTNode node, ASTNode parentNode) {
+        if (node instanceof SelectObjNode) {
+            // check whether there exists a join statement in the select sql
+            if (node.getTokens().contains(new Token(Token.TokenType.KEYWORD, "JOIN"))) {
+                ASTNode joinRootNode = OracleParser.parseJoin(node.getTokens());
+                visitJoin(joinRootNode);
+                parentNode.replaceChild(node, joinRootNode);
+                ASTNode smallestChild = joinRootNode.getDeepestChild();
+                for (ASTNode child : node.getChildren()) {
+                    smallestChild.addChild(child);
+                }
+            }
+        }
+        for (ASTNode child : node.getChildren()) {
+            visitSelect(child, node);
+        }
+    }
+
     private void ColumnTypeConvert(ColumnNode node) {
         // type convert
         if (node.getType().getValue().equalsIgnoreCase("NUMBER")) {
diff --git a/sqlTranslate/src/main/java/Lexer/Token.java b/sqlTranslate/src/main/java/Lexer/Token.java
index 50baec53..58d1634f 100644
--- a/sqlTranslate/src/main/java/Lexer/Token.java
+++ b/sqlTranslate/src/main/java/Lexer/Token.java
@@ -1,5 +1,7 @@
 package Lexer;
 
+import java.util.Objects;
+
 public class Token {
     public enum TokenType {
         KEYWORD, IDENTIFIER, NUMBER, OPERATOR, STRING, SYMBOL, EOF
@@ -33,4 +35,12 @@ public class Token {
                 '}';
     }
 
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) return true;
+        if (obj == null || getClass() != obj.getClass()) return false;
+        Token token = (Token) obj;
+        return type == token.type && Objects.equals(value, token.value);
+    }
+
 }
diff --git a/sqlTranslate/src/main/java/Main.java b/sqlTranslate/src/main/java/Main.java
index 33ce176a..db3af17f 100644
--- a/sqlTranslate/src/main/java/Main.java
+++ b/sqlTranslate/src/main/java/Main.java
@@ -16,9 +16,8 @@ public class Main {
 //                ");";
 //        String sql = "INSERT INTO employees (first_name, last_name, email) VALUES ('Jane', 'Smith', 'janesm@example.com');";
 //        String sql = "DROP TABLE employees CASCADE CONSTRAINTS;";
-        String sql = "SELECT e.first_name, d.department_name FROM employees e JOIN departments d ON e.department_id = d.department_id;";
-//        String sql = "Customers\n" +
-//                "LEFT JOIN Orders USING Customers.CustomerID = Orders.CustomerID where";
+        String sql = "SELECT e.first_name, d.department_name FROM employees e JOIN departments d Using e.department_id = d.department_id;";
+//        String sql = "employees e JOIN departments d ON e.department_id = d.department_id;";
         OracleLexer lexer = new OracleLexer(sql);
         lexer.printTokens();
         OracleParser parser = new OracleParser(lexer);
diff --git a/sqlTranslate/src/main/java/Parser/AST/ASTNode.java b/sqlTranslate/src/main/java/Parser/AST/ASTNode.java
index 14d5b11e..1df1d867 100644
--- a/sqlTranslate/src/main/java/Parser/AST/ASTNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/ASTNode.java
@@ -80,6 +80,20 @@ public abstract class ASTNode {
         return nodes;
     }
 
+    public ASTNode getDeepestChild() {
+        if (hasChild()) {
+            ASTNode child = getChildren().get(0);
+            while (child.hasChild()) {
+                child = child.getChildren().get(0);
+            }
+            return child;
+        }
+        else {
+            return this;
+        }
+
+    }
+
     /**
      * 将对应名称的node更新为新的child
      */
diff --git a/sqlTranslate/src/main/java/Parser/OracleParser.java b/sqlTranslate/src/main/java/Parser/OracleParser.java
index 82eb914c..31d5be42 100644
--- a/sqlTranslate/src/main/java/Parser/OracleParser.java
+++ b/sqlTranslate/src/main/java/Parser/OracleParser.java
@@ -663,12 +663,9 @@ public class OracleParser {
             currentNode = childNode;
         }
         else {
-            try {
-                throw new ParseFailedException("Fail to parse:" + parseTokens.get(index));
-            }
-            catch (ParseFailedException e) {
-                e.printStackTrace();
-            }
+            ASTNode childNode = new JoinTargetTabNode(tokens);
+            currentNode.addChild(childNode);
+            currentNode = childNode;
         }
 
         // match join condition
@@ -725,22 +722,19 @@ public class OracleParser {
                     }
                 }
                 else {
-                    try {
-                        throw new ParseFailedException("Fail to parse:" + parseTokens.get(index));
-                    }
-                    catch (ParseFailedException e) {
-                        e.printStackTrace();
-                    }
+                    joinConditionNode.setTokens(tokens);
+                    currentNode.addChild(joinConditionNode);
+                    currentNode = joinConditionNode;
+                    ASTNode childNode = new JoinEndNode();
+                    currentNode.addChild(childNode);
+                    currentNode = childNode;
                 }
             }
         }
         else {
-            try {
-                throw new ParseFailedException("Fail to parse:" + parseTokens.get(index));
-            }
-            catch (ParseFailedException e) {
-                e.printStackTrace();
-            }
+            ASTNode childNode = new JoinEndNode();
+            currentNode.addChild(childNode);
+            currentNode = childNode;
         }
 
         return root;
-- 
Gitee


From efd9320ff63d387b74ffa4eb734770afc2f72cc2 Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Thu, 12 Sep 2024 21:50:13 +0800
Subject: [PATCH 044/113] add update ast class

---
 sqlTranslate/.idea/workspace.xml              | 25 +++++++++++++------
 sqlTranslate/src/main/java/Document/Todolist  |  2 +-
 .../java/Document/Update statement in Oracle  |  1 +
 .../java/Parser/AST/Update/UpdateEndNode.java | 24 ++++++++++++++++++
 .../java/Parser/AST/Update/UpdateNode.java    | 24 ++++++++++++++++++
 .../java/Parser/AST/Update/UpdateObjNode.java | 24 ++++++++++++++++++
 .../java/Parser/AST/Update/UpdateSetNode.java | 24 ++++++++++++++++++
 .../Parser/AST/Update/UpdateWhereNode.java    | 24 ++++++++++++++++++
 8 files changed, 139 insertions(+), 9 deletions(-)
 create mode 100644 sqlTranslate/src/main/java/Document/Update statement in Oracle
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/Update/UpdateEndNode.java
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/Update/UpdateNode.java
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/Update/UpdateObjNode.java
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/Update/UpdateSetNode.java
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/Update/UpdateWhereNode.java

diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
index e11c9ee9..66f4221a 100644
--- a/sqlTranslate/.idea/workspace.xml
+++ b/sqlTranslate/.idea/workspace.xml
@@ -4,13 +4,14 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="refractor">
+    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add select convert rules">
+      <change afterPath="$PROJECT_DIR$/src/main/java/Document/Update statement in Oracle" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Update/UpdateEndNode.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Update/UpdateNode.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Update/UpdateObjNode.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Update/UpdateSetNode.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Update/UpdateWhereNode.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Generator/OpenGaussGenerator.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Generator/OpenGaussGenerator.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Lexer/Token.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Lexer/Token.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Main.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/ASTNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/ASTNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -402,7 +403,14 @@
       <option name="project" value="LOCAL" />
       <updated>1726143907403</updated>
     </task>
-    <option name="localTasksCounter" value="43" />
+    <task id="LOCAL-00043" summary="add select convert rules">
+      <created>1726148093221</created>
+      <option name="number" value="00043" />
+      <option name="presentableId" value="LOCAL-00043" />
+      <option name="project" value="LOCAL" />
+      <updated>1726148093221</updated>
+    </task>
+    <option name="localTasksCounter" value="44" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
@@ -439,7 +447,8 @@
     <MESSAGE value="add join" />
     <MESSAGE value="add join convert rule" />
     <MESSAGE value="refractor" />
-    <option name="LAST_COMMIT_MESSAGE" value="refractor" />
+    <MESSAGE value="add select convert rules" />
+    <option name="LAST_COMMIT_MESSAGE" value="add select convert rules" />
   </component>
   <component name="XDebuggerManager">
     <watches-manager>
diff --git a/sqlTranslate/src/main/java/Document/Todolist b/sqlTranslate/src/main/java/Document/Todolist
index bc134a5e..71210ee5 100644
--- a/sqlTranslate/src/main/java/Document/Todolist
+++ b/sqlTranslate/src/main/java/Document/Todolist
@@ -5,7 +5,7 @@ Operation
  order by 1
  union 1
  insert into 1
- update... set
+ update... set 1
  delete
  if... elsif... else... end if
  case... when... then 1
diff --git a/sqlTranslate/src/main/java/Document/Update statement in Oracle b/sqlTranslate/src/main/java/Document/Update statement in Oracle
new file mode 100644
index 00000000..121d2a59
--- /dev/null
+++ b/sqlTranslate/src/main/java/Document/Update statement in Oracle	
@@ -0,0 +1 @@
+UPDATE table_name SET column1 = value1, column2 = value2, ... WHERE condition;
\ No newline at end of file
diff --git a/sqlTranslate/src/main/java/Parser/AST/Update/UpdateEndNode.java b/sqlTranslate/src/main/java/Parser/AST/Update/UpdateEndNode.java
new file mode 100644
index 00000000..b3ce1bb9
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/Update/UpdateEndNode.java
@@ -0,0 +1,24 @@
+package Parser.AST.Update;
+
+import Parser.AST.ASTNode;
+import Lexer.Token;
+
+import java.util.List;
+
+public class UpdateEndNode extends ASTNode {
+    public UpdateEndNode(ASTNode node) {
+        super(node);
+    }
+
+    public UpdateEndNode(List<Token> tokens) {
+        super(tokens);
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString) {
+        queryString.append(toString());
+        for (ASTNode child : getChildren()) {
+            child.visit(child, queryString);
+        }
+    }
+}
diff --git a/sqlTranslate/src/main/java/Parser/AST/Update/UpdateNode.java b/sqlTranslate/src/main/java/Parser/AST/Update/UpdateNode.java
new file mode 100644
index 00000000..35e5274c
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/Update/UpdateNode.java
@@ -0,0 +1,24 @@
+package Parser.AST.Update;
+
+import Parser.AST.ASTNode;
+import Lexer.Token;
+
+import java.util.List;
+
+public class UpdateNode extends ASTNode {
+    public UpdateNode(ASTNode node) {
+        super(node);
+    }
+
+    public UpdateNode(List<Token> tokens) {
+        super(tokens);
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString) {
+        queryString.append(toString() + " ");
+        for (ASTNode child : getChildren()) {
+            child.visit(child, queryString);
+        }
+    }
+}
diff --git a/sqlTranslate/src/main/java/Parser/AST/Update/UpdateObjNode.java b/sqlTranslate/src/main/java/Parser/AST/Update/UpdateObjNode.java
new file mode 100644
index 00000000..d7492d22
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/Update/UpdateObjNode.java
@@ -0,0 +1,24 @@
+package Parser.AST.Update;
+
+import Parser.AST.ASTNode;
+import Lexer.Token;
+
+import java.util.List;
+
+public class UpdateObjNode extends ASTNode {
+    public UpdateObjNode(ASTNode node) {
+        super(node);
+    }
+
+    public UpdateObjNode(List<Token> tokens) {
+        super(tokens);
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString) {
+        queryString.append(toString() + " ");
+        for (ASTNode child : getChildren()) {
+            child.visit(this, queryString);
+        }
+    }
+}
diff --git a/sqlTranslate/src/main/java/Parser/AST/Update/UpdateSetNode.java b/sqlTranslate/src/main/java/Parser/AST/Update/UpdateSetNode.java
new file mode 100644
index 00000000..c9ad6cb1
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/Update/UpdateSetNode.java
@@ -0,0 +1,24 @@
+package Parser.AST.Update;
+
+import Parser.AST.ASTNode;
+import Lexer.Token;
+
+import java.util.List;
+
+public class UpdateSetNode extends ASTNode {
+    public UpdateSetNode(ASTNode node) {
+        super(node);
+    }
+
+    public UpdateSetNode(List<Token> tokens) {
+        super(tokens);
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString) {
+        queryString.append(toString() + " ");
+        for (ASTNode child : getChildren()) {
+            child.visit(this, queryString);
+        }
+    }
+}
diff --git a/sqlTranslate/src/main/java/Parser/AST/Update/UpdateWhereNode.java b/sqlTranslate/src/main/java/Parser/AST/Update/UpdateWhereNode.java
new file mode 100644
index 00000000..e9d7be47
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/Update/UpdateWhereNode.java
@@ -0,0 +1,24 @@
+package Parser.AST.Update;
+
+import Parser.AST.ASTNode;
+import Lexer.Token;
+
+import java.util.List;
+
+public class UpdateWhereNode extends ASTNode {
+    public UpdateWhereNode(ASTNode node) {
+        super(node);
+    }
+
+    public UpdateWhereNode(List<Token> tokens) {
+        super(tokens);
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString) {
+        queryString.append(toString() + " ");
+        for (ASTNode child : getChildren()) {
+            child.visit(child, queryString);
+        }
+    }
+}
-- 
Gitee


From 382ac95ee0e9bd384e18fd4429f051b4098f2a60 Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Thu, 12 Sep 2024 22:32:12 +0800
Subject: [PATCH 045/113] add update convert rules

---
 sqlTranslate/.idea/workspace.xml              | 24 +++---
 .../java/Generator/OpenGaussGenerator.java    | 31 +++++++-
 .../src/main/java/Lexer/OracleLexer.java      |  2 +
 sqlTranslate/src/main/java/Main.java          |  5 ++
 .../java/Parser/AST/Join/JoinEndNode.java     |  4 +
 .../java/Parser/AST/SelectStatementNode.java  | 27 -------
 .../src/main/java/Parser/OracleParser.java    | 79 +++++++++++++++++++
 7 files changed, 135 insertions(+), 37 deletions(-)
 delete mode 100644 sqlTranslate/src/main/java/Parser/AST/SelectStatementNode.java

diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
index 66f4221a..c3aaaf2c 100644
--- a/sqlTranslate/.idea/workspace.xml
+++ b/sqlTranslate/.idea/workspace.xml
@@ -4,14 +4,12 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add select convert rules">
-      <change afterPath="$PROJECT_DIR$/src/main/java/Document/Update statement in Oracle" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Update/UpdateEndNode.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Update/UpdateNode.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Update/UpdateObjNode.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Update/UpdateSetNode.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Update/UpdateWhereNode.java" afterDir="false" />
+    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add update ast class">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Generator/OpenGaussGenerator.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Generator/OpenGaussGenerator.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Lexer/OracleLexer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Lexer/OracleLexer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Main.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -410,7 +408,14 @@
       <option name="project" value="LOCAL" />
       <updated>1726148093221</updated>
     </task>
-    <option name="localTasksCounter" value="44" />
+    <task id="LOCAL-00044" summary="add update ast class">
+      <created>1726149015586</created>
+      <option name="number" value="00044" />
+      <option name="presentableId" value="LOCAL-00044" />
+      <option name="project" value="LOCAL" />
+      <updated>1726149015586</updated>
+    </task>
+    <option name="localTasksCounter" value="45" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
@@ -448,7 +453,8 @@
     <MESSAGE value="add join convert rule" />
     <MESSAGE value="refractor" />
     <MESSAGE value="add select convert rules" />
-    <option name="LAST_COMMIT_MESSAGE" value="add select convert rules" />
+    <MESSAGE value="add update ast class" />
+    <option name="LAST_COMMIT_MESSAGE" value="add update ast class" />
   </component>
   <component name="XDebuggerManager">
     <watches-manager>
diff --git a/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java b/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java
index 87cd440c..c5acf0de 100644
--- a/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java
+++ b/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java
@@ -12,6 +12,8 @@ import Parser.AST.Join.JoinConditionNode;
 import Parser.AST.Join.JoinSourceTabNode;
 import Parser.AST.Select.SelectNode;
 import Parser.AST.Select.SelectObjNode;
+import Parser.AST.Update.UpdateNode;
+import Parser.AST.Update.UpdateObjNode;
 import Parser.OracleParser;
 
 import java.util.ArrayList;
@@ -43,6 +45,9 @@ public class OpenGaussGenerator {
         else if (node instanceof JoinSourceTabNode) {
             return GenJoinSQL(node);
         }
+        else if (node instanceof UpdateNode) {
+            return GenUpdateSQL(node);
+        }
         else {
             try {
                 throw new GenerateFailedException("Root node:" + node.getClass() + "(Unsupported node type!)");
@@ -72,7 +77,7 @@ public class OpenGaussGenerator {
 
     private String GenSelectSQL(ASTNode node) {
         visitSelect(node, null);
-        System.out.println(node.getASTString());
+//        System.out.println(node.getASTString());
         return node.toQueryString();
     }
 
@@ -81,6 +86,12 @@ public class OpenGaussGenerator {
         return node.toQueryString();
     }
 
+    private String GenUpdateSQL(ASTNode node) {
+        visitUpdate(node, null);
+//        System.out.println(node.getASTString());
+        return node.toQueryString();
+    }
+
     private void visitCrt(ASTNode node) {
         if (node instanceof ColumnNode) {
             ColumnTypeConvert((ColumnNode) node);
@@ -138,6 +149,24 @@ public class OpenGaussGenerator {
         }
     }
 
+    private void visitUpdate(ASTNode node, ASTNode parentNode) {
+        if (node instanceof UpdateObjNode) {
+            // check whether there exists a join statement in the select sql
+            if (node.getTokens().contains(new Token(Token.TokenType.KEYWORD, "JOIN"))) {
+                ASTNode joinRootNode = OracleParser.parseJoin(node.getTokens());
+                visitJoin(joinRootNode);
+                parentNode.replaceChild(node, joinRootNode);
+                ASTNode smallestChild = joinRootNode.getDeepestChild();
+                for (ASTNode child : node.getChildren()) {
+                    smallestChild.addChild(child);
+                }
+            }
+        }
+        for (ASTNode child : node.getChildren()) {
+            visitUpdate(child, node);
+        }
+    }
+
     private void ColumnTypeConvert(ColumnNode node) {
         // type convert
         if (node.getType().getValue().equalsIgnoreCase("NUMBER")) {
diff --git a/sqlTranslate/src/main/java/Lexer/OracleLexer.java b/sqlTranslate/src/main/java/Lexer/OracleLexer.java
index 90b2554c..39e2987c 100644
--- a/sqlTranslate/src/main/java/Lexer/OracleLexer.java
+++ b/sqlTranslate/src/main/java/Lexer/OracleLexer.java
@@ -21,6 +21,8 @@ public class OracleLexer {
             , "DISTINCT", "JOIN", "GROUP BY", "ORDER BY", "HAVING", "UNION", "CASE", "WHEN", "END", "AS"
             // keywords of join
             , "INNER JOIN", "LEFT JOIN", "LEFT OUTER JOIN", "RIGHT JOIN", "RIGHT OUTER JOIN", "FULL JOIN", "FULL OUTER JOIN", "CROSS JOIN", "JOIN", "ON", "USING"
+            // keywords of update
+            , "SET"
     };
     private static final Pattern TOKEN_PATTERN = Pattern.compile(
             "(NUMBER\\(.*?\\))|" +                     // NUMBER() function
diff --git a/sqlTranslate/src/main/java/Main.java b/sqlTranslate/src/main/java/Main.java
index db3af17f..b2381420 100644
--- a/sqlTranslate/src/main/java/Main.java
+++ b/sqlTranslate/src/main/java/Main.java
@@ -18,6 +18,11 @@ public class Main {
 //        String sql = "DROP TABLE employees CASCADE CONSTRAINTS;";
         String sql = "SELECT e.first_name, d.department_name FROM employees e JOIN departments d Using e.department_id = d.department_id;";
 //        String sql = "employees e JOIN departments d ON e.department_id = d.department_id;";
+//        String sql = "UPDATE employees e\n" +
+//                "JOIN departments d using e.department_id = d.department_id\n" +
+//                "SET e.salary = e.salary * 1.10,\n" +
+//                "    d.budget = d.budget * 1.10\n" +
+//                "WHERE d.department_name = 'Sales';";
         OracleLexer lexer = new OracleLexer(sql);
         lexer.printTokens();
         OracleParser parser = new OracleParser(lexer);
diff --git a/sqlTranslate/src/main/java/Parser/AST/Join/JoinEndNode.java b/sqlTranslate/src/main/java/Parser/AST/Join/JoinEndNode.java
index 53ca8eda..96e252c6 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Join/JoinEndNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/Join/JoinEndNode.java
@@ -20,5 +20,9 @@ public class JoinEndNode extends ASTNode {
     @Override
     public void visit(ASTNode node, StringBuilder queryString) {
         queryString.append(toString());
+        for (ASTNode child : getChildren())
+        {
+            child.visit(child, queryString);
+        }
     }
 }
diff --git a/sqlTranslate/src/main/java/Parser/AST/SelectStatementNode.java b/sqlTranslate/src/main/java/Parser/AST/SelectStatementNode.java
deleted file mode 100644
index 0d3eb828..00000000
--- a/sqlTranslate/src/main/java/Parser/AST/SelectStatementNode.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package Parser.AST;
-
-import Lexer.Token;
-
-import java.util.List;
-
-public class SelectStatementNode extends ASTNode{
-    public SelectStatementNode(ASTNode node)
-    {
-        super(node);
-    }
-
-    public SelectStatementNode(List<Token> tokens)
-    {
-        super(tokens);
-    }
-
-    @Override
-    public void visit(ASTNode node, StringBuilder queryString)
-    {
-        queryString.append(toString() + " ");
-        for (ASTNode child : getChildren())
-        {
-            child.visit(child, queryString);
-        }
-    }
-}
diff --git a/sqlTranslate/src/main/java/Parser/OracleParser.java b/sqlTranslate/src/main/java/Parser/OracleParser.java
index 31d5be42..312bb14d 100644
--- a/sqlTranslate/src/main/java/Parser/OracleParser.java
+++ b/sqlTranslate/src/main/java/Parser/OracleParser.java
@@ -19,6 +19,7 @@ import Parser.AST.Insert.InsertNode;
 import Parser.AST.Insert.InsertObjNode;
 import Parser.AST.Join.*;
 import Parser.AST.Select.*;
+import Parser.AST.Update.*;
 
 import java.util.Stack;
 
@@ -46,6 +47,9 @@ public class OracleParser {
         else if (lexer.getTokens().get(0).getValue().equalsIgnoreCase("SELECT")) {
             return parseSelect(lexer.getTokens());
         }
+        else if (lexer.getTokens().get(0).getValue().equalsIgnoreCase("UPDATE")) {
+            return parseUpdate(lexer.getTokens());
+        }
         else {
             try {
                 throw new ParseFailedException("Parse failed!");
@@ -739,4 +743,79 @@ public class OracleParser {
 
         return root;
     }
+
+    /**
+     * Update
+     * For example: UPDATE table_name SET column1 = value1, column2 = value2, ... WHERE condition;
+     */
+    private ASTNode parseUpdate(List<Token> parseTokens) {
+        List<Token> tokens = new ArrayList<>();
+        tokens.add(parseTokens.get(0));
+        ASTNode root = new UpdateNode(tokens);
+        ASTNode currentNode = root;
+        for (int i = 1; i < parseTokens.size(); i++) {
+            if (i == 1 && parseTokens.get(i).hasType(Token.TokenType.IDENTIFIER)) {
+                // match update object
+                tokens = new ArrayList<>();
+                for (int j = i; j < parseTokens.size(); j++) {
+                    if (parseTokens.get(j).hasType(Token.TokenType.KEYWORD) && parseTokens.get(j).getValue().equalsIgnoreCase("SET")) {
+                        i = j - 1;
+                        break;
+                    }
+                    tokens.add(parseTokens.get(j));
+                }
+                ASTNode childNode = new UpdateObjNode(tokens);
+                currentNode.addChild(childNode);
+                currentNode = childNode;
+            }
+            else if (parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("SET")) {
+                // match SET
+                tokens = new ArrayList<>();
+                for (int j = i; j < parseTokens.size(); j++) {
+                    if (parseTokens.get(j).hasType(Token.TokenType.KEYWORD) && parseTokens.get(j).getValue().equalsIgnoreCase("WHERE")) {
+                        i = j - 1;
+                        break;
+                    }
+                    tokens.add(parseTokens.get(j));
+                }
+                ASTNode childNode = new UpdateSetNode(tokens);
+                currentNode.addChild(childNode);
+                currentNode = childNode;
+            }
+            else if (parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("WHERE")) {
+                // match WHERE
+                tokens = new ArrayList<>();
+                for (int j = i; j < parseTokens.size(); j++) {
+                    if (parseTokens.get(j).hasType(Token.TokenType.SYMBOL) && parseTokens.get(j).getValue().equalsIgnoreCase(";")) {
+                        i = j - 1;
+                        break;
+                    }
+                    tokens.add(parseTokens.get(j));
+                }
+                ASTNode childNode = new UpdateWhereNode(tokens);
+                currentNode.addChild(childNode);
+                currentNode = childNode;
+            }
+            else if (parseTokens.get(i).hasType(Token.TokenType.SYMBOL) && parseTokens.get(i).getValue().equalsIgnoreCase(";")) {
+                tokens = new ArrayList<>();
+                tokens.add(parseTokens.get(i));
+                ASTNode childNode = new UpdateEndNode(tokens);
+                currentNode.addChild(childNode);
+                currentNode = childNode;
+            }
+            else if (parseTokens.get(i).hasType(Token.TokenType.EOF)) {
+                break;
+            }
+            else {
+                try {
+                    throw new ParseFailedException("Parse failed:" + parseTokens.get(i));
+                }
+                catch (ParseFailedException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+
+        return root;
+    }
 }
-- 
Gitee


From 84b694de4cfc6be598a703a986a9e87f85fb3d67 Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Thu, 12 Sep 2024 22:40:29 +0800
Subject: [PATCH 046/113] add Delete ast class

---
 sqlTranslate/.idea/workspace.xml              | 20 +++++++++-------
 sqlTranslate/src/main/java/Document/Todolist  |  2 +-
 .../AST/Delete/DeleteConditionNode.java       | 24 +++++++++++++++++++
 .../java/Parser/AST/Delete/DeleteEndNode.java | 24 +++++++++++++++++++
 .../java/Parser/AST/Delete/DeleteNode.java    | 23 ++++++++++++++++++
 .../java/Parser/AST/Delete/DeleteObjNode.java | 24 +++++++++++++++++++
 6 files changed, 108 insertions(+), 9 deletions(-)
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/Delete/DeleteConditionNode.java
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/Delete/DeleteEndNode.java
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/Delete/DeleteNode.java
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/Delete/DeleteObjNode.java

diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
index c3aaaf2c..1c09af0f 100644
--- a/sqlTranslate/.idea/workspace.xml
+++ b/sqlTranslate/.idea/workspace.xml
@@ -4,12 +4,8 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add update ast class">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Generator/OpenGaussGenerator.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Generator/OpenGaussGenerator.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Lexer/OracleLexer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Lexer/OracleLexer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Main.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" afterDir="false" />
+    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add update convert rules">
+      <change beforePath="$PROJECT_DIR$/src/main/java/Document/Todolist" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Document/Todolist" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -415,7 +411,14 @@
       <option name="project" value="LOCAL" />
       <updated>1726149015586</updated>
     </task>
-    <option name="localTasksCounter" value="45" />
+    <task id="LOCAL-00045" summary="add update convert rules">
+      <created>1726151534112</created>
+      <option name="number" value="00045" />
+      <option name="presentableId" value="LOCAL-00045" />
+      <option name="project" value="LOCAL" />
+      <updated>1726151534112</updated>
+    </task>
+    <option name="localTasksCounter" value="46" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
@@ -454,7 +457,8 @@
     <MESSAGE value="refractor" />
     <MESSAGE value="add select convert rules" />
     <MESSAGE value="add update ast class" />
-    <option name="LAST_COMMIT_MESSAGE" value="add update ast class" />
+    <MESSAGE value="add update convert rules" />
+    <option name="LAST_COMMIT_MESSAGE" value="add update convert rules" />
   </component>
   <component name="XDebuggerManager">
     <watches-manager>
diff --git a/sqlTranslate/src/main/java/Document/Todolist b/sqlTranslate/src/main/java/Document/Todolist
index 71210ee5..a00b0166 100644
--- a/sqlTranslate/src/main/java/Document/Todolist
+++ b/sqlTranslate/src/main/java/Document/Todolist
@@ -6,7 +6,7 @@ Operation
  union 1
  insert into 1
  update... set 1
- delete
+ delete 1
  if... elsif... else... end if
  case... when... then 1
  loop... end loop
diff --git a/sqlTranslate/src/main/java/Parser/AST/Delete/DeleteConditionNode.java b/sqlTranslate/src/main/java/Parser/AST/Delete/DeleteConditionNode.java
new file mode 100644
index 00000000..1d8dae88
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/Delete/DeleteConditionNode.java
@@ -0,0 +1,24 @@
+package Parser.AST.Delete;
+
+import Lexer.Token;
+import Parser.AST.ASTNode;
+
+import java.util.List;
+
+public class DeleteConditionNode extends ASTNode {
+    public DeleteConditionNode(ASTNode node) {
+        super(node);
+    }
+
+    public DeleteConditionNode(List<Token> tokens) {
+        super(tokens);
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString) {
+        queryString.append(toString() + " ");
+        for (ASTNode child : getChildren()) {
+            child.visit(child, queryString);
+        }
+    }
+}
diff --git a/sqlTranslate/src/main/java/Parser/AST/Delete/DeleteEndNode.java b/sqlTranslate/src/main/java/Parser/AST/Delete/DeleteEndNode.java
new file mode 100644
index 00000000..0b21940c
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/Delete/DeleteEndNode.java
@@ -0,0 +1,24 @@
+package Parser.AST.Delete;
+
+import Lexer.Token;
+import Parser.AST.ASTNode;
+
+import java.util.List;
+
+public class DeleteEndNode extends ASTNode {
+    public DeleteEndNode(ASTNode node) {
+        super(node);
+    }
+
+    public DeleteEndNode(List<Token> tokens) {
+        super(tokens);
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString) {
+        queryString.append(toString());
+        for (ASTNode child : getChildren()) {
+            child.visit(child, queryString);
+        }
+    }
+}
diff --git a/sqlTranslate/src/main/java/Parser/AST/Delete/DeleteNode.java b/sqlTranslate/src/main/java/Parser/AST/Delete/DeleteNode.java
new file mode 100644
index 00000000..a9496e6a
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/Delete/DeleteNode.java
@@ -0,0 +1,23 @@
+package Parser.AST.Delete;
+
+import Lexer.Token;
+import Parser.AST.ASTNode;
+
+import java.util.List;
+
+public class DeleteNode extends ASTNode {
+    public DeleteNode(ASTNode node) {
+        super(node);
+    }
+    public DeleteNode(List<Token> tokens) {
+        super(tokens);
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString) {
+        queryString.append(toString() + " ");
+        for (ASTNode child : getChildren()) {
+            child.visit(child, queryString);
+        }
+    }
+}
diff --git a/sqlTranslate/src/main/java/Parser/AST/Delete/DeleteObjNode.java b/sqlTranslate/src/main/java/Parser/AST/Delete/DeleteObjNode.java
new file mode 100644
index 00000000..e8fbd54b
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/Delete/DeleteObjNode.java
@@ -0,0 +1,24 @@
+package Parser.AST.Delete;
+
+import Lexer.Token;
+import Parser.AST.ASTNode;
+
+import java.util.List;
+
+public class DeleteObjNode extends ASTNode {
+    public DeleteObjNode(ASTNode node) {
+        super(node);
+    }
+
+    public DeleteObjNode(List<Token> tokens) {
+        super(tokens);
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString) {
+        queryString.append(toString() + " ");
+        for (ASTNode child : getChildren()) {
+            child.visit(child, queryString);
+        }
+    }
+}
-- 
Gitee


From 824b2927d0031148c0f9cb03e8aa92cfcd40608d Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Thu, 12 Sep 2024 22:56:47 +0800
Subject: [PATCH 047/113] add Delete

---
 sqlTranslate/.idea/workspace.xml              | 21 +++--
 .../java/Document/Delete statement in Oracle  |  1 +
 sqlTranslate/src/main/java/Document/Todolist  |  2 +-
 .../java/Generator/OpenGaussGenerator.java    |  8 ++
 sqlTranslate/src/main/java/Main.java          |  6 ++
 .../src/main/java/Parser/OracleParser.java    | 82 +++++++++++++++++++
 6 files changed, 114 insertions(+), 6 deletions(-)
 create mode 100644 sqlTranslate/src/main/java/Document/Delete statement in Oracle

diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
index 1c09af0f..5f9f115e 100644
--- a/sqlTranslate/.idea/workspace.xml
+++ b/sqlTranslate/.idea/workspace.xml
@@ -4,8 +4,12 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add update convert rules">
-      <change beforePath="$PROJECT_DIR$/src/main/java/Document/Todolist" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Document/Todolist" afterDir="false" />
+    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add Delete ast class">
+      <change afterPath="$PROJECT_DIR$/src/main/java/Document/Delete statement in Oracle" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Generator/OpenGaussGenerator.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Generator/OpenGaussGenerator.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Main.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -418,7 +422,14 @@
       <option name="project" value="LOCAL" />
       <updated>1726151534112</updated>
     </task>
-    <option name="localTasksCounter" value="46" />
+    <task id="LOCAL-00046" summary="add Delete ast class">
+      <created>1726152030692</created>
+      <option name="number" value="00046" />
+      <option name="presentableId" value="LOCAL-00046" />
+      <option name="project" value="LOCAL" />
+      <updated>1726152030692</updated>
+    </task>
+    <option name="localTasksCounter" value="47" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
@@ -433,7 +444,6 @@
     </option>
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="init" />
     <MESSAGE value="lexer" />
     <MESSAGE value="AST node" />
     <MESSAGE value="add AST node" />
@@ -458,7 +468,8 @@
     <MESSAGE value="add select convert rules" />
     <MESSAGE value="add update ast class" />
     <MESSAGE value="add update convert rules" />
-    <option name="LAST_COMMIT_MESSAGE" value="add update convert rules" />
+    <MESSAGE value="add Delete ast class" />
+    <option name="LAST_COMMIT_MESSAGE" value="add Delete ast class" />
   </component>
   <component name="XDebuggerManager">
     <watches-manager>
diff --git a/sqlTranslate/src/main/java/Document/Delete statement in Oracle b/sqlTranslate/src/main/java/Document/Delete statement in Oracle
new file mode 100644
index 00000000..b02b4bde
--- /dev/null
+++ b/sqlTranslate/src/main/java/Document/Delete statement in Oracle	
@@ -0,0 +1 @@
+DELETE FROM deleteObject WHERE condition ;
\ No newline at end of file
diff --git a/sqlTranslate/src/main/java/Document/Todolist b/sqlTranslate/src/main/java/Document/Todolist
index a00b0166..a1576e7d 100644
--- a/sqlTranslate/src/main/java/Document/Todolist
+++ b/sqlTranslate/src/main/java/Document/Todolist
@@ -16,7 +16,7 @@ Operation
  return
  exception
  commit、rollback、execute
- alter table
+ alter table 1
  create table 1
  drop table 1
 Object
diff --git a/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java b/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java
index c5acf0de..3d8a08a5 100644
--- a/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java
+++ b/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java
@@ -5,6 +5,7 @@ import Parser.AST.ASTNode;
 import Parser.AST.CreateTable.ColumnNode;
 import Parser.AST.CreateTable.CreateTabNode;
 import Exception.GenerateFailedException;
+import Parser.AST.Delete.DeleteNode;
 import Parser.AST.Drop.DropNode;
 import Parser.AST.Drop.DropOptionNode;
 import Parser.AST.Insert.InsertNode;
@@ -48,6 +49,9 @@ public class OpenGaussGenerator {
         else if (node instanceof UpdateNode) {
             return GenUpdateSQL(node);
         }
+        else if (node instanceof DeleteNode) {
+            return GenDeleteSQL(node);
+        }
         else {
             try {
                 throw new GenerateFailedException("Root node:" + node.getClass() + "(Unsupported node type!)");
@@ -92,6 +96,10 @@ public class OpenGaussGenerator {
         return node.toQueryString();
     }
 
+    private String GenDeleteSQL(ASTNode node) {
+        return node.toQueryString();
+    }
+
     private void visitCrt(ASTNode node) {
         if (node instanceof ColumnNode) {
             ColumnTypeConvert((ColumnNode) node);
diff --git a/sqlTranslate/src/main/java/Main.java b/sqlTranslate/src/main/java/Main.java
index b2381420..d815f31f 100644
--- a/sqlTranslate/src/main/java/Main.java
+++ b/sqlTranslate/src/main/java/Main.java
@@ -23,6 +23,12 @@ public class Main {
 //                "SET e.salary = e.salary * 1.10,\n" +
 //                "    d.budget = d.budget * 1.10\n" +
 //                "WHERE d.department_name = 'Sales';";
+//        String sql = "DELETE FROM employees e\n" +
+//                "WHERE e.department_id IN (\n" +
+//                "    SELECT d.department_id\n" +
+//                "    FROM departments d\n" +
+//                "    WHERE d.department_name = 'Sales'\n" +
+//                ");";
         OracleLexer lexer = new OracleLexer(sql);
         lexer.printTokens();
         OracleParser parser = new OracleParser(lexer);
diff --git a/sqlTranslate/src/main/java/Parser/OracleParser.java b/sqlTranslate/src/main/java/Parser/OracleParser.java
index 312bb14d..3f12175f 100644
--- a/sqlTranslate/src/main/java/Parser/OracleParser.java
+++ b/sqlTranslate/src/main/java/Parser/OracleParser.java
@@ -9,6 +9,10 @@ import Parser.AST.CaseWhen.CaseElseNode;
 import Parser.AST.CaseWhen.CaseEndNode;
 import Parser.AST.CaseWhen.CaseThenNode;
 import Parser.AST.CreateTable.*;
+import Parser.AST.Delete.DeleteConditionNode;
+import Parser.AST.Delete.DeleteEndNode;
+import Parser.AST.Delete.DeleteNode;
+import Parser.AST.Delete.DeleteObjNode;
 import Parser.AST.Drop.DropEndNode;
 import Parser.AST.Drop.DropObjNameNode;
 import Parser.AST.Drop.DropNode;
@@ -50,6 +54,9 @@ public class OracleParser {
         else if (lexer.getTokens().get(0).getValue().equalsIgnoreCase("UPDATE")) {
             return parseUpdate(lexer.getTokens());
         }
+        else if (lexer.getTokens().get(0).getValue().equalsIgnoreCase("DELETE")) {
+            return parseDelete(lexer.getTokens());
+        }
         else {
             try {
                 throw new ParseFailedException("Parse failed!");
@@ -818,4 +825,79 @@ public class OracleParser {
 
         return root;
     }
+
+    /**
+     * Delete
+     * For example:
+     *      DELETE FROM employees e
+     *      WHERE e.department_id IN (
+     *          SELECT d.department_id
+     *          FROM departments d
+     *          WHERE d.department_name = 'Sales'
+     *      );
+     */
+    private ASTNode parseDelete(List<Token> parseTokens) {
+        List<Token> tokens = new ArrayList<>();
+        tokens.add(parseTokens.get(0));
+        try{
+            tokens.add(parseTokens.get(1));
+        } catch (IndexOutOfBoundsException e) {
+            e.printStackTrace();
+        }
+        ASTNode root = new DeleteNode(tokens);
+        ASTNode currentNode = root;
+        for (int i = 2; i < parseTokens.size(); i++) {
+            // match delete object
+            if (i == 2 && parseTokens.get(i).hasType(Token.TokenType.IDENTIFIER)) {
+                tokens = new ArrayList<>();
+                for (int j = i; j < parseTokens.size(); j++) {
+                    if (parseTokens.get(j).hasType(Token.TokenType.KEYWORD) && parseTokens.get(j).getValue().equalsIgnoreCase("WHERE")) {
+                        i = j - 1;
+                        break;
+                    }
+                    tokens.add(parseTokens.get(j));
+                }
+                ASTNode childNode = new DeleteObjNode(tokens);
+                currentNode.addChild(childNode);
+                currentNode = childNode;
+            }
+            // match WHERE condition
+            else if (parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("WHERE")) {
+                tokens = new ArrayList<>();
+                for (int j = i; j < parseTokens.size(); j++) {
+                    if (parseTokens.get(j).hasType(Token.TokenType.SYMBOL) && parseTokens.get(j).getValue().equalsIgnoreCase(";")) {
+                        i = j - 1;
+                        break;
+                    }
+                    tokens.add(parseTokens.get(j));
+                }
+                ASTNode childNode = new DeleteConditionNode(tokens);
+                currentNode.addChild(childNode);
+                currentNode = childNode;
+            }
+            else if (parseTokens.get(i).hasType(Token.TokenType.SYMBOL) && parseTokens.get(i).getValue().equals(";")) {
+                tokens = new ArrayList<>();
+                tokens.add(parseTokens.get(i));
+                ASTNode childNode = new DeleteEndNode(tokens);
+                currentNode.addChild(childNode);
+                currentNode = childNode;
+            }
+            else if (parseTokens.get(i).hasType(Token.TokenType.EOF)) {
+                break;
+            }
+            else {
+                try {
+                    throw new ParseFailedException("Parse failed:" + parseTokens.get(i));
+                }
+                catch (ParseFailedException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+
+        return root;
+    }
+
+
+
 }
-- 
Gitee


From a4127524c96f0dd840d8efc33e62f27f7b03533f Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Thu, 12 Sep 2024 22:59:32 +0800
Subject: [PATCH 048/113] add alter table grammar document

---
 sqlTranslate/src/main/java/Document/Alter table in Oracle | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 sqlTranslate/src/main/java/Document/Alter table in Oracle

diff --git a/sqlTranslate/src/main/java/Document/Alter table in Oracle b/sqlTranslate/src/main/java/Document/Alter table in Oracle
new file mode 100644
index 00000000..48618726
--- /dev/null
+++ b/sqlTranslate/src/main/java/Document/Alter table in Oracle	
@@ -0,0 +1,8 @@
+ALTER TABLE table_name action;
+action = ADD column_name data_type [constraint]
+| DROP COLUMN column_name
+| MODIFY column_name data_type
+| RENAME COLUMN old_column_name TO new_column_name
+| ADD CONSTRAINT constraint_name constraint_definition
+| DROP CONSTRAINT constraint_name
+| RENAME old_table_name TO new_table_name
\ No newline at end of file
-- 
Gitee


From 4e3eae83afbfc9d5871a0634136d7084ab3417d1 Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Thu, 12 Sep 2024 23:12:56 +0800
Subject: [PATCH 049/113] add alter table ast class

---
 sqlTranslate/.idea/workspace.xml              | 30 ++++++++++++-------
 .../AST/AlterTable/AlterAddColumnNode.java    | 26 ++++++++++++++++
 .../AlterTable/AlterAddConstraintNode.java    | 24 +++++++++++++++
 .../AST/AlterTable/AlterDropColumnNode.java   | 25 ++++++++++++++++
 .../AlterTable/AlterDropConstraintNode.java   | 24 +++++++++++++++
 .../Parser/AST/AlterTable/AlterEndNode.java   | 26 ++++++++++++++++
 .../AST/AlterTable/AlterModifyColumnNode.java | 24 +++++++++++++++
 .../java/Parser/AST/AlterTable/AlterNode.java | 24 +++++++++++++++
 .../Parser/AST/AlterTable/AlterObjNode.java   | 24 +++++++++++++++
 .../AST/AlterTable/AlterRenameColumnNode.java | 24 +++++++++++++++
 .../AST/AlterTable/AlterRenameTableNode.java  | 24 +++++++++++++++
 11 files changed, 265 insertions(+), 10 deletions(-)
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterAddColumnNode.java
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterAddConstraintNode.java
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterDropColumnNode.java
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterDropConstraintNode.java
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterEndNode.java
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterModifyColumnNode.java
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterNode.java
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterObjNode.java
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterRenameColumnNode.java
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterRenameTableNode.java

diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
index 5f9f115e..02dd6433 100644
--- a/sqlTranslate/.idea/workspace.xml
+++ b/sqlTranslate/.idea/workspace.xml
@@ -4,12 +4,8 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add Delete ast class">
-      <change afterPath="$PROJECT_DIR$/src/main/java/Document/Delete statement in Oracle" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Generator/OpenGaussGenerator.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Generator/OpenGaussGenerator.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Main.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" afterDir="false" />
+    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add alter table grammar document">
+      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/AlterTable/AlterNode.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -429,7 +425,21 @@
       <option name="project" value="LOCAL" />
       <updated>1726152030692</updated>
     </task>
-    <option name="localTasksCounter" value="47" />
+    <task id="LOCAL-00047" summary="add Delete">
+      <created>1726153009186</created>
+      <option name="number" value="00047" />
+      <option name="presentableId" value="LOCAL-00047" />
+      <option name="project" value="LOCAL" />
+      <updated>1726153009186</updated>
+    </task>
+    <task id="LOCAL-00048" summary="add alter table grammar document">
+      <created>1726153173228</created>
+      <option name="number" value="00048" />
+      <option name="presentableId" value="LOCAL-00048" />
+      <option name="project" value="LOCAL" />
+      <updated>1726153173228</updated>
+    </task>
+    <option name="localTasksCounter" value="49" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
@@ -444,8 +454,6 @@
     </option>
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="lexer" />
-    <MESSAGE value="AST node" />
     <MESSAGE value="add AST node" />
     <MESSAGE value="add functions" />
     <MESSAGE value="add parser function" />
@@ -469,7 +477,9 @@
     <MESSAGE value="add update ast class" />
     <MESSAGE value="add update convert rules" />
     <MESSAGE value="add Delete ast class" />
-    <option name="LAST_COMMIT_MESSAGE" value="add Delete ast class" />
+    <MESSAGE value="add Delete" />
+    <MESSAGE value="add alter table grammar document" />
+    <option name="LAST_COMMIT_MESSAGE" value="add alter table grammar document" />
   </component>
   <component name="XDebuggerManager">
     <watches-manager>
diff --git a/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterAddColumnNode.java b/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterAddColumnNode.java
new file mode 100644
index 00000000..01930031
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterAddColumnNode.java
@@ -0,0 +1,26 @@
+package Parser.AST.AlterTable;
+
+import Lexer.Token;
+import Parser.AST.ASTNode;
+
+import java.util.List;
+
+public class AlterAddColumnNode extends ASTNode {
+    public AlterAddColumnNode(ASTNode node)
+    {
+        super(node);
+    }
+
+    public AlterAddColumnNode(List<Token> tokens)
+    {
+        super(tokens);
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString) {
+        queryString.append(toString() + " ");
+        for (ASTNode child : getChildren())
+
+            child.visit(child, queryString);
+    }
+}
diff --git a/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterAddConstraintNode.java b/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterAddConstraintNode.java
new file mode 100644
index 00000000..e070e570
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterAddConstraintNode.java
@@ -0,0 +1,24 @@
+package Parser.AST.AlterTable;
+
+import Lexer.Token;
+import Parser.AST.ASTNode;
+
+import java.util.List;
+
+public class AlterAddConstraintNode extends ASTNode {
+    public AlterAddConstraintNode(ASTNode node) {
+        super(node);
+    }
+
+    public AlterAddConstraintNode(List<Token> tokens) {
+        super(tokens);
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString) {
+        queryString.append(toString() + " ");
+        for (ASTNode child : getChildren())
+
+            child.visit(child, queryString);
+    }
+}
diff --git a/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterDropColumnNode.java b/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterDropColumnNode.java
new file mode 100644
index 00000000..120116cf
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterDropColumnNode.java
@@ -0,0 +1,25 @@
+package Parser.AST.AlterTable;
+
+import Lexer.Token;
+import Parser.AST.ASTNode;
+
+import java.util.List;
+
+public class AlterDropColumnNode extends ASTNode {
+
+    public AlterDropColumnNode(ASTNode node) {
+        super(node);
+    }
+
+    public AlterDropColumnNode(List<Token> tokens) {
+        super(tokens);
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString) {
+        queryString.append(toString() + " ");
+        for (ASTNode child : getChildren())
+
+            child.visit(child, queryString);
+    }
+}
diff --git a/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterDropConstraintNode.java b/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterDropConstraintNode.java
new file mode 100644
index 00000000..b32ad2a6
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterDropConstraintNode.java
@@ -0,0 +1,24 @@
+package Parser.AST.AlterTable;
+
+import Lexer.Token;
+import Parser.AST.ASTNode;
+
+import java.util.List;
+
+public class AlterDropConstraintNode extends ASTNode {
+    public AlterDropConstraintNode(ASTNode node) {
+        super(node);
+    }
+
+    public AlterDropConstraintNode(List<Token> tokens) {
+        super(tokens);
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString) {
+        queryString.append(toString() + " ");
+        for (ASTNode child : getChildren())
+
+            child.visit(child, queryString);
+    }
+}
diff --git a/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterEndNode.java b/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterEndNode.java
new file mode 100644
index 00000000..447f7c08
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterEndNode.java
@@ -0,0 +1,26 @@
+package Parser.AST.AlterTable;
+
+import Lexer.Token;
+import Parser.AST.ASTNode;
+
+import java.util.List;
+
+public class AlterEndNode extends ASTNode {
+    public AlterEndNode(ASTNode node) {
+        super(node);
+    }
+
+    public AlterEndNode(List<Token> tokens) {
+        super(tokens);
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString) {
+        queryString.append(toString());
+        for (ASTNode child : getChildren())
+        {
+            child.visit(child, queryString);
+        }
+    }
+}
+
diff --git a/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterModifyColumnNode.java b/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterModifyColumnNode.java
new file mode 100644
index 00000000..49a7d0f4
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterModifyColumnNode.java
@@ -0,0 +1,24 @@
+package Parser.AST.AlterTable;
+
+import Lexer.Token;
+import Parser.AST.ASTNode;
+
+import java.util.List;
+
+public class AlterModifyColumnNode extends ASTNode {
+    public AlterModifyColumnNode(ASTNode node) {
+        super(node);
+    }
+
+    public AlterModifyColumnNode(List<Token> tokens) {
+        super(tokens);
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString) {
+        queryString.append(toString() + " ");
+        for (ASTNode child : getChildren())
+
+            child.visit(child, queryString);
+    }
+}
diff --git a/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterNode.java b/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterNode.java
new file mode 100644
index 00000000..23c795a9
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterNode.java
@@ -0,0 +1,24 @@
+package Parser.AST.AlterTable;
+
+import Lexer.Token;
+import Parser.AST.ASTNode;
+
+import java.util.List;
+
+public class AlterNode extends ASTNode {
+    public AlterNode(ASTNode node) {
+        super(node);
+    }
+
+    public AlterNode(List<Token> tokens) {
+        super(tokens);
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString) {
+        queryString.append(toString() + " ");
+        for (ASTNode child : getChildren())
+
+            child.visit(child, queryString);
+    }
+}
diff --git a/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterObjNode.java b/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterObjNode.java
new file mode 100644
index 00000000..c1a06a72
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterObjNode.java
@@ -0,0 +1,24 @@
+package Parser.AST.AlterTable;
+
+import Lexer.Token;
+import Parser.AST.ASTNode;
+
+import java.util.List;
+
+public class AlterObjNode extends ASTNode {
+    public AlterObjNode(ASTNode node) {
+        super(node);
+    }
+
+    public AlterObjNode(List<Token> tokens) {
+        super(tokens);
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString) {
+        queryString.append(toString() + " ");
+        for (ASTNode child : getChildren())
+
+            child.visit(child, queryString);
+    }
+}
diff --git a/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterRenameColumnNode.java b/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterRenameColumnNode.java
new file mode 100644
index 00000000..8295026a
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterRenameColumnNode.java
@@ -0,0 +1,24 @@
+package Parser.AST.AlterTable;
+
+import Lexer.Token;
+import Parser.AST.ASTNode;
+
+import java.util.List;
+
+public class AlterRenameColumnNode extends ASTNode {
+    public AlterRenameColumnNode(ASTNode node) {
+        super(node);
+    }
+
+    public AlterRenameColumnNode(List<Token> tokens) {
+        super(tokens);
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString) {
+        queryString.append(toString() + " ");
+        for (ASTNode child : getChildren())
+
+            child.visit(child, queryString);
+    }
+}
diff --git a/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterRenameTableNode.java b/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterRenameTableNode.java
new file mode 100644
index 00000000..049fed27
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterRenameTableNode.java
@@ -0,0 +1,24 @@
+package Parser.AST.AlterTable;
+
+import Lexer.Token;
+import Parser.AST.ASTNode;
+
+import java.util.List;
+
+public class AlterRenameTableNode extends ASTNode {
+    public AlterRenameTableNode(ASTNode node) {
+        super(node);
+    }
+
+    public AlterRenameTableNode(List<Token> tokens) {
+        super(tokens);
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString) {
+        queryString.append(toString() + " ");
+        for (ASTNode child : getChildren())
+
+            child.visit(child, queryString);
+    }
+}
-- 
Gitee


From 57cfd48b738001ed6908fb1924cfcde05fa9da88 Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Thu, 12 Sep 2024 23:17:22 +0800
Subject: [PATCH 050/113] add alter table keywords

---
 sqlTranslate/.idea/workspace.xml                | 17 ++++++++++++-----
 .../src/main/java/Lexer/OracleLexer.java        |  4 +++-
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
index 02dd6433..84a3005a 100644
--- a/sqlTranslate/.idea/workspace.xml
+++ b/sqlTranslate/.idea/workspace.xml
@@ -4,8 +4,8 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add alter table grammar document">
-      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/AlterTable/AlterNode.java" afterDir="false" />
+    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add alter table ast class">
+      <change beforePath="$PROJECT_DIR$/src/main/java/Lexer/OracleLexer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Lexer/OracleLexer.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -439,7 +439,14 @@
       <option name="project" value="LOCAL" />
       <updated>1726153173228</updated>
     </task>
-    <option name="localTasksCounter" value="49" />
+    <task id="LOCAL-00049" summary="add alter table ast class">
+      <created>1726153977485</created>
+      <option name="number" value="00049" />
+      <option name="presentableId" value="LOCAL-00049" />
+      <option name="project" value="LOCAL" />
+      <updated>1726153977485</updated>
+    </task>
+    <option name="localTasksCounter" value="50" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
@@ -454,7 +461,6 @@
     </option>
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="add AST node" />
     <MESSAGE value="add functions" />
     <MESSAGE value="add parser function" />
     <MESSAGE value="add function" />
@@ -479,7 +485,8 @@
     <MESSAGE value="add Delete ast class" />
     <MESSAGE value="add Delete" />
     <MESSAGE value="add alter table grammar document" />
-    <option name="LAST_COMMIT_MESSAGE" value="add alter table grammar document" />
+    <MESSAGE value="add alter table ast class" />
+    <option name="LAST_COMMIT_MESSAGE" value="add alter table ast class" />
   </component>
   <component name="XDebuggerManager">
     <watches-manager>
diff --git a/sqlTranslate/src/main/java/Lexer/OracleLexer.java b/sqlTranslate/src/main/java/Lexer/OracleLexer.java
index 39e2987c..c4515356 100644
--- a/sqlTranslate/src/main/java/Lexer/OracleLexer.java
+++ b/sqlTranslate/src/main/java/Lexer/OracleLexer.java
@@ -16,13 +16,15 @@ public class OracleLexer {
             "LONG RAW", "BOOLEAN", "INTERVAL YEAR TO MONTH", "INTERVAL DAY TO SECOND", "ROWID", "UROWID", "REF CURSOR",
             "NOT NULL", "PRIMARY KEY", "UNIQUE", "CHECK", "REFERENCES", "DEFAULT", "CONSTRAINT", "FOREIGN KEY"
             // keywords of drop table
-            , "DROP", "CASCADE", "CONSTRAINTS"
+            , "DROP", "CASCADE"
             // keywords of select
             , "DISTINCT", "JOIN", "GROUP BY", "ORDER BY", "HAVING", "UNION", "CASE", "WHEN", "END", "AS"
             // keywords of join
             , "INNER JOIN", "LEFT JOIN", "LEFT OUTER JOIN", "RIGHT JOIN", "RIGHT OUTER JOIN", "FULL JOIN", "FULL OUTER JOIN", "CROSS JOIN", "JOIN", "ON", "USING"
             // keywords of update
             , "SET"
+            // keywords of alter table
+            , "ALTER", "ADD", "DROP", "MODIFY", "RENAME", "TO"
     };
     private static final Pattern TOKEN_PATTERN = Pattern.compile(
             "(NUMBER\\(.*?\\))|" +                     // NUMBER() function
-- 
Gitee


From 189d3db242cf643d1a1aeee316f85ce68c48cad7 Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Thu, 12 Sep 2024 23:21:17 +0800
Subject: [PATCH 051/113] add alter table parser

---
 .../src/main/java/Parser/OracleParser.java    | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/sqlTranslate/src/main/java/Parser/OracleParser.java b/sqlTranslate/src/main/java/Parser/OracleParser.java
index 3f12175f..fe7919f4 100644
--- a/sqlTranslate/src/main/java/Parser/OracleParser.java
+++ b/sqlTranslate/src/main/java/Parser/OracleParser.java
@@ -4,6 +4,7 @@ import Lexer.OracleLexer;
 import Lexer.Token;
 import Parser.AST.ASTNode;
 import Exception.ParseFailedException;
+import Parser.AST.AlterTable.AlterNode;
 import Parser.AST.CaseWhen.CaseConditionNode;
 import Parser.AST.CaseWhen.CaseElseNode;
 import Parser.AST.CaseWhen.CaseEndNode;
@@ -57,6 +58,9 @@ public class OracleParser {
         else if (lexer.getTokens().get(0).getValue().equalsIgnoreCase("DELETE")) {
             return parseDelete(lexer.getTokens());
         }
+        else if (lexer.getTokens().get(0).getValue().equalsIgnoreCase("ALTER")) {
+            return parseAlterTable(lexer.getTokens());
+        }
         else {
             try {
                 throw new ParseFailedException("Parse failed!");
@@ -898,6 +902,30 @@ public class OracleParser {
         return root;
     }
 
+    /**
+     * Alter table
+     * Grammar: ALTER TABLE table_name action;
+     * action = ADD column_name data_type [constraint]
+     * | DROP COLUMN column_name
+     * | MODIFY column_name data_type
+     * | RENAME COLUMN old_column_name TO new_column_name
+     * | ADD CONSTRAINT constraint_name constraint_definition
+     * | DROP CONSTRAINT constraint_name
+     * | RENAME old_table_name TO new_table_name
+     */
+    private ASTNode parseAlterTable(List<Token> parseTokens) {
+        List<Token> tokens = new ArrayList<>();
+        tokens.add(parseTokens.get(0));
+        try{
+            tokens.add(parseTokens.get(1));
+        } catch (IndexOutOfBoundsException e) {
+            e.printStackTrace();
+        }
+        ASTNode root = new AlterNode(tokens);
+        ASTNode currentNode = root;
+        // TODO: implement
+        return root;
+    }
 
 
 }
-- 
Gitee


From c379bd2e856f1101ddbaf2b45922bb7e363b63ab Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Fri, 13 Sep 2024 09:50:51 +0800
Subject: [PATCH 052/113] revise create table document

---
 sqlTranslate/.idea/workspace.xml              | 40 +++++++++----------
 .../java/Document/Column constraint in Oracle | 18 ---------
 .../java/Document/Table constraint in Oracle  | 14 -------
 .../src/main/java/Parser/OracleParser.java    |  2 +-
 4 files changed, 21 insertions(+), 53 deletions(-)
 delete mode 100644 sqlTranslate/src/main/java/Document/Column constraint in Oracle
 delete mode 100644 sqlTranslate/src/main/java/Document/Table constraint in Oracle

diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
index 84a3005a..faadf6cb 100644
--- a/sqlTranslate/.idea/workspace.xml
+++ b/sqlTranslate/.idea/workspace.xml
@@ -4,8 +4,8 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add alter table ast class">
-      <change beforePath="$PROJECT_DIR$/src/main/java/Lexer/OracleLexer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Lexer/OracleLexer.java" afterDir="false" />
+    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add alter table parser">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -103,20 +103,6 @@
       <option name="presentableId" value="Default" />
       <updated>1723106789329</updated>
     </task>
-    <task id="LOCAL-00001" summary="init">
-      <created>1723106890550</created>
-      <option name="number" value="00001" />
-      <option name="presentableId" value="LOCAL-00001" />
-      <option name="project" value="LOCAL" />
-      <updated>1723106890550</updated>
-    </task>
-    <task id="LOCAL-00002" summary="lexer">
-      <created>1723818930161</created>
-      <option name="number" value="00002" />
-      <option name="presentableId" value="LOCAL-00002" />
-      <option name="project" value="LOCAL" />
-      <updated>1723818930161</updated>
-    </task>
     <task id="LOCAL-00003" summary="AST node">
       <created>1723871742424</created>
       <option name="number" value="00003" />
@@ -446,7 +432,21 @@
       <option name="project" value="LOCAL" />
       <updated>1726153977485</updated>
     </task>
-    <option name="localTasksCounter" value="50" />
+    <task id="LOCAL-00050" summary="add alter table keywords">
+      <created>1726154243358</created>
+      <option name="number" value="00050" />
+      <option name="presentableId" value="LOCAL-00050" />
+      <option name="project" value="LOCAL" />
+      <updated>1726154243360</updated>
+    </task>
+    <task id="LOCAL-00051" summary="add alter table parser">
+      <created>1726154479052</created>
+      <option name="number" value="00051" />
+      <option name="presentableId" value="LOCAL-00051" />
+      <option name="project" value="LOCAL" />
+      <updated>1726154479052</updated>
+    </task>
+    <option name="localTasksCounter" value="52" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
@@ -461,8 +461,6 @@
     </option>
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="add functions" />
-    <MESSAGE value="add parser function" />
     <MESSAGE value="add function" />
     <MESSAGE value="coding" />
     <MESSAGE value="finish the framework of sqltranslate (createTab sql is now being supported!)" />
@@ -486,7 +484,9 @@
     <MESSAGE value="add Delete" />
     <MESSAGE value="add alter table grammar document" />
     <MESSAGE value="add alter table ast class" />
-    <option name="LAST_COMMIT_MESSAGE" value="add alter table ast class" />
+    <MESSAGE value="add alter table keywords" />
+    <MESSAGE value="add alter table parser" />
+    <option name="LAST_COMMIT_MESSAGE" value="add alter table parser" />
   </component>
   <component name="XDebuggerManager">
     <watches-manager>
diff --git a/sqlTranslate/src/main/java/Document/Column constraint in Oracle b/sqlTranslate/src/main/java/Document/Column constraint in Oracle
deleted file mode 100644
index 4afc4c07..00000000
--- a/sqlTranslate/src/main/java/Document/Column constraint in Oracle	
+++ /dev/null
@@ -1,18 +0,0 @@
-NOT NULL
-    用于指定某列不允许为空。
-    示例：column_name VARCHAR2(50) NOT NULL
-PRIMARY KEY
-    用于指定某列为表的主键，主键列必须唯一且不能为空。
-    示例：column_name NUMBER(10) PRIMARY KEY
-UNIQUE
-    用于指定某列的值必须是唯一的，但允许为空。
-    示例：column_name VARCHAR2(50) UNIQUE
-CHECK
-    用于指定某列上的值必须满足一个条件。
-    示例：column_name NUMBER CHECK (column_name > 0)
-FOREIGN KEY
-    用于定义外键约束，外键引用另一个表的主键或唯一键。
-    示例：column_name NUMBER(10) REFERENCES other_table(other_column)
-DEFAULT
-    用于指定某列如果没有给定值时的默认值。
-    示例：column_name VARCHAR2(50) DEFAULT 'default_value'
\ No newline at end of file
diff --git a/sqlTranslate/src/main/java/Document/Table constraint in Oracle b/sqlTranslate/src/main/java/Document/Table constraint in Oracle
deleted file mode 100644
index 2b046205..00000000
--- a/sqlTranslate/src/main/java/Document/Table constraint in Oracle	
+++ /dev/null
@@ -1,14 +0,0 @@
-PRIMARY KEY
-    用于定义表的主键，主键列必须唯一且不能为空。
-    可以定义单个列或多个列作为复合主键。
-    示例：CONSTRAINT pk_example PRIMARY KEY (column1, column2)
-UNIQUE
-    用于定义列的唯一性约束，允许为空。
-    可以定义在单个列或多列上。
-    示例：CONSTRAINT uk_example UNIQUE (column1)
-FOREIGN KEY
-    用于定义外键约束，外键引用另一个表的主键或唯一键。
-    示例：CONSTRAINT fk_example FOREIGN KEY (column1) REFERENCES other_table(column2)
-CHECK
-    用于定义整个表的一个或多个列上的约束条件。
-    示例：CONSTRAINT chk_example CHECK (column1 > 0)
\ No newline at end of file
diff --git a/sqlTranslate/src/main/java/Parser/OracleParser.java b/sqlTranslate/src/main/java/Parser/OracleParser.java
index fe7919f4..84e816e1 100644
--- a/sqlTranslate/src/main/java/Parser/OracleParser.java
+++ b/sqlTranslate/src/main/java/Parser/OracleParser.java
@@ -73,7 +73,7 @@ public class OracleParser {
     }
 
     /**
-     * CREATE TEMPORARY? TABLE _table ( _column _type [, _column _type]... ) [CONSTRAINT _constraint] [, _column _type [, _column _type]...]
+     * CREATE TEMPORARY? TABLE _table ( (_column _type column_constraint), (_column _type column_constraint)* table_constraint?)
      */
     private ASTNode parseCreateTab(List<Token> parseTokens) {
         List <Token> tokens = new ArrayList<>();
-- 
Gitee


From 3fc49a296368f120194c8a0f8bfd04d734131567 Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Fri, 13 Sep 2024 09:51:25 +0800
Subject: [PATCH 053/113] revise create table document

---
 .../main/java/Document/CreateTable in Oracle  | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 sqlTranslate/src/main/java/Document/CreateTable in Oracle

diff --git a/sqlTranslate/src/main/java/Document/CreateTable in Oracle b/sqlTranslate/src/main/java/Document/CreateTable in Oracle
new file mode 100644
index 00000000..86114b17
--- /dev/null
+++ b/sqlTranslate/src/main/java/Document/CreateTable in Oracle	
@@ -0,0 +1,21 @@
+CREATE TEMPORARY? TABLE _table ( (_column _type column_constraint), (_column _type column_constraint)* table_constraint?)
+table_constraint: PRIMARY KEY
+                      # Example：CONSTRAINT pk_example PRIMARY KEY (column1, column2)
+                  | UNIQUE
+                      # Example：CONSTRAINT uk_example UNIQUE (column1)
+                  | FOREIGN KEY
+                      # Example：CONSTRAINT fk_example FOREIGN KEY (column1) REFERENCES other_table(column2)
+                  | CHECK
+                      # Example：CONSTRAINT chk_example CHECK (column1 > 0)
+column_constraint: NOT NULL
+                      # Example：column_name VARCHAR2(50) NOT NULL
+                   | PRIMARY KEY
+                      # Example：column_name NUMBER(10) PRIMARY KEY
+                   | UNIQUE
+                      # Example：column_name VARCHAR2(50) UNIQUE
+                   | CHECK
+                      # Example：column_name NUMBER CHECK (column_name > 0)
+                   | FOREIGN KEY
+                      # Example：column_name NUMBER(10) REFERENCES other_table(other_column)
+                   | DEFAULT
+                      # Example：column_name VARCHAR2(50) DEFAULT 'default_value'
\ No newline at end of file
-- 
Gitee


From baf06a4d43832653292d7f5e700c4b5729428230 Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Fri, 13 Sep 2024 11:21:36 +0800
Subject: [PATCH 054/113] revise

---
 sqlTranslate/.idea/workspace.xml              |   6 +-
 .../java/Generator/OpenGaussGenerator.java    |   1 +
 sqlTranslate/src/main/java/Main.java          |   8 +-
 .../AST/AlterTable/AlterAddColumnNode.java    |  43 ++++
 .../src/main/java/Parser/OracleParser.java    | 184 +++++++++++++++++-
 5 files changed, 235 insertions(+), 7 deletions(-)

diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
index faadf6cb..c4c5ab72 100644
--- a/sqlTranslate/.idea/workspace.xml
+++ b/sqlTranslate/.idea/workspace.xml
@@ -4,8 +4,12 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add alter table parser">
+    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="revise create table document">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Generator/OpenGaussGenerator.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Generator/OpenGaussGenerator.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Main.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/AlterTable/AlterAddColumnNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/AlterTable/AlterAddColumnNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java b/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java
index 3d8a08a5..f54da873 100644
--- a/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java
+++ b/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java
@@ -66,6 +66,7 @@ public class OpenGaussGenerator {
     private String GenCreatTableSQL(ASTNode node) {
         // type convert
         visitCrt(node);
+//        System.out.println(node.getASTString());
         return node.toQueryString();
     }
 
diff --git a/sqlTranslate/src/main/java/Main.java b/sqlTranslate/src/main/java/Main.java
index d815f31f..f47f4eb1 100644
--- a/sqlTranslate/src/main/java/Main.java
+++ b/sqlTranslate/src/main/java/Main.java
@@ -9,14 +9,15 @@ public class Main {
     public static void main(String[] args) {
 //        String sql = "CREATE TABLE employees (\n" +
 //                "    employee_id NUMBER PRIMARY KEY,\n" +
-//                "    first_name VARCHAR2(20),\n" +
+//                "    first_name VARCHAR2(20) Check(first_name > '221'),\n" +
 //                "    last_name VARCHAR2(25),\n" +
 //                "    email VARCHAR2(25),\n" +
-//                "    hire_date DATE\n" +
+//                "    hire_date DATE,\n" +
+//                "    CONSTRAINT chk_example CHECK (employee_id > 0)" +
 //                ");";
 //        String sql = "INSERT INTO employees (first_name, last_name, email) VALUES ('Jane', 'Smith', 'janesm@example.com');";
 //        String sql = "DROP TABLE employees CASCADE CONSTRAINTS;";
-        String sql = "SELECT e.first_name, d.department_name FROM employees e JOIN departments d Using e.department_id = d.department_id;";
+//        String sql = "SELECT e.first_name, d.department_name FROM employees e JOIN departments d Using e.department_id = d.department_id;";
 //        String sql = "employees e JOIN departments d ON e.department_id = d.department_id;";
 //        String sql = "UPDATE employees e\n" +
 //                "JOIN departments d using e.department_id = d.department_id\n" +
@@ -29,6 +30,7 @@ public class Main {
 //                "    FROM departments d\n" +
 //                "    WHERE d.department_name = 'Sales'\n" +
 //                ");";
+        String sql = "ALTER TABLE employees ADD email VARCHAR2(100) Check (email != '12813@163.com');";
         OracleLexer lexer = new OracleLexer(sql);
         lexer.printTokens();
         OracleParser parser = new OracleParser(lexer);
diff --git a/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterAddColumnNode.java b/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterAddColumnNode.java
index 01930031..cf2c2e69 100644
--- a/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterAddColumnNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterAddColumnNode.java
@@ -3,9 +3,18 @@ package Parser.AST.AlterTable;
 import Lexer.Token;
 import Parser.AST.ASTNode;
 
+import java.util.ArrayList;
 import java.util.List;
 
 public class AlterAddColumnNode extends ASTNode {
+    private Token name;
+    private Token type;
+    private List<Token> constraint;
+
+    public AlterAddColumnNode() {
+        super();
+    }
+
     public AlterAddColumnNode(ASTNode node)
     {
         super(node);
@@ -23,4 +32,38 @@ public class AlterAddColumnNode extends ASTNode {
 
             child.visit(child, queryString);
     }
+
+    public Token getName() {
+        return name;
+    }
+
+    public void setName(Token name) {
+        this.name = name;
+    }
+
+    public Token getType() {
+        return type;
+    }
+
+    public void setType(Token type) {
+        this.type = type;
+    }
+
+    public List<Token> getConstraint() {
+        return constraint;
+    }
+
+    public void setConstraint(List<Token> constraint) {
+        this.constraint = constraint;
+    }
+
+    public void ResetTokensbyNameTypeConstraint() {
+        List <Token> tokens = new ArrayList<>();
+        tokens.add(name);
+        tokens.add(type);
+        for (Token token : constraint) {
+            tokens.add(token);
+        }
+        setTokens(tokens);
+    }
 }
diff --git a/sqlTranslate/src/main/java/Parser/OracleParser.java b/sqlTranslate/src/main/java/Parser/OracleParser.java
index 84e816e1..109cbb58 100644
--- a/sqlTranslate/src/main/java/Parser/OracleParser.java
+++ b/sqlTranslate/src/main/java/Parser/OracleParser.java
@@ -4,7 +4,10 @@ import Lexer.OracleLexer;
 import Lexer.Token;
 import Parser.AST.ASTNode;
 import Exception.ParseFailedException;
+import Parser.AST.AlterTable.AlterAddColumnNode;
+import Parser.AST.AlterTable.AlterEndNode;
 import Parser.AST.AlterTable.AlterNode;
+import Parser.AST.AlterTable.AlterObjNode;
 import Parser.AST.CaseWhen.CaseConditionNode;
 import Parser.AST.CaseWhen.CaseElseNode;
 import Parser.AST.CaseWhen.CaseEndNode;
@@ -140,6 +143,7 @@ public class OracleParser {
                             (parseTokens.get(j).getValue().equalsIgnoreCase("REFERENCES")
                                     || parseTokens.get(j).getValue().equalsIgnoreCase("CHECK"))) {
                         tokens.add(parseTokens.get(j));
+                        constraint.add(parseTokens.get(j));
                         Stack<String> stack = new Stack<>();
                         for (int k = j + 1; k < parseTokens.size(); k++) {
                             tokens.add(parseTokens.get(k));
@@ -230,7 +234,9 @@ public class OracleParser {
                     }
                     tokens.add(parseTokens.get(j));
                 }
-
+                ASTNode childNode = new TableConstraintNode(tokens);
+                currentNode.addChild(childNode);
+                currentNode = childNode;
             }
             else if (parseTokens.get(i).hasType(Token.TokenType.SYMBOL) && parseTokens.get(i).getValue().equals(";")) {
                 tokens = new ArrayList<>();
@@ -239,13 +245,16 @@ public class OracleParser {
                 currentNode.addChild(EndNode);
                 currentNode = EndNode;
             }
+            else if (parseTokens.get(i).hasType(Token.TokenType.SYMBOL) && parseTokens.get(i).getValue().equals(",")) {
+                continue;
+            }
             else if (parseTokens.get(i).hasType(Token.TokenType.EOF)) {
                 break;
             }
             else {
 //                System.out.println("Fail to parse:" + parseTokens.get(i).getValue());
                 try {
-                    throw new ParseFailedException("Parse failed!");
+                    throw new ParseFailedException("Parse failed!--" + parseTokens.get(i));
                 }
                 catch (ParseFailedException e) {
                     e.printStackTrace();
@@ -923,7 +932,176 @@ public class OracleParser {
         }
         ASTNode root = new AlterNode(tokens);
         ASTNode currentNode = root;
-        // TODO: implement
+        for (int i = 2; i < parseTokens.size(); i++) {
+            // match table
+            if (i == 2 && parseTokens.get(i).hasType(Token.TokenType.IDENTIFIER)) {
+                tokens = new ArrayList<>();
+                for (int j = i; j < parseTokens.size(); j++) {
+                    if (
+                            (parseTokens.get(j).hasType(Token.TokenType.KEYWORD) && parseTokens.get(j).getValue().equalsIgnoreCase("ADD"))
+                            || (parseTokens.get(j).hasType(Token.TokenType.KEYWORD) && parseTokens.get(j).getValue().equalsIgnoreCase("DROP"))
+                            || (parseTokens.get(j).hasType(Token.TokenType.KEYWORD) && parseTokens.get(j).getValue().equalsIgnoreCase("MODIFY"))
+                            || (parseTokens.get(j).hasType(Token.TokenType.KEYWORD) && parseTokens.get(j).getValue().equalsIgnoreCase("RENAME"))
+                    ) {
+                        i = j - 1;
+                        break;
+                    }
+                    tokens.add(parseTokens.get(j));
+                }
+                ASTNode childNode = new AlterObjNode(tokens);
+                currentNode.addChild(childNode);
+                currentNode = childNode;
+            }
+            else if (parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("ADD")) {
+                // add column
+                if (i + 1 < parseTokens.size() && parseTokens.get(i + 1).hasType(Token.TokenType.IDENTIFIER)) {
+                    i++;
+                    tokens = new ArrayList<>();
+                    boolean state = false;
+                    AlterAddColumnNode child = new AlterAddColumnNode();
+                    child.setName(parseTokens.get(i));
+                    tokens.add(parseTokens.get(i));
+                    List <Token> constraint = new ArrayList<>();
+                    for (int j = i + 1; j < parseTokens.size(); j++) {
+                        state = false;
+                        if (j == i + 1) {
+                            child.setType(parseTokens.get(j));
+                        }
+                        // Check () or REFERENCES other_table(other_column)
+                        if (parseTokens.get(j).hasType(Token.TokenType.KEYWORD) &&
+                                (parseTokens.get(j).getValue().equalsIgnoreCase("REFERENCES")
+                                        || parseTokens.get(j).getValue().equalsIgnoreCase("CHECK"))) {
+                            tokens.add(parseTokens.get(j));
+                            Stack<String> stack = new Stack<>();
+                            for (int k = j + 1; k < parseTokens.size(); k++) {
+                                tokens.add(parseTokens.get(k));
+                                constraint.add(parseTokens.get(k));
+                                if (parseTokens.get(k).getValue().equals("(")) {
+                                    stack.push("(");
+                                    for (int t = k + 1; t < parseTokens.size(); t++) {
+                                        tokens.add(parseTokens.get(t));
+                                        constraint.add(parseTokens.get(t));
+                                        if (parseTokens.get(t).getValue().equals("(")) {
+                                            stack.push("(");
+                                        }
+                                        else if (parseTokens.get(t).getValue().equals(")")) {
+                                            stack.pop();
+                                            if (stack.empty()) {
+                                                j = t;
+                                                state = true;
+                                                break;
+                                            }
+                                        }
+                                    }
+                                    break;
+                                }
+                            }
+                        }
+                        if ((parseTokens.get(j).hasType(Token.TokenType.SYMBOL) && parseTokens.get(j).getValue().equals(";")) ) {
+                            i = j - 1;
+                            break;
+                        }
+                        if (!state)
+                            tokens.add(parseTokens.get(j));
+                        if (j != i + 1) {
+                            constraint.add(parseTokens.get(j));
+                        }
+                    }
+                    child.setTokens(tokens);
+                    child.setConstraint(constraint);
+                    currentNode.addChild(child);
+                    currentNode = child;
+                }
+                // add constraint
+                else if (i + 1 < parseTokens.size() && parseTokens.get(i + 1).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i + 1).getValue().equalsIgnoreCase("CONSTRAINT")) {
+                    i++;
+                    tokens = new ArrayList<>();
+                    tokens.add(parseTokens.get(i));
+                    for (int j = i + 1; j < parseTokens.size(); j++) {
+                        /**
+                         * CONSTRAINT pk_example PRIMARY KEY (column1, column2)
+                         * CONSTRAINT uk_example UNIQUE (column1)
+                         * CONSTRAINT fk_example FOREIGN KEY (column1) REFERENCES other_table(column2)
+                         * CONSTRAINT chk_example CHECK (column1 > 0)
+                         */
+                        if (parseTokens.get(j).hasType(Token.TokenType.KEYWORD) &&
+                                (parseTokens.get(j).getValue().equalsIgnoreCase("UNIQUE")
+                                        || parseTokens.get(j).getValue().equalsIgnoreCase("CHECK")
+                                        || parseTokens.get(j).getValue().equalsIgnoreCase("PRIMARY KEY")
+                                        || parseTokens.get(j).getValue().equalsIgnoreCase("FOREIGN KEY")
+                                        || parseTokens.get(j).getValue().equalsIgnoreCase("REFERENCES"))) {
+                            tokens.add(parseTokens.get(j));
+                            Stack<String> stack = new Stack<>();
+                            for (int k = j + 1; k < parseTokens.size(); k++) {
+                                tokens.add(parseTokens.get(k));
+                                if (parseTokens.get(k).getValue().equals("(")) {
+                                    stack.push("(");
+                                    for (int t = k + 1; t < parseTokens.size(); t++) {
+                                        tokens.add(parseTokens.get(t));
+                                        if (parseTokens.get(t).getValue().equals("(")) {
+                                            stack.push("(");
+                                        }
+                                        else if (parseTokens.get(t).getValue().equals(")")) {
+                                            stack.pop();
+                                            if (stack.empty()) {
+                                                i = t;
+                                                j = t;
+                                                break;
+                                            }
+                                        }
+                                    }
+                                    break;
+                                }
+                            }
+                            continue;
+                        }
+                        if ((parseTokens.get(j).hasType(Token.TokenType.SYMBOL) && parseTokens.get(j).getValue().equals(",")) ||
+                                (parseTokens.get(j).hasType(Token.TokenType.SYMBOL) && parseTokens.get(j).getValue().equals(")")) ) {
+                            i = j;
+                            break;
+                        }
+                        tokens.add(parseTokens.get(j));
+                    }
+                }
+                // error sql
+                else {
+                    try {
+                        throw new ParseFailedException("Parse failed:There exists syntex error in the input sql!");
+                    }
+                    catch (ParseFailedException e) {
+                        e.printStackTrace();
+                    }
+                }
+
+            }
+            else if (parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("DROP")) {
+
+            }
+            else if (parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("MODIFY")) {
+
+            }
+            else if (parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("RENAME")) {
+
+            }
+            else if (parseTokens.get(i).hasType(Token.TokenType.SYMBOL) && parseTokens.get(i).getValue().equals(";")) {
+                tokens = new ArrayList<>();
+                tokens.add(parseTokens.get(i));
+                ASTNode childNode = new AlterEndNode(tokens);
+                currentNode.addChild(childNode);
+                currentNode = childNode;
+            }
+            else if (parseTokens.get(i).hasType(Token.TokenType.EOF)) {
+                break;
+            }
+            else {
+                try {
+                    throw new ParseFailedException("Parse failed:" + parseTokens.get(i));
+                }
+                catch (ParseFailedException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
         return root;
     }
 
-- 
Gitee


From aa5c0f2343bc059fe928eb124b963ab641a8a628 Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Fri, 13 Sep 2024 11:27:32 +0800
Subject: [PATCH 055/113] revise

---
 sqlTranslate/.idea/workspace.xml              | 24 +++++++++----------
 sqlTranslate/src/main/java/Main.java          |  1 +
 .../src/main/java/Parser/OracleParser.java    | 19 ++++++++-------
 3 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
index c4c5ab72..ce358510 100644
--- a/sqlTranslate/.idea/workspace.xml
+++ b/sqlTranslate/.idea/workspace.xml
@@ -4,11 +4,9 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="revise create table document">
+    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="revise">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Generator/OpenGaussGenerator.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Generator/OpenGaussGenerator.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Main.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/AlterTable/AlterAddColumnNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/AlterTable/AlterAddColumnNode.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -107,13 +105,6 @@
       <option name="presentableId" value="Default" />
       <updated>1723106789329</updated>
     </task>
-    <task id="LOCAL-00003" summary="AST node">
-      <created>1723871742424</created>
-      <option name="number" value="00003" />
-      <option name="presentableId" value="LOCAL-00003" />
-      <option name="project" value="LOCAL" />
-      <updated>1723871742424</updated>
-    </task>
     <task id="LOCAL-00004" summary="add AST node">
       <created>1723992163694</created>
       <option name="number" value="00004" />
@@ -450,7 +441,14 @@
       <option name="project" value="LOCAL" />
       <updated>1726154479052</updated>
     </task>
-    <option name="localTasksCounter" value="52" />
+    <task id="LOCAL-00052" summary="revise">
+      <created>1726197698087</created>
+      <option name="number" value="00052" />
+      <option name="presentableId" value="LOCAL-00052" />
+      <option name="project" value="LOCAL" />
+      <updated>1726197698087</updated>
+    </task>
+    <option name="localTasksCounter" value="53" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
@@ -475,7 +473,6 @@
     <MESSAGE value="add pattern of functions in select" />
     <MESSAGE value="add some comments" />
     <MESSAGE value="add parseSelect" />
-    <MESSAGE value="revise" />
     <MESSAGE value="add join pattern" />
     <MESSAGE value="add join class" />
     <MESSAGE value="add join" />
@@ -490,7 +487,8 @@
     <MESSAGE value="add alter table ast class" />
     <MESSAGE value="add alter table keywords" />
     <MESSAGE value="add alter table parser" />
-    <option name="LAST_COMMIT_MESSAGE" value="add alter table parser" />
+    <MESSAGE value="revise" />
+    <option name="LAST_COMMIT_MESSAGE" value="revise" />
   </component>
   <component name="XDebuggerManager">
     <watches-manager>
diff --git a/sqlTranslate/src/main/java/Main.java b/sqlTranslate/src/main/java/Main.java
index f47f4eb1..3c26a502 100644
--- a/sqlTranslate/src/main/java/Main.java
+++ b/sqlTranslate/src/main/java/Main.java
@@ -31,6 +31,7 @@ public class Main {
 //                "    WHERE d.department_name = 'Sales'\n" +
 //                ");";
         String sql = "ALTER TABLE employees ADD email VARCHAR2(100) Check (email != '12813@163.com');";
+//        String sql = "ALTER TABLE employees ADD CONSTRAINT emp_pk PRIMARY KEY (employee_id);";
         OracleLexer lexer = new OracleLexer(sql);
         lexer.printTokens();
         OracleParser parser = new OracleParser(lexer);
diff --git a/sqlTranslate/src/main/java/Parser/OracleParser.java b/sqlTranslate/src/main/java/Parser/OracleParser.java
index 109cbb58..a63b2ec8 100644
--- a/sqlTranslate/src/main/java/Parser/OracleParser.java
+++ b/sqlTranslate/src/main/java/Parser/OracleParser.java
@@ -4,10 +4,7 @@ import Lexer.OracleLexer;
 import Lexer.Token;
 import Parser.AST.ASTNode;
 import Exception.ParseFailedException;
-import Parser.AST.AlterTable.AlterAddColumnNode;
-import Parser.AST.AlterTable.AlterEndNode;
-import Parser.AST.AlterTable.AlterNode;
-import Parser.AST.AlterTable.AlterObjNode;
+import Parser.AST.AlterTable.*;
 import Parser.AST.CaseWhen.CaseConditionNode;
 import Parser.AST.CaseWhen.CaseElseNode;
 import Parser.AST.CaseWhen.CaseEndNode;
@@ -955,8 +952,9 @@ public class OracleParser {
             else if (parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("ADD")) {
                 // add column
                 if (i + 1 < parseTokens.size() && parseTokens.get(i + 1).hasType(Token.TokenType.IDENTIFIER)) {
-                    i++;
                     tokens = new ArrayList<>();
+                    tokens.add(parseTokens.get(i));
+                    i++;
                     boolean state = false;
                     AlterAddColumnNode child = new AlterAddColumnNode();
                     child.setName(parseTokens.get(i));
@@ -1014,9 +1012,10 @@ public class OracleParser {
                 }
                 // add constraint
                 else if (i + 1 < parseTokens.size() && parseTokens.get(i + 1).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i + 1).getValue().equalsIgnoreCase("CONSTRAINT")) {
-                    i++;
                     tokens = new ArrayList<>();
                     tokens.add(parseTokens.get(i));
+                    i++;
+                    tokens.add(parseTokens.get(i));
                     for (int j = i + 1; j < parseTokens.size(); j++) {
                         /**
                          * CONSTRAINT pk_example PRIMARY KEY (column1, column2)
@@ -1055,13 +1054,15 @@ public class OracleParser {
                             }
                             continue;
                         }
-                        if ((parseTokens.get(j).hasType(Token.TokenType.SYMBOL) && parseTokens.get(j).getValue().equals(",")) ||
-                                (parseTokens.get(j).hasType(Token.TokenType.SYMBOL) && parseTokens.get(j).getValue().equals(")")) ) {
-                            i = j;
+                        if ((parseTokens.get(j).hasType(Token.TokenType.SYMBOL) && parseTokens.get(j).getValue().equals(";"))) {
+                            i = j - 1;
                             break;
                         }
                         tokens.add(parseTokens.get(j));
                     }
+                    ASTNode childNode = new AlterAddConstraintNode(tokens);
+                    currentNode.addChild(childNode);
+                    currentNode = childNode;
                 }
                 // error sql
                 else {
-- 
Gitee


From 3254457fb00e4b7b78e3a33601784542499ffdf2 Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Fri, 13 Sep 2024 14:37:09 +0800
Subject: [PATCH 056/113] revise

---
 sqlTranslate/.idea/workspace.xml              | 17 +++----
 .../AST/AlterTable/AlterAddColumnNode.java    |  4 +-
 .../AlterTable/AlterAddConstraintNode.java    |  4 +-
 .../AST/AlterTable/AlterDropColumnNode.java   |  4 +-
 .../AlterTable/AlterDropConstraintNode.java   |  4 +-
 .../AST/AlterTable/AlterModifyColumnNode.java | 27 +++++++++-
 .../java/Parser/AST/AlterTable/AlterNode.java |  4 +-
 .../Parser/AST/AlterTable/AlterObjNode.java   |  4 +-
 .../AST/AlterTable/AlterRenameColumnNode.java |  4 +-
 .../AST/AlterTable/AlterRenameTableNode.java  |  4 +-
 .../src/main/java/Parser/OracleParser.java    | 50 ++++++++++++++++++-
 11 files changed, 97 insertions(+), 29 deletions(-)

diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
index ce358510..1e1f96ce 100644
--- a/sqlTranslate/.idea/workspace.xml
+++ b/sqlTranslate/.idea/workspace.xml
@@ -6,7 +6,6 @@
   <component name="ChangeListManager">
     <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="revise">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Main.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -105,13 +104,6 @@
       <option name="presentableId" value="Default" />
       <updated>1723106789329</updated>
     </task>
-    <task id="LOCAL-00004" summary="add AST node">
-      <created>1723992163694</created>
-      <option name="number" value="00004" />
-      <option name="presentableId" value="LOCAL-00004" />
-      <option name="project" value="LOCAL" />
-      <updated>1723992163694</updated>
-    </task>
     <task id="LOCAL-00005" summary="add functions">
       <created>1724145125754</created>
       <option name="number" value="00005" />
@@ -448,7 +440,14 @@
       <option name="project" value="LOCAL" />
       <updated>1726197698087</updated>
     </task>
-    <option name="localTasksCounter" value="53" />
+    <task id="LOCAL-00053" summary="revise">
+      <created>1726198053495</created>
+      <option name="number" value="00053" />
+      <option name="presentableId" value="LOCAL-00053" />
+      <option name="project" value="LOCAL" />
+      <updated>1726198053495</updated>
+    </task>
+    <option name="localTasksCounter" value="54" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
diff --git a/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterAddColumnNode.java b/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterAddColumnNode.java
index cf2c2e69..0451f258 100644
--- a/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterAddColumnNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterAddColumnNode.java
@@ -28,9 +28,9 @@ public class AlterAddColumnNode extends ASTNode {
     @Override
     public void visit(ASTNode node, StringBuilder queryString) {
         queryString.append(toString() + " ");
-        for (ASTNode child : getChildren())
-
+        for (ASTNode child : getChildren()) {
             child.visit(child, queryString);
+        }
     }
 
     public Token getName() {
diff --git a/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterAddConstraintNode.java b/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterAddConstraintNode.java
index e070e570..bb4adf9d 100644
--- a/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterAddConstraintNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterAddConstraintNode.java
@@ -17,8 +17,8 @@ public class AlterAddConstraintNode extends ASTNode {
     @Override
     public void visit(ASTNode node, StringBuilder queryString) {
         queryString.append(toString() + " ");
-        for (ASTNode child : getChildren())
-
+        for (ASTNode child : getChildren()) {
             child.visit(child, queryString);
+        }
     }
 }
diff --git a/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterDropColumnNode.java b/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterDropColumnNode.java
index 120116cf..712ebcc1 100644
--- a/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterDropColumnNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterDropColumnNode.java
@@ -18,8 +18,8 @@ public class AlterDropColumnNode extends ASTNode {
     @Override
     public void visit(ASTNode node, StringBuilder queryString) {
         queryString.append(toString() + " ");
-        for (ASTNode child : getChildren())
-
+        for (ASTNode child : getChildren()) {
             child.visit(child, queryString);
+        }
     }
 }
diff --git a/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterDropConstraintNode.java b/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterDropConstraintNode.java
index b32ad2a6..88cdffce 100644
--- a/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterDropConstraintNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterDropConstraintNode.java
@@ -17,8 +17,8 @@ public class AlterDropConstraintNode extends ASTNode {
     @Override
     public void visit(ASTNode node, StringBuilder queryString) {
         queryString.append(toString() + " ");
-        for (ASTNode child : getChildren())
-
+        for (ASTNode child : getChildren()) {
             child.visit(child, queryString);
+        }
     }
 }
diff --git a/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterModifyColumnNode.java b/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterModifyColumnNode.java
index 49a7d0f4..62ff0fba 100644
--- a/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterModifyColumnNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterModifyColumnNode.java
@@ -6,6 +6,13 @@ import Parser.AST.ASTNode;
 import java.util.List;
 
 public class AlterModifyColumnNode extends ASTNode {
+    private Token columnName;
+    private Token columnType;
+
+    public AlterModifyColumnNode() {
+        super();
+    }
+
     public AlterModifyColumnNode(ASTNode node) {
         super(node);
     }
@@ -14,11 +21,27 @@ public class AlterModifyColumnNode extends ASTNode {
         super(tokens);
     }
 
+    public void setColumnType(Token columnType) {
+        this.columnType = columnType;
+    }
+
+    public Token getColumnType() {
+        return columnType;
+    }
+
+    public void setColumnName(Token columnName) {
+        this.columnName = columnName;
+    }
+
+    public Token getColumnName() {
+        return columnName;
+    }
+
     @Override
     public void visit(ASTNode node, StringBuilder queryString) {
         queryString.append(toString() + " ");
-        for (ASTNode child : getChildren())
-
+        for (ASTNode child : getChildren()) {
             child.visit(child, queryString);
+        }
     }
 }
diff --git a/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterNode.java b/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterNode.java
index 23c795a9..1a770407 100644
--- a/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterNode.java
@@ -17,8 +17,8 @@ public class AlterNode extends ASTNode {
     @Override
     public void visit(ASTNode node, StringBuilder queryString) {
         queryString.append(toString() + " ");
-        for (ASTNode child : getChildren())
-
+        for (ASTNode child : getChildren()) {
             child.visit(child, queryString);
+        }
     }
 }
diff --git a/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterObjNode.java b/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterObjNode.java
index c1a06a72..5149a0b0 100644
--- a/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterObjNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterObjNode.java
@@ -17,8 +17,8 @@ public class AlterObjNode extends ASTNode {
     @Override
     public void visit(ASTNode node, StringBuilder queryString) {
         queryString.append(toString() + " ");
-        for (ASTNode child : getChildren())
-
+        for (ASTNode child : getChildren()) {
             child.visit(child, queryString);
+        }
     }
 }
diff --git a/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterRenameColumnNode.java b/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterRenameColumnNode.java
index 8295026a..32a11f4c 100644
--- a/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterRenameColumnNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterRenameColumnNode.java
@@ -17,8 +17,8 @@ public class AlterRenameColumnNode extends ASTNode {
     @Override
     public void visit(ASTNode node, StringBuilder queryString) {
         queryString.append(toString() + " ");
-        for (ASTNode child : getChildren())
-
+        for (ASTNode child : getChildren()) {
             child.visit(child, queryString);
+        }
     }
 }
diff --git a/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterRenameTableNode.java b/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterRenameTableNode.java
index 049fed27..85a5c652 100644
--- a/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterRenameTableNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterRenameTableNode.java
@@ -17,8 +17,8 @@ public class AlterRenameTableNode extends ASTNode {
     @Override
     public void visit(ASTNode node, StringBuilder queryString) {
         queryString.append(toString() + " ");
-        for (ASTNode child : getChildren())
-
+        for (ASTNode child : getChildren()) {
             child.visit(child, queryString);
+        }
     }
 }
diff --git a/sqlTranslate/src/main/java/Parser/OracleParser.java b/sqlTranslate/src/main/java/Parser/OracleParser.java
index a63b2ec8..411743f1 100644
--- a/sqlTranslate/src/main/java/Parser/OracleParser.java
+++ b/sqlTranslate/src/main/java/Parser/OracleParser.java
@@ -1076,10 +1076,56 @@ public class OracleParser {
 
             }
             else if (parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("DROP")) {
-
+                if (i + 1 < parseTokens.size() && parseTokens.get(i + 1).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i + 1).getValue().equalsIgnoreCase("COLUMN")) {
+                    tokens = new ArrayList<>();
+                    tokens.add(parseTokens.get(i));
+                    for (int j = i + 1; j < parseTokens.size(); j++) {
+                        if (parseTokens.get(j).hasType(Token.TokenType.SYMBOL) && parseTokens.get(j).getValue().equalsIgnoreCase(";")) {
+                            i = j - 1;
+                            break;
+                        }
+                        tokens.add(parseTokens.get(j));
+                    }
+                    ASTNode childNode = new AlterDropColumnNode(tokens);
+                    currentNode.addChild(childNode);
+                    currentNode = childNode;
+                }
+                else if (i + 1 < parseTokens.size() && parseTokens.get(i + 1).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i + 1).getValue().equalsIgnoreCase("CONSTRAINT")) {
+                    tokens = new ArrayList<>();
+                    tokens.add(parseTokens.get(i));
+                    for (int j = i + 1; j < parseTokens.size(); j++) {
+                        if (parseTokens.get(j).hasType(Token.TokenType.SYMBOL) && parseTokens.get(j).getValue().equalsIgnoreCase(";")) {
+                            i = j - 1;
+                            break;
+                        }
+                        tokens.add(parseTokens.get(j));
+                    }
+                    ASTNode childNode = new AlterDropConstraintNode(tokens);
+                    currentNode.addChild(childNode);
+                    currentNode = childNode;
+                }
+                else {
+                    try {
+                        throw new ParseFailedException("Parse failed:There exists syntex error in the input sql!");
+                    }
+                    catch (ParseFailedException e) {
+                        e.printStackTrace();
+                    }
+                }
             }
             else if (parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("MODIFY")) {
-
+                tokens = new ArrayList<>();
+                tokens.add(parseTokens.get(i));
+                for (int j = i + 1; j < parseTokens.size(); j++) {
+                    if (parseTokens.get(j).hasType(Token.TokenType.SYMBOL) && parseTokens.get(j).getValue().equalsIgnoreCase(";")) {
+                        i = j - 1;
+                        break;
+                    }
+                    tokens.add(parseTokens.get(j));
+                }
+                ASTNode childNode = new AlterModifyColumnNode(tokens);
+                currentNode.addChild(childNode);
+                currentNode = childNode;
             }
             else if (parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("RENAME")) {
 
-- 
Gitee


From d1a2e1647a6da05fb52741bdecc361c9feb08b39 Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Fri, 13 Sep 2024 14:51:19 +0800
Subject: [PATCH 057/113] add alter

---
 sqlTranslate/.idea/workspace.xml              | 17 +++---
 .../AST/AlterTable/AlterModifyColumnNode.java | 10 ++++
 .../src/main/java/Parser/OracleParser.java    | 55 ++++++++++++++++++-
 3 files changed, 72 insertions(+), 10 deletions(-)

diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
index 1e1f96ce..76fb709c 100644
--- a/sqlTranslate/.idea/workspace.xml
+++ b/sqlTranslate/.idea/workspace.xml
@@ -6,6 +6,7 @@
   <component name="ChangeListManager">
     <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="revise">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/AlterTable/AlterModifyColumnNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/AlterTable/AlterModifyColumnNode.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -104,13 +105,6 @@
       <option name="presentableId" value="Default" />
       <updated>1723106789329</updated>
     </task>
-    <task id="LOCAL-00005" summary="add functions">
-      <created>1724145125754</created>
-      <option name="number" value="00005" />
-      <option name="presentableId" value="LOCAL-00005" />
-      <option name="project" value="LOCAL" />
-      <updated>1724145125754</updated>
-    </task>
     <task id="LOCAL-00006" summary="revise">
       <created>1724164698153</created>
       <option name="number" value="00006" />
@@ -447,7 +441,14 @@
       <option name="project" value="LOCAL" />
       <updated>1726198053495</updated>
     </task>
-    <option name="localTasksCounter" value="54" />
+    <task id="LOCAL-00054" summary="revise">
+      <created>1726209430618</created>
+      <option name="number" value="00054" />
+      <option name="presentableId" value="LOCAL-00054" />
+      <option name="project" value="LOCAL" />
+      <updated>1726209430619</updated>
+    </task>
+    <option name="localTasksCounter" value="55" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
diff --git a/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterModifyColumnNode.java b/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterModifyColumnNode.java
index 62ff0fba..14a70e03 100644
--- a/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterModifyColumnNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterModifyColumnNode.java
@@ -3,6 +3,7 @@ package Parser.AST.AlterTable;
 import Lexer.Token;
 import Parser.AST.ASTNode;
 
+import java.util.ArrayList;
 import java.util.List;
 
 public class AlterModifyColumnNode extends ASTNode {
@@ -44,4 +45,13 @@ public class AlterModifyColumnNode extends ASTNode {
             child.visit(child, queryString);
         }
     }
+
+    public void ResetTokensbyNameTypeConstraint() {
+        List <Token> tokens = new ArrayList<>();
+        tokens.add(new Token(Token.TokenType.KEYWORD, "MODIFY"));
+        tokens.add(columnName);
+        tokens.add(columnType);
+        tokens.add(new Token(Token.TokenType.SYMBOL, ";"));
+        setTokens(tokens);
+    }
 }
diff --git a/sqlTranslate/src/main/java/Parser/OracleParser.java b/sqlTranslate/src/main/java/Parser/OracleParser.java
index 411743f1..fd0e360b 100644
--- a/sqlTranslate/src/main/java/Parser/OracleParser.java
+++ b/sqlTranslate/src/main/java/Parser/OracleParser.java
@@ -1116,19 +1116,70 @@ public class OracleParser {
             else if (parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("MODIFY")) {
                 tokens = new ArrayList<>();
                 tokens.add(parseTokens.get(i));
+                AlterModifyColumnNode childNode = new AlterModifyColumnNode();
                 for (int j = i + 1; j < parseTokens.size(); j++) {
+                    if (j == i + 1) {
+                        childNode.setColumnName(parseTokens.get(j));
+                    }
+                    if (j == i + 2) {
+                        childNode.setColumnType(parseTokens.get(j));
+                    }
+                    if (j > i + 3) {
+                        try {
+                            throw new ParseFailedException("Parse failed:There exists syntex error in the input sql!");
+                        }
+                        catch (ParseFailedException e) {
+                            e.printStackTrace();
+                        }
+                        break;
+                    }
                     if (parseTokens.get(j).hasType(Token.TokenType.SYMBOL) && parseTokens.get(j).getValue().equalsIgnoreCase(";")) {
                         i = j - 1;
                         break;
                     }
                     tokens.add(parseTokens.get(j));
                 }
-                ASTNode childNode = new AlterModifyColumnNode(tokens);
+                childNode.setTokens(tokens);
                 currentNode.addChild(childNode);
                 currentNode = childNode;
             }
             else if (parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("RENAME")) {
-
+                if (i + 1 < parseTokens.size() && parseTokens.get(i + 1).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i + 1).getValue().equalsIgnoreCase("COLUMN")) {
+                    tokens = new ArrayList<>();
+                    tokens.add(parseTokens.get(i));
+                    for (int j = i + 1; j < parseTokens.size(); j++) {
+                        if (parseTokens.get(j).hasType(Token.TokenType.SYMBOL) && parseTokens.get(j).getValue().equalsIgnoreCase(";")) {
+                            i = j - 1;
+                            break;
+                        }
+                        tokens.add(parseTokens.get(j));
+                    }
+                    ASTNode childNode = new AlterRenameColumnNode(tokens);
+                    currentNode.addChild(childNode);
+                    currentNode = childNode;
+                }
+                else if (i + 1 < parseTokens.size() && parseTokens.get(i + 1).hasType(Token.TokenType.IDENTIFIER)) {
+                    tokens = new ArrayList<>();
+                    tokens.add(parseTokens.get(i));
+                    for (int j = i + 1; j < parseTokens.size(); j++) {
+                        if (parseTokens.get(j).hasType(Token.TokenType.SYMBOL) && parseTokens.get(j).getValue().equalsIgnoreCase(";")) {
+                            i = j - 1;
+                            break;
+                        }
+                        tokens.add(parseTokens.get(j));
+                    }
+                    ASTNode childNode = new AlterRenameTableNode(tokens);
+                    currentNode.addChild(childNode);
+                    currentNode = childNode;
+                }
+                else {
+                    try {
+                        throw new ParseFailedException("Parse failed:There exists syntex error in the input sql!");
+                    }
+                    catch (ParseFailedException e) {
+                        e.printStackTrace();
+                    }
+                }
             }
             else if (parseTokens.get(i).hasType(Token.TokenType.SYMBOL) && parseTokens.get(i).getValue().equals(";")) {
                 tokens = new ArrayList<>();
-- 
Gitee


From 744b27767541b60af89a1726b8d66ad82c0884e4 Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Fri, 13 Sep 2024 15:35:12 +0800
Subject: [PATCH 058/113] add alter

---
 sqlTranslate/.idea/workspace.xml              | 31 ++++++++++++-------
 .../main/java/Document/Alter table in Oracle  | 13 +++++++-
 .../java/Generator/OpenGaussGenerator.java    | 27 +++++++++++++++-
 .../src/main/java/Interface/ColumnType.java   |  9 ++++++
 .../src/main/java/Lexer/OracleLexer.java      |  2 +-
 sqlTranslate/src/main/java/Main.java          | 19 ++++++------
 .../AST/AlterTable/AlterAddColumnNode.java    |  7 ++++-
 .../AST/AlterTable/AlterModifyColumnNode.java | 31 ++++++++++---------
 .../Parser/AST/CreateTable/ColumnNode.java    |  6 +++-
 .../src/main/java/Parser/OracleParser.java    |  9 +++---
 10 files changed, 109 insertions(+), 45 deletions(-)
 create mode 100644 sqlTranslate/src/main/java/Interface/ColumnType.java

diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
index 76fb709c..5750f808 100644
--- a/sqlTranslate/.idea/workspace.xml
+++ b/sqlTranslate/.idea/workspace.xml
@@ -4,9 +4,16 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="revise">
+    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add alter">
+      <change afterPath="$PROJECT_DIR$/src/main/java/Interface/ColumnType.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Document/Alter table in Oracle" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Document/Alter table in Oracle" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Generator/OpenGaussGenerator.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Generator/OpenGaussGenerator.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Lexer/OracleLexer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Lexer/OracleLexer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Main.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/AlterTable/AlterAddColumnNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/AlterTable/AlterAddColumnNode.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/AlterTable/AlterModifyColumnNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/AlterTable/AlterModifyColumnNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/CreateTable/ColumnNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/CreateTable/ColumnNode.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -17,8 +24,8 @@
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
       <list>
-        <option value="Interface" />
         <option value="Class" />
+        <option value="Interface" />
       </list>
     </option>
   </component>
@@ -105,13 +112,6 @@
       <option name="presentableId" value="Default" />
       <updated>1723106789329</updated>
     </task>
-    <task id="LOCAL-00006" summary="revise">
-      <created>1724164698153</created>
-      <option name="number" value="00006" />
-      <option name="presentableId" value="LOCAL-00006" />
-      <option name="project" value="LOCAL" />
-      <updated>1724164698153</updated>
-    </task>
     <task id="LOCAL-00007" summary="revise">
       <created>1724165008682</created>
       <option name="number" value="00007" />
@@ -448,7 +448,14 @@
       <option name="project" value="LOCAL" />
       <updated>1726209430619</updated>
     </task>
-    <option name="localTasksCounter" value="55" />
+    <task id="LOCAL-00055" summary="add alter">
+      <created>1726210280295</created>
+      <option name="number" value="00055" />
+      <option name="presentableId" value="LOCAL-00055" />
+      <option name="project" value="LOCAL" />
+      <updated>1726210280296</updated>
+    </task>
+    <option name="localTasksCounter" value="56" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
@@ -463,7 +470,6 @@
     </option>
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="add function" />
     <MESSAGE value="coding" />
     <MESSAGE value="finish the framework of sqltranslate (createTab sql is now being supported!)" />
     <MESSAGE value="add insert sql" />
@@ -488,7 +494,8 @@
     <MESSAGE value="add alter table keywords" />
     <MESSAGE value="add alter table parser" />
     <MESSAGE value="revise" />
-    <option name="LAST_COMMIT_MESSAGE" value="revise" />
+    <MESSAGE value="add alter" />
+    <option name="LAST_COMMIT_MESSAGE" value="add alter" />
   </component>
   <component name="XDebuggerManager">
     <watches-manager>
diff --git a/sqlTranslate/src/main/java/Document/Alter table in Oracle b/sqlTranslate/src/main/java/Document/Alter table in Oracle
index 48618726..9098a664 100644
--- a/sqlTranslate/src/main/java/Document/Alter table in Oracle	
+++ b/sqlTranslate/src/main/java/Document/Alter table in Oracle	
@@ -5,4 +5,15 @@ action = ADD column_name data_type [constraint]
 | RENAME COLUMN old_column_name TO new_column_name
 | ADD CONSTRAINT constraint_name constraint_definition
 | DROP CONSTRAINT constraint_name
-| RENAME old_table_name TO new_table_name
\ No newline at end of file
+| RENAME old_table_name TO new_table_name
+
+Example:
+ALTER TABLE employees ADD email VARCHAR2(100);
+| ALTER TABLE employees ADD email LONG RAW;
+| ALTER TABLE employees DROP COLUMN middle_name;
+| ALTER TABLE employees MODIFY salary NUMBER(10,2);
+| ALTER TABLE employees MODIFY salary ROWID;
+| ALTER TABLE employees RENAME COLUMN first_name TO given_name;
+| ALTER TABLE employees ADD CONSTRAINT emp_pk PRIMARY KEY (employee_id);
+| ALTER TABLE employees DROP CONSTRAINT emp_pk;
+| ALTER TABLE employees RENAME TO staff;
\ No newline at end of file
diff --git a/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java b/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java
index f54da873..6a1de0ae 100644
--- a/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java
+++ b/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java
@@ -1,7 +1,11 @@
 package Generator;
 
+import Interface.ColumnType;
 import Lexer.Token;
 import Parser.AST.ASTNode;
+import Parser.AST.AlterTable.AlterAddColumnNode;
+import Parser.AST.AlterTable.AlterModifyColumnNode;
+import Parser.AST.AlterTable.AlterNode;
 import Parser.AST.CreateTable.ColumnNode;
 import Parser.AST.CreateTable.CreateTabNode;
 import Exception.GenerateFailedException;
@@ -52,6 +56,9 @@ public class OpenGaussGenerator {
         else if (node instanceof DeleteNode) {
             return GenDeleteSQL(node);
         }
+        else if (node instanceof AlterNode) {
+            return GenAlterSQL(node);
+        }
         else {
             try {
                 throw new GenerateFailedException("Root node:" + node.getClass() + "(Unsupported node type!)");
@@ -101,6 +108,12 @@ public class OpenGaussGenerator {
         return node.toQueryString();
     }
 
+    private String GenAlterSQL(ASTNode node) {
+        visitAlter(node);
+//        System.out.println(node.getASTString());
+        return node.toQueryString();
+    }
+
     private void visitCrt(ASTNode node) {
         if (node instanceof ColumnNode) {
             ColumnTypeConvert((ColumnNode) node);
@@ -176,7 +189,19 @@ public class OpenGaussGenerator {
         }
     }
 
-    private void ColumnTypeConvert(ColumnNode node) {
+    private void visitAlter(ASTNode node) {
+        if (node instanceof AlterAddColumnNode) {
+            ColumnTypeConvert((AlterAddColumnNode) node);
+        }
+        else if (node instanceof AlterModifyColumnNode) {
+            ColumnTypeConvert((AlterModifyColumnNode) node);
+        }
+        for (ASTNode child : node.getChildren()) {
+            visitAlter(child);
+        }
+    }
+
+    private void ColumnTypeConvert(ColumnType node) {
         // type convert
         if (node.getType().getValue().equalsIgnoreCase("NUMBER")) {
             node.setType(new Token(Token.TokenType.KEYWORD, "NUMERIC"));
diff --git a/sqlTranslate/src/main/java/Interface/ColumnType.java b/sqlTranslate/src/main/java/Interface/ColumnType.java
new file mode 100644
index 00000000..1e82d101
--- /dev/null
+++ b/sqlTranslate/src/main/java/Interface/ColumnType.java
@@ -0,0 +1,9 @@
+package Interface;
+
+import Lexer.Token;
+
+public interface ColumnType {
+    Token getType();
+    void setType(Token type);
+    void ResetTokensbyNameTypeConstraint();
+}
diff --git a/sqlTranslate/src/main/java/Lexer/OracleLexer.java b/sqlTranslate/src/main/java/Lexer/OracleLexer.java
index c4515356..0d18fb8b 100644
--- a/sqlTranslate/src/main/java/Lexer/OracleLexer.java
+++ b/sqlTranslate/src/main/java/Lexer/OracleLexer.java
@@ -24,7 +24,7 @@ public class OracleLexer {
             // keywords of update
             , "SET"
             // keywords of alter table
-            , "ALTER", "ADD", "DROP", "MODIFY", "RENAME", "TO"
+            , "ALTER", "ADD", "DROP", "MODIFY", "RENAME", "TO", "COLUMN"
     };
     private static final Pattern TOKEN_PATTERN = Pattern.compile(
             "(NUMBER\\(.*?\\))|" +                     // NUMBER() function
diff --git a/sqlTranslate/src/main/java/Main.java b/sqlTranslate/src/main/java/Main.java
index 3c26a502..14c1b2af 100644
--- a/sqlTranslate/src/main/java/Main.java
+++ b/sqlTranslate/src/main/java/Main.java
@@ -7,14 +7,14 @@ import Parser.OracleParser;
 
 public class Main {
     public static void main(String[] args) {
-//        String sql = "CREATE TABLE employees (\n" +
-//                "    employee_id NUMBER PRIMARY KEY,\n" +
-//                "    first_name VARCHAR2(20) Check(first_name > '221'),\n" +
-//                "    last_name VARCHAR2(25),\n" +
-//                "    email VARCHAR2(25),\n" +
-//                "    hire_date DATE,\n" +
-//                "    CONSTRAINT chk_example CHECK (employee_id > 0)" +
-//                ");";
+        String sql = "CREATE TABLE employees (\n" +
+                "    employee_id NUMBER PRIMARY KEY,\n" +
+                "    first_name VARCHAR2(20) Check(first_name > '221'),\n" +
+                "    last_name VARCHAR2(25) Check (last_name != '12813@163.com'),\n" +
+                "    email VARCHAR2(25),\n" +
+                "    hire_date DATE,\n" +
+                "    CONSTRAINT chk_example CHECK (employee_id > 0)" +
+                ");";
 //        String sql = "INSERT INTO employees (first_name, last_name, email) VALUES ('Jane', 'Smith', 'janesm@example.com');";
 //        String sql = "DROP TABLE employees CASCADE CONSTRAINTS;";
 //        String sql = "SELECT e.first_name, d.department_name FROM employees e JOIN departments d Using e.department_id = d.department_id;";
@@ -30,8 +30,7 @@ public class Main {
 //                "    FROM departments d\n" +
 //                "    WHERE d.department_name = 'Sales'\n" +
 //                ");";
-        String sql = "ALTER TABLE employees ADD email VARCHAR2(100) Check (email != '12813@163.com');";
-//        String sql = "ALTER TABLE employees ADD CONSTRAINT emp_pk PRIMARY KEY (employee_id);";
+//        String sql = "ALTER TABLE employees ADD email VARCHAR2(100) Check (email != '12813@163.com');";
         OracleLexer lexer = new OracleLexer(sql);
         lexer.printTokens();
         OracleParser parser = new OracleParser(lexer);
diff --git a/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterAddColumnNode.java b/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterAddColumnNode.java
index 0451f258..0eb23739 100644
--- a/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterAddColumnNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterAddColumnNode.java
@@ -1,12 +1,13 @@
 package Parser.AST.AlterTable;
 
+import Interface.ColumnType;
 import Lexer.Token;
 import Parser.AST.ASTNode;
 
 import java.util.ArrayList;
 import java.util.List;
 
-public class AlterAddColumnNode extends ASTNode {
+public class AlterAddColumnNode extends ASTNode implements ColumnType {
     private Token name;
     private Token type;
     private List<Token> constraint;
@@ -41,10 +42,12 @@ public class AlterAddColumnNode extends ASTNode {
         this.name = name;
     }
 
+    @Override
     public Token getType() {
         return type;
     }
 
+    @Override
     public void setType(Token type) {
         this.type = type;
     }
@@ -57,8 +60,10 @@ public class AlterAddColumnNode extends ASTNode {
         this.constraint = constraint;
     }
 
+    @Override
     public void ResetTokensbyNameTypeConstraint() {
         List <Token> tokens = new ArrayList<>();
+        tokens.add(new Token(Token.TokenType.KEYWORD, "ADD"));
         tokens.add(name);
         tokens.add(type);
         for (Token token : constraint) {
diff --git a/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterModifyColumnNode.java b/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterModifyColumnNode.java
index 14a70e03..495b174d 100644
--- a/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterModifyColumnNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterModifyColumnNode.java
@@ -1,14 +1,15 @@
 package Parser.AST.AlterTable;
 
+import Interface.ColumnType;
 import Lexer.Token;
 import Parser.AST.ASTNode;
 
 import java.util.ArrayList;
 import java.util.List;
 
-public class AlterModifyColumnNode extends ASTNode {
-    private Token columnName;
-    private Token columnType;
+public class AlterModifyColumnNode extends ASTNode implements ColumnType {
+    private Token name;
+    private Token type;
 
     public AlterModifyColumnNode() {
         super();
@@ -22,20 +23,22 @@ public class AlterModifyColumnNode extends ASTNode {
         super(tokens);
     }
 
-    public void setColumnType(Token columnType) {
-        this.columnType = columnType;
+    @Override
+    public void setType(Token columnType) {
+        this.type = columnType;
     }
 
-    public Token getColumnType() {
-        return columnType;
+    @Override
+    public Token getType() {
+        return type;
     }
 
-    public void setColumnName(Token columnName) {
-        this.columnName = columnName;
+    public void setName(Token columnName) {
+        this.name = columnName;
     }
 
-    public Token getColumnName() {
-        return columnName;
+    public Token getName() {
+        return name;
     }
 
     @Override
@@ -46,12 +49,12 @@ public class AlterModifyColumnNode extends ASTNode {
         }
     }
 
+    @Override
     public void ResetTokensbyNameTypeConstraint() {
         List <Token> tokens = new ArrayList<>();
         tokens.add(new Token(Token.TokenType.KEYWORD, "MODIFY"));
-        tokens.add(columnName);
-        tokens.add(columnType);
-        tokens.add(new Token(Token.TokenType.SYMBOL, ";"));
+        tokens.add(name);
+        tokens.add(type);
         setTokens(tokens);
     }
 }
diff --git a/sqlTranslate/src/main/java/Parser/AST/CreateTable/ColumnNode.java b/sqlTranslate/src/main/java/Parser/AST/CreateTable/ColumnNode.java
index bd0155ef..c470ffff 100644
--- a/sqlTranslate/src/main/java/Parser/AST/CreateTable/ColumnNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/CreateTable/ColumnNode.java
@@ -1,12 +1,13 @@
 package Parser.AST.CreateTable;
 
+import Interface.ColumnType;
 import Lexer.Token;
 import Parser.AST.ASTNode;
 
 import java.util.ArrayList;
 import java.util.List;
 
-public class ColumnNode extends ASTNode {
+public class ColumnNode extends ASTNode implements ColumnType {
     private Token name;
     private Token type;
     private List<Token> constraint;
@@ -42,10 +43,12 @@ public class ColumnNode extends ASTNode {
         this.name = name;
     }
 
+    @Override
     public Token getType() {
         return type;
     }
 
+    @Override
     public void setType(Token type) {
         this.type = type;
     }
@@ -58,6 +61,7 @@ public class ColumnNode extends ASTNode {
         this.constraint = constraint;
     }
 
+    @Override
     public void ResetTokensbyNameTypeConstraint() {
         List <Token> tokens = new ArrayList<>();
         tokens.add(name);
diff --git a/sqlTranslate/src/main/java/Parser/OracleParser.java b/sqlTranslate/src/main/java/Parser/OracleParser.java
index fd0e360b..690527f6 100644
--- a/sqlTranslate/src/main/java/Parser/OracleParser.java
+++ b/sqlTranslate/src/main/java/Parser/OracleParser.java
@@ -970,6 +970,7 @@ public class OracleParser {
                                 (parseTokens.get(j).getValue().equalsIgnoreCase("REFERENCES")
                                         || parseTokens.get(j).getValue().equalsIgnoreCase("CHECK"))) {
                             tokens.add(parseTokens.get(j));
+                            constraint.add(parseTokens.get(j));
                             Stack<String> stack = new Stack<>();
                             for (int k = j + 1; k < parseTokens.size(); k++) {
                                 tokens.add(parseTokens.get(k));
@@ -1001,7 +1002,7 @@ public class OracleParser {
                         }
                         if (!state)
                             tokens.add(parseTokens.get(j));
-                        if (j != i + 1) {
+                        if (!state && j != i + 1) {
                             constraint.add(parseTokens.get(j));
                         }
                     }
@@ -1119,10 +1120,10 @@ public class OracleParser {
                 AlterModifyColumnNode childNode = new AlterModifyColumnNode();
                 for (int j = i + 1; j < parseTokens.size(); j++) {
                     if (j == i + 1) {
-                        childNode.setColumnName(parseTokens.get(j));
+                        childNode.setName(parseTokens.get(j));
                     }
                     if (j == i + 2) {
-                        childNode.setColumnType(parseTokens.get(j));
+                        childNode.setType(parseTokens.get(j));
                     }
                     if (j > i + 3) {
                         try {
@@ -1158,7 +1159,7 @@ public class OracleParser {
                     currentNode.addChild(childNode);
                     currentNode = childNode;
                 }
-                else if (i + 1 < parseTokens.size() && parseTokens.get(i + 1).hasType(Token.TokenType.IDENTIFIER)) {
+                else if (i + 1 < parseTokens.size() && parseTokens.get(i + 1).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i + 1).getValue().equalsIgnoreCase("TO")) {
                     tokens = new ArrayList<>();
                     tokens.add(parseTokens.get(i));
                     for (int j = i + 1; j < parseTokens.size(); j++) {
-- 
Gitee


From 449b54cf6c016834f5be0193bb6ab2624ebb2179 Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Fri, 13 Sep 2024 16:04:56 +0800
Subject: [PATCH 059/113] fix some bugs

---
 sqlTranslate/.idea/workspace.xml              | 22 +++++++------------
 .../src/main/java/Lexer/OracleLexer.java      |  2 ++
 sqlTranslate/src/main/java/Main.java          | 20 +++++++++--------
 .../AST/CaseWhen/CaseConditionNode.java       |  2 +-
 .../Parser/AST/CaseWhen/CaseElseNode.java     |  2 +-
 .../Parser/AST/CaseWhen/CaseThenNode.java     |  2 +-
 .../src/main/java/Parser/OracleParser.java    | 20 +++++++++++------
 7 files changed, 37 insertions(+), 33 deletions(-)

diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
index 5750f808..9c73abd5 100644
--- a/sqlTranslate/.idea/workspace.xml
+++ b/sqlTranslate/.idea/workspace.xml
@@ -5,15 +5,9 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add alter">
-      <change afterPath="$PROJECT_DIR$/src/main/java/Interface/ColumnType.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Document/Alter table in Oracle" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Document/Alter table in Oracle" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Generator/OpenGaussGenerator.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Generator/OpenGaussGenerator.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/Lexer/OracleLexer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Lexer/OracleLexer.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Main.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/AlterTable/AlterAddColumnNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/AlterTable/AlterAddColumnNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/AlterTable/AlterModifyColumnNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/AlterTable/AlterModifyColumnNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/CreateTable/ColumnNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/CreateTable/ColumnNode.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -112,13 +106,6 @@
       <option name="presentableId" value="Default" />
       <updated>1723106789329</updated>
     </task>
-    <task id="LOCAL-00007" summary="revise">
-      <created>1724165008682</created>
-      <option name="number" value="00007" />
-      <option name="presentableId" value="LOCAL-00007" />
-      <option name="project" value="LOCAL" />
-      <updated>1724165008682</updated>
-    </task>
     <task id="LOCAL-00008" summary="revise">
       <created>1724165028837</created>
       <option name="number" value="00008" />
@@ -455,7 +442,14 @@
       <option name="project" value="LOCAL" />
       <updated>1726210280296</updated>
     </task>
-    <option name="localTasksCounter" value="56" />
+    <task id="LOCAL-00056" summary="add alter">
+      <created>1726212919328</created>
+      <option name="number" value="00056" />
+      <option name="presentableId" value="LOCAL-00056" />
+      <option name="project" value="LOCAL" />
+      <updated>1726212919328</updated>
+    </task>
+    <option name="localTasksCounter" value="57" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
diff --git a/sqlTranslate/src/main/java/Lexer/OracleLexer.java b/sqlTranslate/src/main/java/Lexer/OracleLexer.java
index 0d18fb8b..5a2048ab 100644
--- a/sqlTranslate/src/main/java/Lexer/OracleLexer.java
+++ b/sqlTranslate/src/main/java/Lexer/OracleLexer.java
@@ -21,6 +21,8 @@ public class OracleLexer {
             , "DISTINCT", "JOIN", "GROUP BY", "ORDER BY", "HAVING", "UNION", "CASE", "WHEN", "END", "AS"
             // keywords of join
             , "INNER JOIN", "LEFT JOIN", "LEFT OUTER JOIN", "RIGHT JOIN", "RIGHT OUTER JOIN", "FULL JOIN", "FULL OUTER JOIN", "CROSS JOIN", "JOIN", "ON", "USING"
+            // keywords of case when
+            , "THEN", "ELSE"
             // keywords of update
             , "SET"
             // keywords of alter table
diff --git a/sqlTranslate/src/main/java/Main.java b/sqlTranslate/src/main/java/Main.java
index 14c1b2af..ba193d91 100644
--- a/sqlTranslate/src/main/java/Main.java
+++ b/sqlTranslate/src/main/java/Main.java
@@ -7,14 +7,14 @@ import Parser.OracleParser;
 
 public class Main {
     public static void main(String[] args) {
-        String sql = "CREATE TABLE employees (\n" +
-                "    employee_id NUMBER PRIMARY KEY,\n" +
-                "    first_name VARCHAR2(20) Check(first_name > '221'),\n" +
-                "    last_name VARCHAR2(25) Check (last_name != '12813@163.com'),\n" +
-                "    email VARCHAR2(25),\n" +
-                "    hire_date DATE,\n" +
-                "    CONSTRAINT chk_example CHECK (employee_id > 0)" +
-                ");";
+//        String sql = "CREATE TABLE employees (\n" +
+//                "    employee_id NUMBER PRIMARY KEY,\n" +
+//                "    first_name VARCHAR2(20) Check(first_name > '221'),\n" +
+//                "    last_name VARCHAR2(25) Check (last_name != '12813@163.com'),\n" +
+//                "    email VARCHAR2(25),\n" +
+//                "    hire_date DATE,\n" +
+//                "    CONSTRAINT chk_example CHECK (employee_id > 0)" +
+//                ");";
 //        String sql = "INSERT INTO employees (first_name, last_name, email) VALUES ('Jane', 'Smith', 'janesm@example.com');";
 //        String sql = "DROP TABLE employees CASCADE CONSTRAINTS;";
 //        String sql = "SELECT e.first_name, d.department_name FROM employees e JOIN departments d Using e.department_id = d.department_id;";
@@ -30,11 +30,13 @@ public class Main {
 //                "    FROM departments d\n" +
 //                "    WHERE d.department_name = 'Sales'\n" +
 //                ");";
-//        String sql = "ALTER TABLE employees ADD email VARCHAR2(100) Check (email != '12813@163.com');";
+        String sql = "ALTER TABLE employees ADD email VARCHAR2(100) Check (email != '12813@163.com');";
+//        String sql = "CASE WHEN column2 > 0 THEN 'Positive' ELSE 'Non-positive' END";
         OracleLexer lexer = new OracleLexer(sql);
         lexer.printTokens();
         OracleParser parser = new OracleParser(lexer);
         ASTNode root = parser.parse();
+//        ASTNode root = parser.parseCaseWhen(lexer.getTokens());
 //        ASTNode root = OracleParser.parseJoin(lexer.getTokens());
         System.out.println(root.toQueryString());
         System.out.println(root.getASTString());
diff --git a/sqlTranslate/src/main/java/Parser/AST/CaseWhen/CaseConditionNode.java b/sqlTranslate/src/main/java/Parser/AST/CaseWhen/CaseConditionNode.java
index 7a9bf1af..ae1e5cbb 100644
--- a/sqlTranslate/src/main/java/Parser/AST/CaseWhen/CaseConditionNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/CaseWhen/CaseConditionNode.java
@@ -16,7 +16,7 @@ public class CaseConditionNode extends ASTNode {
 
     @Override
     public void visit(ASTNode node, StringBuilder queryString) {
-        queryString.append("CASE WHEN " + toString() + " ");
+        queryString.append(toString() + " ");
         for (ASTNode child : getChildren())
         {
             child.visit(child, queryString);
diff --git a/sqlTranslate/src/main/java/Parser/AST/CaseWhen/CaseElseNode.java b/sqlTranslate/src/main/java/Parser/AST/CaseWhen/CaseElseNode.java
index 2ec12f76..bed97fc8 100644
--- a/sqlTranslate/src/main/java/Parser/AST/CaseWhen/CaseElseNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/CaseWhen/CaseElseNode.java
@@ -16,7 +16,7 @@ public class CaseElseNode extends ASTNode {
 
     @Override
     public void visit(ASTNode node, StringBuilder queryString) {
-        queryString.append("ELSE " + toString() + " ");
+        queryString.append(toString() + " ");
         for (ASTNode child : getChildren()) {
             child.visit(child, queryString);
         }
diff --git a/sqlTranslate/src/main/java/Parser/AST/CaseWhen/CaseThenNode.java b/sqlTranslate/src/main/java/Parser/AST/CaseWhen/CaseThenNode.java
index 9c71911f..1e09241e 100644
--- a/sqlTranslate/src/main/java/Parser/AST/CaseWhen/CaseThenNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/CaseWhen/CaseThenNode.java
@@ -16,7 +16,7 @@ public class CaseThenNode extends ASTNode {
 
     @Override
     public void visit(ASTNode node, StringBuilder queryString) {
-        queryString.append("THEN " + toString() + " ");
+        queryString.append(toString() + " ");
         for (ASTNode child : getChildren())
         {
             child.visit(child, queryString);
diff --git a/sqlTranslate/src/main/java/Parser/OracleParser.java b/sqlTranslate/src/main/java/Parser/OracleParser.java
index 690527f6..32d08391 100644
--- a/sqlTranslate/src/main/java/Parser/OracleParser.java
+++ b/sqlTranslate/src/main/java/Parser/OracleParser.java
@@ -63,7 +63,7 @@ public class OracleParser {
         }
         else {
             try {
-                throw new ParseFailedException("Parse failed!");
+                throw new ParseFailedException("Parse failed!--Unsupport SQL:" + lexer.getTokens().get(0).getValue());
             }
             catch (ParseFailedException e) {
                 e.printStackTrace();
@@ -332,7 +332,7 @@ public class OracleParser {
     }
 
     /**
-     * DROP TABLE _table (CASCADE CONSTRAINTS)?
+     * DROP TABLE _table (CASCADE CONSTRAINTS)? | DROP VIEW _view
      */
     private ASTNode parseDrop(List<Token> parseTokens) {
         List <Token> tokens = new ArrayList<>();
@@ -532,6 +532,7 @@ public class OracleParser {
 
     /**
      * CASE WHEN expr THEN expr [ELSE expr] END
+     * @param parseTokens should start with CASE
      */
     public static ASTNode parseCaseWhen(List<Token> parseTokens) {
         List <Token> tokens = new ArrayList<>();
@@ -545,23 +546,23 @@ public class OracleParser {
         }
         int currentIndex = 2;
         for (int i = currentIndex; i < parseTokens.size(); i++) {
-            tokens.add(parseTokens.get(i));
             if (parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("THEN")) {
                 currentIndex = i;
                 break;
             }
+            tokens.add(parseTokens.get(i));
         }
         ASTNode root = new CaseConditionNode(tokens);
         ASTNode currentNode = root;
 
         tokens = new ArrayList<>();
         for (int i = currentIndex; i < parseTokens.size(); i++) {
-            tokens.add(parseTokens.get(i));
             if ( (parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("ELSE"))
             || (parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("END")) ) {
                 currentIndex = i;
                 break;
             }
+            tokens.add(parseTokens.get(i));
         }
         ASTNode childNode = new CaseThenNode(tokens);
         currentNode.addChild(childNode);
@@ -575,7 +576,7 @@ public class OracleParser {
                         childNode = new CaseElseNode(tokens);
                         currentNode.addChild(childNode);
                         currentNode = childNode;
-                        i = j;
+                        i = j - 1;
                         break;
                     }
                     tokens.add(parseTokens.get(j));
@@ -589,9 +590,12 @@ public class OracleParser {
                 currentNode = childNode;
                 break;
             }
+            else if (parseTokens.get(i).hasType(Token.TokenType.EOF)) {
+                break;
+            }
             else {
                 try {
-                    throw new ParseFailedException("Parse failed!");
+                    throw new ParseFailedException("Parse failed!--" + parseTokens.get(i));
                 }
                 catch (ParseFailedException e) {
                     e.printStackTrace();
@@ -604,7 +608,8 @@ public class OracleParser {
 
     /**
      * JOIN clause
-     * For example: table1 t1 JOIN table2 t2 ON|USING t1.id = t2.id (parseTokens should start with table)
+     * For example: table1 t1 JOIN table2 t2 ON|USING t1.id = t2.id
+     * @param parseTokens should start with _table
      */
     public static ASTNode parseJoin(List<Token> parseTokens) {
         List <Token> tokens = new ArrayList<>();
@@ -764,6 +769,7 @@ public class OracleParser {
     /**
      * Update
      * For example: UPDATE table_name SET column1 = value1, column2 = value2, ... WHERE condition;
+     *              | UPDATE view_name SET column1 = value1, column2 = value2, ... WHERE condition;
      */
     private ASTNode parseUpdate(List<Token> parseTokens) {
         List<Token> tokens = new ArrayList<>();
-- 
Gitee


From 3e95820c1fd0d7a0103687132577c3735c2a0155 Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Fri, 13 Sep 2024 16:09:24 +0800
Subject: [PATCH 060/113] add view document

---
 sqlTranslate/.idea/workspace.xml              | 27 ++++++++-----------
 .../src/main/java/Document/View in Oracle     |  7 +++++
 2 files changed, 18 insertions(+), 16 deletions(-)
 create mode 100644 sqlTranslate/src/main/java/Document/View in Oracle

diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
index 9c73abd5..bd171b65 100644
--- a/sqlTranslate/.idea/workspace.xml
+++ b/sqlTranslate/.idea/workspace.xml
@@ -4,12 +4,7 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add alter">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Lexer/OracleLexer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Lexer/OracleLexer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Main.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" afterDir="false" />
-    </list>
+    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="fix some bugs" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -106,13 +101,6 @@
       <option name="presentableId" value="Default" />
       <updated>1723106789329</updated>
     </task>
-    <task id="LOCAL-00008" summary="revise">
-      <created>1724165028837</created>
-      <option name="number" value="00008" />
-      <option name="presentableId" value="LOCAL-00008" />
-      <option name="project" value="LOCAL" />
-      <updated>1724165028837</updated>
-    </task>
     <task id="LOCAL-00009" summary="revise">
       <created>1724165047441</created>
       <option name="number" value="00009" />
@@ -449,7 +437,14 @@
       <option name="project" value="LOCAL" />
       <updated>1726212919328</updated>
     </task>
-    <option name="localTasksCounter" value="57" />
+    <task id="LOCAL-00057" summary="fix some bugs">
+      <created>1726214700141</created>
+      <option name="number" value="00057" />
+      <option name="presentableId" value="LOCAL-00057" />
+      <option name="project" value="LOCAL" />
+      <updated>1726214700141</updated>
+    </task>
+    <option name="localTasksCounter" value="58" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
@@ -464,7 +459,6 @@
     </option>
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="coding" />
     <MESSAGE value="finish the framework of sqltranslate (createTab sql is now being supported!)" />
     <MESSAGE value="add insert sql" />
     <MESSAGE value="add todolist" />
@@ -489,7 +483,8 @@
     <MESSAGE value="add alter table parser" />
     <MESSAGE value="revise" />
     <MESSAGE value="add alter" />
-    <option name="LAST_COMMIT_MESSAGE" value="add alter" />
+    <MESSAGE value="fix some bugs" />
+    <option name="LAST_COMMIT_MESSAGE" value="fix some bugs" />
   </component>
   <component name="XDebuggerManager">
     <watches-manager>
diff --git a/sqlTranslate/src/main/java/Document/View in Oracle b/sqlTranslate/src/main/java/Document/View in Oracle
new file mode 100644
index 00000000..332a80e7
--- /dev/null
+++ b/sqlTranslate/src/main/java/Document/View in Oracle	
@@ -0,0 +1,7 @@
+CREATE [OR REPLACE] VIEW view_name [(column_name [, column_name]...)] AS SELECT_statement;
+
+Example:
+    CREATE OR REPLACE VIEW employee_details AS SELECT first_name, last_name, salary FROM employees;
+    | CREATE OR REPLACE VIEW emp_info (full_name, pay) AS SELECT first_name || ' ' || last_name AS full_name, salary AS pay FROM employees;
+    | CREATE OR REPLACE VIEW emp_dept_info AS SELECT e.first_name, e.last_name, d.department_name FROM employees e JOIN departments d ON e.department_id = d.department_id;
+    | CREATE OR REPLACE VIEW high_salary_employees AS SELECT first_name, last_name, salary FROM employees WHERE salary > 50000;
\ No newline at end of file
-- 
Gitee


From 8724f488c273fed3fffa22efda382f9790ee5bec Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Fri, 13 Sep 2024 16:14:05 +0800
Subject: [PATCH 061/113] add keywords of view

---
 sqlTranslate/.idea/workspace.xml              | 22 +++++++++----------
 .../src/main/java/Lexer/OracleLexer.java      |  2 ++
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
index bd171b65..e8d02f40 100644
--- a/sqlTranslate/.idea/workspace.xml
+++ b/sqlTranslate/.idea/workspace.xml
@@ -4,7 +4,7 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="fix some bugs" />
+    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add view document" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -101,13 +101,6 @@
       <option name="presentableId" value="Default" />
       <updated>1723106789329</updated>
     </task>
-    <task id="LOCAL-00009" summary="revise">
-      <created>1724165047441</created>
-      <option name="number" value="00009" />
-      <option name="presentableId" value="LOCAL-00009" />
-      <option name="project" value="LOCAL" />
-      <updated>1724165047441</updated>
-    </task>
     <task id="LOCAL-00010" summary="add parser function">
       <created>1724166047929</created>
       <option name="number" value="00010" />
@@ -444,7 +437,14 @@
       <option name="project" value="LOCAL" />
       <updated>1726214700141</updated>
     </task>
-    <option name="localTasksCounter" value="58" />
+    <task id="LOCAL-00058" summary="add view document">
+      <created>1726214965146</created>
+      <option name="number" value="00058" />
+      <option name="presentableId" value="LOCAL-00058" />
+      <option name="project" value="LOCAL" />
+      <updated>1726214965146</updated>
+    </task>
+    <option name="localTasksCounter" value="59" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
@@ -459,7 +459,6 @@
     </option>
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="finish the framework of sqltranslate (createTab sql is now being supported!)" />
     <MESSAGE value="add insert sql" />
     <MESSAGE value="add todolist" />
     <MESSAGE value="add select" />
@@ -484,7 +483,8 @@
     <MESSAGE value="revise" />
     <MESSAGE value="add alter" />
     <MESSAGE value="fix some bugs" />
-    <option name="LAST_COMMIT_MESSAGE" value="fix some bugs" />
+    <MESSAGE value="add view document" />
+    <option name="LAST_COMMIT_MESSAGE" value="add view document" />
   </component>
   <component name="XDebuggerManager">
     <watches-manager>
diff --git a/sqlTranslate/src/main/java/Lexer/OracleLexer.java b/sqlTranslate/src/main/java/Lexer/OracleLexer.java
index 5a2048ab..c96034ca 100644
--- a/sqlTranslate/src/main/java/Lexer/OracleLexer.java
+++ b/sqlTranslate/src/main/java/Lexer/OracleLexer.java
@@ -27,6 +27,8 @@ public class OracleLexer {
             , "SET"
             // keywords of alter table
             , "ALTER", "ADD", "DROP", "MODIFY", "RENAME", "TO", "COLUMN"
+            // keywords of view
+            , "REPLACE", "VIEW"
     };
     private static final Pattern TOKEN_PATTERN = Pattern.compile(
             "(NUMBER\\(.*?\\))|" +                     // NUMBER() function
-- 
Gitee


From c10d92fae65ed54a3a912afc4deeb0b98bc73b1d Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Fri, 13 Sep 2024 16:20:55 +0800
Subject: [PATCH 062/113] add ast class of view

---
 .../java/Parser/AST/View/ViewEndNode.java     | 24 +++++++++++++++++++
 .../java/Parser/AST/View/ViewNameNode.java    | 24 +++++++++++++++++++
 .../main/java/Parser/AST/View/ViewNode.java   | 24 +++++++++++++++++++
 .../java/Parser/AST/View/ViewTargetNode.java  | 24 +++++++++++++++++++
 4 files changed, 96 insertions(+)
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/View/ViewEndNode.java
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/View/ViewNameNode.java
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/View/ViewNode.java
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/View/ViewTargetNode.java

diff --git a/sqlTranslate/src/main/java/Parser/AST/View/ViewEndNode.java b/sqlTranslate/src/main/java/Parser/AST/View/ViewEndNode.java
new file mode 100644
index 00000000..e4137b34
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/View/ViewEndNode.java
@@ -0,0 +1,24 @@
+package Parser.AST.View;
+
+import Lexer.Token;
+import Parser.AST.ASTNode;
+
+import java.util.List;
+
+public class ViewEndNode extends ASTNode {
+    public ViewEndNode(ASTNode node) {
+        super(node);
+    }
+
+    public ViewEndNode(List<Token> tokens) {
+        super(tokens);
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString) {
+        queryString.append(toString());
+        for (ASTNode child : getChildren()) {
+            child.visit(child, queryString);
+        }
+    }
+}
diff --git a/sqlTranslate/src/main/java/Parser/AST/View/ViewNameNode.java b/sqlTranslate/src/main/java/Parser/AST/View/ViewNameNode.java
new file mode 100644
index 00000000..ecdab3fc
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/View/ViewNameNode.java
@@ -0,0 +1,24 @@
+package Parser.AST.View;
+
+import Lexer.Token;
+import Parser.AST.ASTNode;
+
+import java.util.List;
+
+public class ViewNameNode extends ASTNode {
+    public ViewNameNode(ASTNode node) {
+        super(node);
+    }
+
+    public ViewNameNode(List<Token> tokens) {
+        super(tokens);
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString) {
+        queryString.append(toString() + " ");
+        for (ASTNode child : getChildren()) {
+            child.visit(child, queryString);
+        }
+    }
+}
diff --git a/sqlTranslate/src/main/java/Parser/AST/View/ViewNode.java b/sqlTranslate/src/main/java/Parser/AST/View/ViewNode.java
new file mode 100644
index 00000000..397a53c6
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/View/ViewNode.java
@@ -0,0 +1,24 @@
+package Parser.AST.View;
+
+import Lexer.Token;
+import Parser.AST.ASTNode;
+
+import java.util.List;
+
+public class ViewNode extends ASTNode {
+    public ViewNode(ASTNode node) {
+        super(node);
+    }
+
+    public ViewNode(List<Token> tokens) {
+        super(tokens);
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString) {
+        queryString.append(toString() + " ");
+        for (ASTNode child : getChildren()) {
+            child.visit(child, queryString);
+        }
+    }
+}
diff --git a/sqlTranslate/src/main/java/Parser/AST/View/ViewTargetNode.java b/sqlTranslate/src/main/java/Parser/AST/View/ViewTargetNode.java
new file mode 100644
index 00000000..1eadeb99
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/View/ViewTargetNode.java
@@ -0,0 +1,24 @@
+package Parser.AST.View;
+
+import Lexer.Token;
+import Parser.AST.ASTNode;
+
+import java.util.List;
+
+public class ViewTargetNode extends ASTNode {
+    public ViewTargetNode(ASTNode node) {
+        super(node);
+    }
+
+    public ViewTargetNode(List<Token> tokens) {
+        super(tokens);
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString) {
+        queryString.append(toString() + " ");
+        for (ASTNode child : getChildren()) {
+            child.visit(child, queryString);
+        }
+    }
+}
-- 
Gitee


From c4cec7795cd9ebcd8389ef440b33a5a9491d7f73 Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Fri, 13 Sep 2024 21:30:41 +0800
Subject: [PATCH 063/113] add view

---
 sqlTranslate/.idea/workspace.xml              |  47 ++++---
 .../src/main/java/Lexer/OracleLexer.java      |  31 +++--
 sqlTranslate/src/main/java/Main.java          |   3 +-
 .../{ViewNode.java => ViewCreateNode.java}    |  11 +-
 .../java/Parser/AST/View/ViewEndNode.java     |   4 +
 .../src/main/java/Parser/OracleParser.java    | 130 ++++++++++++++----
 6 files changed, 159 insertions(+), 67 deletions(-)
 rename sqlTranslate/src/main/java/Parser/AST/View/{ViewNode.java => ViewCreateNode.java} (67%)

diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
index e8d02f40..be45680e 100644
--- a/sqlTranslate/.idea/workspace.xml
+++ b/sqlTranslate/.idea/workspace.xml
@@ -4,7 +4,14 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add view document" />
+    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add ast class of view">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Lexer/OracleLexer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Lexer/OracleLexer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Main.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/View/ViewEndNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/View/ViewEndNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/View/ViewNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/View/ViewCreateNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -13,8 +20,8 @@
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
       <list>
-        <option value="Class" />
         <option value="Interface" />
+        <option value="Class" />
       </list>
     </option>
   </component>
@@ -101,20 +108,6 @@
       <option name="presentableId" value="Default" />
       <updated>1723106789329</updated>
     </task>
-    <task id="LOCAL-00010" summary="add parser function">
-      <created>1724166047929</created>
-      <option name="number" value="00010" />
-      <option name="presentableId" value="LOCAL-00010" />
-      <option name="project" value="LOCAL" />
-      <updated>1724166047929</updated>
-    </task>
-    <task id="LOCAL-00011" summary="add function">
-      <created>1724338301831</created>
-      <option name="number" value="00011" />
-      <option name="presentableId" value="LOCAL-00011" />
-      <option name="project" value="LOCAL" />
-      <updated>1724338301831</updated>
-    </task>
     <task id="LOCAL-00012" summary="add function">
       <created>1724419179050</created>
       <option name="number" value="00012" />
@@ -444,7 +437,21 @@
       <option name="project" value="LOCAL" />
       <updated>1726214965146</updated>
     </task>
-    <option name="localTasksCounter" value="59" />
+    <task id="LOCAL-00059" summary="add keywords of view">
+      <created>1726215246855</created>
+      <option name="number" value="00059" />
+      <option name="presentableId" value="LOCAL-00059" />
+      <option name="project" value="LOCAL" />
+      <updated>1726215246856</updated>
+    </task>
+    <task id="LOCAL-00060" summary="add ast class of view">
+      <created>1726215657277</created>
+      <option name="number" value="00060" />
+      <option name="presentableId" value="LOCAL-00060" />
+      <option name="project" value="LOCAL" />
+      <updated>1726215657277</updated>
+    </task>
+    <option name="localTasksCounter" value="61" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
@@ -459,8 +466,6 @@
     </option>
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="add insert sql" />
-    <MESSAGE value="add todolist" />
     <MESSAGE value="add select" />
     <MESSAGE value="add case when" />
     <MESSAGE value="add pattern of functions in select" />
@@ -484,7 +489,9 @@
     <MESSAGE value="add alter" />
     <MESSAGE value="fix some bugs" />
     <MESSAGE value="add view document" />
-    <option name="LAST_COMMIT_MESSAGE" value="add view document" />
+    <MESSAGE value="add keywords of view" />
+    <MESSAGE value="add ast class of view" />
+    <option name="LAST_COMMIT_MESSAGE" value="add ast class of view" />
   </component>
   <component name="XDebuggerManager">
     <watches-manager>
diff --git a/sqlTranslate/src/main/java/Lexer/OracleLexer.java b/sqlTranslate/src/main/java/Lexer/OracleLexer.java
index c96034ca..04e721e2 100644
--- a/sqlTranslate/src/main/java/Lexer/OracleLexer.java
+++ b/sqlTranslate/src/main/java/Lexer/OracleLexer.java
@@ -18,7 +18,7 @@ public class OracleLexer {
             // keywords of drop table
             , "DROP", "CASCADE"
             // keywords of select
-            , "DISTINCT", "JOIN", "GROUP BY", "ORDER BY", "HAVING", "UNION", "CASE", "WHEN", "END", "AS"
+            , "DISTINCT", "JOIN", "GROUP BY", "ORDER BY", "HAVING", "UNION", "CASE", "WHEN", "END", "AS", "||"
             // keywords of join
             , "INNER JOIN", "LEFT JOIN", "LEFT OUTER JOIN", "RIGHT JOIN", "RIGHT OUTER JOIN", "FULL JOIN", "FULL OUTER JOIN", "CROSS JOIN", "JOIN", "ON", "USING"
             // keywords of case when
@@ -45,6 +45,7 @@ public class OracleLexer {
                     "(AVG\\(.*?\\))|" +                     // AVG() function
                     "(MAX\\(.*?\\))|" +                     // MAX() function
                     "(MIN\\(.*?\\))|" +                     // MIN() function
+                    "(\\|\\|\\s*'.*?'\\s*\\|\\|)|" +        // || '*' ||
 
                     "(NOT NULL)|" +
                     "(PRIMARY KEY)|" +
@@ -66,6 +67,7 @@ public class OracleLexer {
                     "(FULL JOIN)|" +
                     "(FULL OUTER JOIN)|" +
                     "(CROSS JOIN)|" +
+                    "(\\|\\|)|" +
 
 
                     "(\\b[A-Za-z_][A-Za-z0-9_]*(\\.[A-Za-z_][A-Za-z0-9_]*)*\\b)|" + // Keywords and identifiers
@@ -122,40 +124,43 @@ public class OracleLexer {
         else if (tokenValue.matches("(?i)NUMBER\\(.*?\\)")) {
             // NUMBER() function, CASE_INSENSITIVE
             return new Token(Token.TokenType.KEYWORD, tokenValue);
-        }else if (tokenValue.matches("(?i)DECIMAL\\(.*?\\)")) {
+        } else if (tokenValue.matches("(?i)DECIMAL\\(.*?\\)")) {
             // DECIMAL() function, CASE_INSENSITIVE
             return new Token(Token.TokenType.KEYWORD, tokenValue);
-        }else if (tokenValue.matches("(?i)FLOAT\\(.*?\\)")) {
+        } else if (tokenValue.matches("(?i)FLOAT\\(.*?\\)")) {
             // FLOAT() function, CASE_INSENSITIVE
             return new Token(Token.TokenType.KEYWORD, tokenValue);
-        }else if (tokenValue.matches("(?i)CHAR\\(.*?\\)")) {
+        } else if (tokenValue.matches("(?i)CHAR\\(.*?\\)")) {
             // CHAR() function, CASE_INSENSITIVE
             return new Token(Token.TokenType.KEYWORD, tokenValue);
-        }else if (tokenValue.matches("(?i)VARCHAR2\\(.*?\\)")) {
+        } else if (tokenValue.matches("(?i)VARCHAR2\\(.*?\\)")) {
             // VARCHAR2() function, CASE_INSENSITIVE
             return new Token(Token.TokenType.KEYWORD, tokenValue);
-        }else if (tokenValue.matches("(?i)NCHAR\\(.*?\\)")) {
+        } else if (tokenValue.matches("(?i)NCHAR\\(.*?\\)")) {
             // NCHAR() function, CASE_INSENSITIVE
             return new Token(Token.TokenType.KEYWORD, tokenValue);
-        }else if (tokenValue.matches("(?i)NVARCHAR2\\(.*?\\)")) {
+        } else if (tokenValue.matches("(?i)NVARCHAR2\\(.*?\\)")) {
             // NVARCHAR2() function, CASE_INSENSITIVE
             return new Token(Token.TokenType.KEYWORD, tokenValue);
-        }else if (tokenValue.matches("(?i)RAW\\(.*?\\)")) {
+        } else if (tokenValue.matches("(?i)RAW\\(.*?\\)")) {
             // RAW() function, CASE_INSENSITIVE
             return new Token(Token.TokenType.KEYWORD, tokenValue);
-        }else if (tokenValue.matches("(?i)COUNT\\(.*?\\)")) {
+        } else if (tokenValue.matches("(?i)COUNT\\(.*?\\)")) {
             // RAW() function, CASE_INSENSITIVE
             return new Token(Token.TokenType.KEYWORD, tokenValue);
-        }else if (tokenValue.matches("(?i)SUM\\(.*?\\)")) {
+        } else if (tokenValue.matches("(?i)SUM\\(.*?\\)")) {
             // RAW() function, CASE_INSENSITIVE
             return new Token(Token.TokenType.KEYWORD, tokenValue);
-        }else if (tokenValue.matches("(?i)AVG\\(.*?\\)")) {
+        } else if (tokenValue.matches("(?i)AVG\\(.*?\\)")) {
             // RAW() function, CASE_INSENSITIVE
             return new Token(Token.TokenType.KEYWORD, tokenValue);
-        }else if (tokenValue.matches("(?i)MAX\\(.*?\\)")) {
+        } else if (tokenValue.matches("(?i)MAX\\(.*?\\)")) {
             // RAW() function, CASE_INSENSITIVE
             return new Token(Token.TokenType.KEYWORD, tokenValue);
-        }else if (tokenValue.matches("(?i)MIN\\(.*?\\)")) {
+        } else if (tokenValue.matches("(?i)MIN\\(.*?\\)")) {
+            // RAW() function, CASE_INSENSITIVE
+            return new Token(Token.TokenType.KEYWORD, tokenValue);
+        } else if (tokenValue.matches("\\|\\|\\s*'.*?'\\s*\\|\\|")) {
             // RAW() function, CASE_INSENSITIVE
             return new Token(Token.TokenType.KEYWORD, tokenValue);
         }
diff --git a/sqlTranslate/src/main/java/Main.java b/sqlTranslate/src/main/java/Main.java
index ba193d91..b2bb58be 100644
--- a/sqlTranslate/src/main/java/Main.java
+++ b/sqlTranslate/src/main/java/Main.java
@@ -30,8 +30,9 @@ public class Main {
 //                "    FROM departments d\n" +
 //                "    WHERE d.department_name = 'Sales'\n" +
 //                ");";
-        String sql = "ALTER TABLE employees ADD email VARCHAR2(100) Check (email != '12813@163.com');";
+//        String sql = "ALTER TABLE employees ADD email VARCHAR2(100) Check (email != '12813@163.com');";
 //        String sql = "CASE WHEN column2 > 0 THEN 'Positive' ELSE 'Non-positive' END";
+        String sql = "CREATE OR REPLACE VIEW emp_dept_info AS SELECT e.first_name, e.last_name, d.department_name FROM employees e JOIN departments d ON e.department_id = d.department_id;";
         OracleLexer lexer = new OracleLexer(sql);
         lexer.printTokens();
         OracleParser parser = new OracleParser(lexer);
diff --git a/sqlTranslate/src/main/java/Parser/AST/View/ViewNode.java b/sqlTranslate/src/main/java/Parser/AST/View/ViewCreateNode.java
similarity index 67%
rename from sqlTranslate/src/main/java/Parser/AST/View/ViewNode.java
rename to sqlTranslate/src/main/java/Parser/AST/View/ViewCreateNode.java
index 397a53c6..a76923ee 100644
--- a/sqlTranslate/src/main/java/Parser/AST/View/ViewNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/View/ViewCreateNode.java
@@ -5,12 +5,17 @@ import Parser.AST.ASTNode;
 
 import java.util.List;
 
-public class ViewNode extends ASTNode {
-    public ViewNode(ASTNode node) {
+public class ViewCreateNode extends ASTNode {
+
+    public ViewCreateNode() {
+        super();
+    }
+
+    public ViewCreateNode(ASTNode node) {
         super(node);
     }
 
-    public ViewNode(List<Token> tokens) {
+    public ViewCreateNode(List<Token> tokens) {
         super(tokens);
     }
 
diff --git a/sqlTranslate/src/main/java/Parser/AST/View/ViewEndNode.java b/sqlTranslate/src/main/java/Parser/AST/View/ViewEndNode.java
index e4137b34..c384900c 100644
--- a/sqlTranslate/src/main/java/Parser/AST/View/ViewEndNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/View/ViewEndNode.java
@@ -6,6 +6,10 @@ import Parser.AST.ASTNode;
 import java.util.List;
 
 public class ViewEndNode extends ASTNode {
+    public ViewEndNode() {
+        super();
+    }
+
     public ViewEndNode(ASTNode node) {
         super(node);
     }
diff --git a/sqlTranslate/src/main/java/Parser/OracleParser.java b/sqlTranslate/src/main/java/Parser/OracleParser.java
index 32d08391..b9dd3a6a 100644
--- a/sqlTranslate/src/main/java/Parser/OracleParser.java
+++ b/sqlTranslate/src/main/java/Parser/OracleParser.java
@@ -25,6 +25,10 @@ import Parser.AST.Insert.InsertObjNode;
 import Parser.AST.Join.*;
 import Parser.AST.Select.*;
 import Parser.AST.Update.*;
+import Parser.AST.View.ViewCreateNode;
+import Parser.AST.View.ViewEndNode;
+import Parser.AST.View.ViewNameNode;
+import Parser.AST.View.ViewTargetNode;
 
 import java.util.Stack;
 
@@ -38,38 +42,41 @@ public class OracleParser {
     }
     public ASTNode parse()
     {
-        // check if the input is a create table statement
-        if ((lexer.getTokens().get(0).getValue().equalsIgnoreCase("CREATE") && lexer.getTokens().get(1).getValue().equalsIgnoreCase("TABLE")) ||
-                (lexer.getTokens().get(0).getValue().equalsIgnoreCase("CREATE") && lexer.getTokens().get(2).getValue().equalsIgnoreCase("TEMPORARY") && lexer.getTokens().get(3).getValue().equalsIgnoreCase("TABLE")) ) {
-            return parseCreateTab(lexer.getTokens());
-        }
-        else if (lexer.getTokens().get(0).getValue().equalsIgnoreCase("INSERT")) {
-            return parseInsert(lexer.getTokens());
-        }
-        else if (lexer.getTokens().get(0).getValue().equalsIgnoreCase("DROP")) {
-            return parseDrop(lexer.getTokens());
-        }
-        else if (lexer.getTokens().get(0).getValue().equalsIgnoreCase("SELECT")) {
-            return parseSelect(lexer.getTokens());
-        }
-        else if (lexer.getTokens().get(0).getValue().equalsIgnoreCase("UPDATE")) {
-            return parseUpdate(lexer.getTokens());
-        }
-        else if (lexer.getTokens().get(0).getValue().equalsIgnoreCase("DELETE")) {
-            return parseDelete(lexer.getTokens());
-        }
-        else if (lexer.getTokens().get(0).getValue().equalsIgnoreCase("ALTER")) {
-            return parseAlterTable(lexer.getTokens());
-        }
-        else {
-            try {
-                throw new ParseFailedException("Parse failed!--Unsupport SQL:" + lexer.getTokens().get(0).getValue());
-            }
-            catch (ParseFailedException e) {
-                e.printStackTrace();
+        try {
+            // check if the input is a create table statement
+            if ((lexer.getTokens().get(0).getValue().equalsIgnoreCase("CREATE") && lexer.getTokens().get(1).getValue().equalsIgnoreCase("TABLE")) ||
+                    (lexer.getTokens().get(0).getValue().equalsIgnoreCase("CREATE") && lexer.getTokens().get(2).getValue().equalsIgnoreCase("TEMPORARY") && lexer.getTokens().get(3).getValue().equalsIgnoreCase("TABLE"))) {
+                return parseCreateTab(lexer.getTokens());
+            } else if (lexer.getTokens().get(0).getValue().equalsIgnoreCase("INSERT")) {
+                return parseInsert(lexer.getTokens());
+            } else if (lexer.getTokens().get(0).getValue().equalsIgnoreCase("DROP")) {
+                return parseDrop(lexer.getTokens());
+            } else if (lexer.getTokens().get(0).getValue().equalsIgnoreCase("SELECT")) {
+                return parseSelect(lexer.getTokens());
+            } else if (lexer.getTokens().get(0).getValue().equalsIgnoreCase("UPDATE")) {
+                return parseUpdate(lexer.getTokens());
+            } else if (lexer.getTokens().get(0).getValue().equalsIgnoreCase("DELETE")) {
+                return parseDelete(lexer.getTokens());
+            } else if (lexer.getTokens().get(0).getValue().equalsIgnoreCase("ALTER")) {
+                return parseAlterTable(lexer.getTokens());
+            } else if (
+                    (lexer.getTokens().get(0).getValue().equalsIgnoreCase("CREATE") && lexer.getTokens().get(1).getValue().equalsIgnoreCase("OR") && lexer.getTokens().get(2).getValue().equalsIgnoreCase("REPLACE") && lexer.getTokens().get(3).getValue().equalsIgnoreCase("VIEW"))
+                            || (lexer.getTokens().get(0).getValue().equalsIgnoreCase("CREATE") && lexer.getTokens().get(1).getValue().equalsIgnoreCase("VIEW"))
+            ) {
+                return parseCreateView(lexer.getTokens());
+            } else {
+                try {
+                    throw new ParseFailedException("Parse failed!--Unsupport SQL:" + lexer.getTokens().get(0).getValue());
+                } catch (ParseFailedException e) {
+                    e.printStackTrace();
+                }
+                return null;
             }
-            return null;
         }
+        catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
     }
 
     /**
@@ -1210,5 +1217,68 @@ public class OracleParser {
         return root;
     }
 
+    /**
+     * Create view
+     * Grammar: CREATE [OR REPLACE] VIEW view_name [(column_name [, column_name]...)] AS SELECT_statement;
+     * Example: CREATE OR REPLACE VIEW employee_details (full_name, pay)
+     *          AS SELECT first_name, last_name, salary FROM employees;
+     */
+    private ASTNode parseCreateView(List<Token> parseTokens) {
+        List<Token> tokens = new ArrayList<>();
+        ASTNode root = new ViewCreateNode();
+        ASTNode currentNode = root;
+        for (int i = 0; i < parseTokens.size(); i++) {
+            if (parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("CREATE")) {
+                tokens.add(parseTokens.get(i));
+            }
+            else if (parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("OR")) {
+                tokens.add(parseTokens.get(i));
+            }
+            else if (parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("REPLACE")) {
+                tokens.add(parseTokens.get(i));
+            }
+            else if (parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("VIEW")) {
+                tokens.add(parseTokens.get(i));
+                root.setTokens(tokens);
+            }
+            else if (parseTokens.get(i).hasType(Token.TokenType.IDENTIFIER) && currentNode instanceof ViewCreateNode) {
+                tokens = new ArrayList<>();
+                for (int j = i; j < parseTokens.size(); j++) {
+                    if (parseTokens.get(j).hasType(Token.TokenType.KEYWORD) && parseTokens.get(j).getValue().equalsIgnoreCase("AS")) {
+                        i = j - 1;
+                        break;
+                    }
+                    tokens.add(parseTokens.get(j));
+                }
+                ASTNode childNode = new ViewNameNode(tokens);
+                currentNode.addChild(childNode);
+                currentNode = childNode;
+            }
+            else if (parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("AS")) {
+                tokens = new ArrayList<>();
+                tokens.add(parseTokens.get(i));
+                ASTNode childNode = new ViewTargetNode(tokens);
+                currentNode.addChild(childNode);
+                currentNode = childNode;
+                tokens = parseTokens.subList(i + 1, parseTokens.size());
+                ASTNode selectRootNode = parseSelect(tokens);
+                currentNode.addChild(selectRootNode);
+                currentNode = selectRootNode.getDeepestChild();
+                ASTNode viewEndNode = new ViewEndNode();
+                currentNode.addChild(viewEndNode);
+                currentNode = viewEndNode;
+                break;
+            }
+            else {
+                try {
+                    throw new ParseFailedException("Failed to parse:" + parseTokens.get(i));
+                }
+                catch (ParseFailedException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
 
+        return root;
+    }
 }
-- 
Gitee


From aaa152a922c3a5dcbba3dc598c3b6d86f613aecd Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Fri, 13 Sep 2024 21:48:56 +0800
Subject: [PATCH 064/113] add view generate method

---
 sqlTranslate/.idea/workspace.xml              | 27 +++++++-------
 .../java/Document/Update statement in Oracle  |  5 ++-
 .../java/Generator/OpenGaussGenerator.java    | 37 ++++++++++++-------
 sqlTranslate/src/main/java/Main.java          |  2 +-
 .../src/main/java/Parser/OracleParser.java    | 13 +++++--
 5 files changed, 51 insertions(+), 33 deletions(-)

diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
index be45680e..cfd427f1 100644
--- a/sqlTranslate/.idea/workspace.xml
+++ b/sqlTranslate/.idea/workspace.xml
@@ -4,12 +4,11 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add ast class of view">
+    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add view">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Lexer/OracleLexer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Lexer/OracleLexer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Document/Update statement in Oracle" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Document/Update statement in Oracle" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Generator/OpenGaussGenerator.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Generator/OpenGaussGenerator.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Main.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/View/ViewEndNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/View/ViewEndNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/View/ViewNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/View/ViewCreateNode.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -108,13 +107,6 @@
       <option name="presentableId" value="Default" />
       <updated>1723106789329</updated>
     </task>
-    <task id="LOCAL-00012" summary="add function">
-      <created>1724419179050</created>
-      <option name="number" value="00012" />
-      <option name="presentableId" value="LOCAL-00012" />
-      <option name="project" value="LOCAL" />
-      <updated>1724419179050</updated>
-    </task>
     <task id="LOCAL-00013" summary="add function">
       <created>1724423798948</created>
       <option name="number" value="00013" />
@@ -451,7 +443,14 @@
       <option name="project" value="LOCAL" />
       <updated>1726215657277</updated>
     </task>
-    <option name="localTasksCounter" value="61" />
+    <task id="LOCAL-00061" summary="add view">
+      <created>1726234244501</created>
+      <option name="number" value="00061" />
+      <option name="presentableId" value="LOCAL-00061" />
+      <option name="project" value="LOCAL" />
+      <updated>1726234244501</updated>
+    </task>
+    <option name="localTasksCounter" value="62" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
@@ -466,7 +465,6 @@
     </option>
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="add select" />
     <MESSAGE value="add case when" />
     <MESSAGE value="add pattern of functions in select" />
     <MESSAGE value="add some comments" />
@@ -491,7 +489,8 @@
     <MESSAGE value="add view document" />
     <MESSAGE value="add keywords of view" />
     <MESSAGE value="add ast class of view" />
-    <option name="LAST_COMMIT_MESSAGE" value="add ast class of view" />
+    <MESSAGE value="add view" />
+    <option name="LAST_COMMIT_MESSAGE" value="add view" />
   </component>
   <component name="XDebuggerManager">
     <watches-manager>
diff --git a/sqlTranslate/src/main/java/Document/Update statement in Oracle b/sqlTranslate/src/main/java/Document/Update statement in Oracle
index 121d2a59..fa215a03 100644
--- a/sqlTranslate/src/main/java/Document/Update statement in Oracle	
+++ b/sqlTranslate/src/main/java/Document/Update statement in Oracle	
@@ -1 +1,4 @@
-UPDATE table_name SET column1 = value1, column2 = value2, ... WHERE condition;
\ No newline at end of file
+UPDATE table_name SET column1 = value1, column2 = value2, ... WHERE condition;
+
+Example: UPDATE employees e JOIN departments d using e.department_id = d.department_id
+         SET e.salary = e.salary * 1.10, d.budget = d.budget * 1.10 WHERE d.department_name = 'Sales';
\ No newline at end of file
diff --git a/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java b/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java
index 6a1de0ae..ce4967e8 100644
--- a/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java
+++ b/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java
@@ -19,6 +19,7 @@ import Parser.AST.Select.SelectNode;
 import Parser.AST.Select.SelectObjNode;
 import Parser.AST.Update.UpdateNode;
 import Parser.AST.Update.UpdateObjNode;
+import Parser.AST.View.ViewCreateNode;
 import Parser.OracleParser;
 
 import java.util.ArrayList;
@@ -59,6 +60,9 @@ public class OpenGaussGenerator {
         else if (node instanceof AlterNode) {
             return GenAlterSQL(node);
         }
+        else if (node instanceof ViewCreateNode) {
+            return GenCreateViewSQL(node);
+        }
         else {
             try {
                 throw new GenerateFailedException("Root node:" + node.getClass() + "(Unsupported node type!)");
@@ -88,7 +92,7 @@ public class OpenGaussGenerator {
     }
 
     private String GenSelectSQL(ASTNode node) {
-        visitSelect(node, null);
+        visitSelect(node);
 //        System.out.println(node.getASTString());
         return node.toQueryString();
     }
@@ -114,6 +118,11 @@ public class OpenGaussGenerator {
         return node.toQueryString();
     }
 
+    private String GenCreateViewSQL(ASTNode node) {
+        visitCreateView(node);
+        return node.toQueryString();
+    }
+
     private void visitCrt(ASTNode node) {
         if (node instanceof ColumnNode) {
             ColumnTypeConvert((ColumnNode) node);
@@ -153,21 +162,12 @@ public class OpenGaussGenerator {
         }
     }
 
-    private void visitSelect(ASTNode node, ASTNode parentNode) {
-        if (node instanceof SelectObjNode) {
-            // check whether there exists a join statement in the select sql
-            if (node.getTokens().contains(new Token(Token.TokenType.KEYWORD, "JOIN"))) {
-                ASTNode joinRootNode = OracleParser.parseJoin(node.getTokens());
-                visitJoin(joinRootNode);
-                parentNode.replaceChild(node, joinRootNode);
-                ASTNode smallestChild = joinRootNode.getDeepestChild();
-                for (ASTNode child : node.getChildren()) {
-                    smallestChild.addChild(child);
-                }
-            }
+    private void visitSelect(ASTNode node) {
+        if (node instanceof JoinSourceTabNode) {
+            visitJoin(node);
         }
         for (ASTNode child : node.getChildren()) {
-            visitSelect(child, node);
+            visitSelect(child);
         }
     }
 
@@ -201,6 +201,15 @@ public class OpenGaussGenerator {
         }
     }
 
+    private void visitCreateView(ASTNode node) {
+        if (node instanceof SelectNode) {
+            visitSelect(node);
+        }
+        for (ASTNode child : node.getChildren()) {
+            visitCreateView(child);
+        }
+    }
+
     private void ColumnTypeConvert(ColumnType node) {
         // type convert
         if (node.getType().getValue().equalsIgnoreCase("NUMBER")) {
diff --git a/sqlTranslate/src/main/java/Main.java b/sqlTranslate/src/main/java/Main.java
index b2bb58be..5b072bf9 100644
--- a/sqlTranslate/src/main/java/Main.java
+++ b/sqlTranslate/src/main/java/Main.java
@@ -32,7 +32,7 @@ public class Main {
 //                ");";
 //        String sql = "ALTER TABLE employees ADD email VARCHAR2(100) Check (email != '12813@163.com');";
 //        String sql = "CASE WHEN column2 > 0 THEN 'Positive' ELSE 'Non-positive' END";
-        String sql = "CREATE OR REPLACE VIEW emp_dept_info AS SELECT e.first_name, e.last_name, d.department_name FROM employees e JOIN departments d ON e.department_id = d.department_id;";
+        String sql = "CREATE OR REPLACE VIEW emp_dept_info AS SELECT e.first_name, e.last_name, d.department_name FROM employees e JOIN departments d Using e.department_id = d.department_id;";
         OracleLexer lexer = new OracleLexer(sql);
         lexer.printTokens();
         OracleParser parser = new OracleParser(lexer);
diff --git a/sqlTranslate/src/main/java/Parser/OracleParser.java b/sqlTranslate/src/main/java/Parser/OracleParser.java
index b9dd3a6a..6bff97fc 100644
--- a/sqlTranslate/src/main/java/Parser/OracleParser.java
+++ b/sqlTranslate/src/main/java/Parser/OracleParser.java
@@ -450,9 +450,16 @@ public class OracleParser {
                     }
                     tokens.add(parseTokens.get(j));
                 }
-                ASTNode childNode = new SelectObjNode(tokens);
-                currentNode.addChild(childNode);
-                currentNode = childNode;
+                if (tokens.contains(new Token(Token.TokenType.KEYWORD, "JOIN"))) {
+                    ASTNode joinRootNode = parseJoin(tokens);
+                    currentNode.addChild(joinRootNode);
+                    currentNode = joinRootNode.getDeepestChild();
+                }
+                else {
+                    ASTNode childNode = new SelectObjNode(tokens);
+                    currentNode.addChild(childNode);
+                    currentNode = childNode;
+                }
             }
             // match where_clause (possible last token: ; | GROUP | ORDER | HAVING | UNION)
             else if (parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("WHERE")) {
-- 
Gitee


From beb88c7510ce4838b1955c28d5446aaecf51f6e4 Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Fri, 13 Sep 2024 21:55:02 +0800
Subject: [PATCH 065/113] revise

---
 sqlTranslate/.idea/workspace.xml              | 24 +++++++++----------
 .../java/Generator/OpenGaussGenerator.java    | 19 ++++-----------
 .../src/main/java/Parser/OracleParser.java    | 14 ++++++++---
 3 files changed, 27 insertions(+), 30 deletions(-)

diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
index cfd427f1..6bfef674 100644
--- a/sqlTranslate/.idea/workspace.xml
+++ b/sqlTranslate/.idea/workspace.xml
@@ -4,9 +4,7 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add view">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Document/Update statement in Oracle" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Document/Update statement in Oracle" afterDir="false" />
+    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add view generate method">
       <change beforePath="$PROJECT_DIR$/src/main/java/Generator/OpenGaussGenerator.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Generator/OpenGaussGenerator.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Main.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" afterDir="false" />
@@ -107,13 +105,6 @@
       <option name="presentableId" value="Default" />
       <updated>1723106789329</updated>
     </task>
-    <task id="LOCAL-00013" summary="add function">
-      <created>1724423798948</created>
-      <option name="number" value="00013" />
-      <option name="presentableId" value="LOCAL-00013" />
-      <option name="project" value="LOCAL" />
-      <updated>1724423798948</updated>
-    </task>
     <task id="LOCAL-00014" summary="add function">
       <created>1724425628008</created>
       <option name="number" value="00014" />
@@ -450,7 +441,14 @@
       <option name="project" value="LOCAL" />
       <updated>1726234244501</updated>
     </task>
-    <option name="localTasksCounter" value="62" />
+    <task id="LOCAL-00062" summary="add view generate method">
+      <created>1726235338624</created>
+      <option name="number" value="00062" />
+      <option name="presentableId" value="LOCAL-00062" />
+      <option name="project" value="LOCAL" />
+      <updated>1726235338624</updated>
+    </task>
+    <option name="localTasksCounter" value="63" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
@@ -465,7 +463,6 @@
     </option>
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="add case when" />
     <MESSAGE value="add pattern of functions in select" />
     <MESSAGE value="add some comments" />
     <MESSAGE value="add parseSelect" />
@@ -490,7 +487,8 @@
     <MESSAGE value="add keywords of view" />
     <MESSAGE value="add ast class of view" />
     <MESSAGE value="add view" />
-    <option name="LAST_COMMIT_MESSAGE" value="add view" />
+    <MESSAGE value="add view generate method" />
+    <option name="LAST_COMMIT_MESSAGE" value="add view generate method" />
   </component>
   <component name="XDebuggerManager">
     <watches-manager>
diff --git a/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java b/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java
index ce4967e8..031591ed 100644
--- a/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java
+++ b/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java
@@ -103,7 +103,7 @@ public class OpenGaussGenerator {
     }
 
     private String GenUpdateSQL(ASTNode node) {
-        visitUpdate(node, null);
+        visitUpdate(node);
 //        System.out.println(node.getASTString());
         return node.toQueryString();
     }
@@ -171,21 +171,12 @@ public class OpenGaussGenerator {
         }
     }
 
-    private void visitUpdate(ASTNode node, ASTNode parentNode) {
-        if (node instanceof UpdateObjNode) {
-            // check whether there exists a join statement in the select sql
-            if (node.getTokens().contains(new Token(Token.TokenType.KEYWORD, "JOIN"))) {
-                ASTNode joinRootNode = OracleParser.parseJoin(node.getTokens());
-                visitJoin(joinRootNode);
-                parentNode.replaceChild(node, joinRootNode);
-                ASTNode smallestChild = joinRootNode.getDeepestChild();
-                for (ASTNode child : node.getChildren()) {
-                    smallestChild.addChild(child);
-                }
-            }
+    private void visitUpdate(ASTNode node) {
+        if (node instanceof JoinSourceTabNode) {
+            visitJoin(node);
         }
         for (ASTNode child : node.getChildren()) {
-            visitUpdate(child, node);
+            visitUpdate(child);
         }
     }
 
diff --git a/sqlTranslate/src/main/java/Parser/OracleParser.java b/sqlTranslate/src/main/java/Parser/OracleParser.java
index 6bff97fc..bd4b5cdf 100644
--- a/sqlTranslate/src/main/java/Parser/OracleParser.java
+++ b/sqlTranslate/src/main/java/Parser/OracleParser.java
@@ -801,9 +801,17 @@ public class OracleParser {
                     }
                     tokens.add(parseTokens.get(j));
                 }
-                ASTNode childNode = new UpdateObjNode(tokens);
-                currentNode.addChild(childNode);
-                currentNode = childNode;
+                if (tokens.contains(new Token(Token.TokenType.KEYWORD, "JOIN"))) {
+                    ASTNode joinRootNode = parseJoin(tokens);
+                    currentNode.addChild(joinRootNode);
+                    currentNode = joinRootNode.getDeepestChild();
+                }
+                else {
+                    ASTNode childNode = new UpdateObjNode(tokens);
+                    currentNode.addChild(childNode);
+                    currentNode = childNode;
+                }
+
             }
             else if (parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("SET")) {
                 // match SET
-- 
Gitee


From 86e2716d53050f851a202572df8540d62d441a1a Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Fri, 13 Sep 2024 22:14:27 +0800
Subject: [PATCH 066/113] add if elseif else endif document

---
 sqlTranslate/.idea/workspace.xml              | 29 ++++++++++---------
 .../java/Document/IF ELSEIF ELSE in Oracle    | 14 +++++++++
 sqlTranslate/src/main/java/Document/Todolist  |  2 +-
 .../src/main/java/Lexer/OracleLexer.java      |  3 ++
 4 files changed, 33 insertions(+), 15 deletions(-)
 create mode 100644 sqlTranslate/src/main/java/Document/IF ELSEIF ELSE in Oracle

diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
index 6bfef674..311a6990 100644
--- a/sqlTranslate/.idea/workspace.xml
+++ b/sqlTranslate/.idea/workspace.xml
@@ -4,10 +4,11 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add view generate method">
-      <change beforePath="$PROJECT_DIR$/src/main/java/Generator/OpenGaussGenerator.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Generator/OpenGaussGenerator.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Main.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" afterDir="false" />
+    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="revise">
+      <change afterPath="$PROJECT_DIR$/src/main/java/Document/IF ELSEIF ELSE in Oracle" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Document/Todolist" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Document/Todolist" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Lexer/OracleLexer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Lexer/OracleLexer.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -105,13 +106,6 @@
       <option name="presentableId" value="Default" />
       <updated>1723106789329</updated>
     </task>
-    <task id="LOCAL-00014" summary="add function">
-      <created>1724425628008</created>
-      <option name="number" value="00014" />
-      <option name="presentableId" value="LOCAL-00014" />
-      <option name="project" value="LOCAL" />
-      <updated>1724425628008</updated>
-    </task>
     <task id="LOCAL-00015" summary="add function">
       <created>1724472081080</created>
       <option name="number" value="00015" />
@@ -448,7 +442,14 @@
       <option name="project" value="LOCAL" />
       <updated>1726235338624</updated>
     </task>
-    <option name="localTasksCounter" value="63" />
+    <task id="LOCAL-00063" summary="revise">
+      <created>1726235703488</created>
+      <option name="number" value="00063" />
+      <option name="presentableId" value="LOCAL-00063" />
+      <option name="project" value="LOCAL" />
+      <updated>1726235703488</updated>
+    </task>
+    <option name="localTasksCounter" value="64" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
@@ -480,7 +481,6 @@
     <MESSAGE value="add alter table ast class" />
     <MESSAGE value="add alter table keywords" />
     <MESSAGE value="add alter table parser" />
-    <MESSAGE value="revise" />
     <MESSAGE value="add alter" />
     <MESSAGE value="fix some bugs" />
     <MESSAGE value="add view document" />
@@ -488,7 +488,8 @@
     <MESSAGE value="add ast class of view" />
     <MESSAGE value="add view" />
     <MESSAGE value="add view generate method" />
-    <option name="LAST_COMMIT_MESSAGE" value="add view generate method" />
+    <MESSAGE value="revise" />
+    <option name="LAST_COMMIT_MESSAGE" value="revise" />
   </component>
   <component name="XDebuggerManager">
     <watches-manager>
diff --git a/sqlTranslate/src/main/java/Document/IF ELSEIF ELSE in Oracle b/sqlTranslate/src/main/java/Document/IF ELSEIF ELSE in Oracle
new file mode 100644
index 00000000..89dcc984
--- /dev/null
+++ b/sqlTranslate/src/main/java/Document/IF ELSEIF ELSE in Oracle	
@@ -0,0 +1,14 @@
+IF condition1 THEN ...
+(ELSIF condition2 THEN ...)*
+[ELSE...]
+END IF;
+
+Example: IF v_salary >= 100000 THEN
+                 v_bonus := v_salary * 0.1;
+             ELSIF v_salary >= 50000 THEN
+                 v_bonus := v_salary * 0.08;
+             ELSIF v_salary >= 30000 THEN
+                 v_bonus := v_salary * 0.05;
+             ELSE
+                 v_bonus := v_salary * 0.03;
+             END IF;
\ No newline at end of file
diff --git a/sqlTranslate/src/main/java/Document/Todolist b/sqlTranslate/src/main/java/Document/Todolist
index a1576e7d..3ca9c4be 100644
--- a/sqlTranslate/src/main/java/Document/Todolist
+++ b/sqlTranslate/src/main/java/Document/Todolist
@@ -21,7 +21,7 @@ Operation
  drop table 1
 Object
  table 1
- view
+ view 1
  function
  procedure
  trigger
\ No newline at end of file
diff --git a/sqlTranslate/src/main/java/Lexer/OracleLexer.java b/sqlTranslate/src/main/java/Lexer/OracleLexer.java
index 04e721e2..48fb4644 100644
--- a/sqlTranslate/src/main/java/Lexer/OracleLexer.java
+++ b/sqlTranslate/src/main/java/Lexer/OracleLexer.java
@@ -29,6 +29,8 @@ public class OracleLexer {
             , "ALTER", "ADD", "DROP", "MODIFY", "RENAME", "TO", "COLUMN"
             // keywords of view
             , "REPLACE", "VIEW"
+            // PL/SQL
+            , ":="
     };
     private static final Pattern TOKEN_PATTERN = Pattern.compile(
             "(NUMBER\\(.*?\\))|" +                     // NUMBER() function
@@ -68,6 +70,7 @@ public class OracleLexer {
                     "(FULL OUTER JOIN)|" +
                     "(CROSS JOIN)|" +
                     "(\\|\\|)|" +
+                    "(:=)|" +
 
 
                     "(\\b[A-Za-z_][A-Za-z0-9_]*(\\.[A-Za-z_][A-Za-z0-9_]*)*\\b)|" + // Keywords and identifiers
-- 
Gitee


From dad5afc2fd872dcabe44b3f228b6733544cbc13f Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Fri, 13 Sep 2024 22:49:32 +0800
Subject: [PATCH 067/113] add if elseif else endif ast classes

---
 sqlTranslate/.idea/workspace.xml              | 30 +++++++++++--------
 .../src/main/java/Lexer/OracleLexer.java      |  2 +-
 .../java/Parser/AST/IFELSIF/ELSENode.java     | 24 +++++++++++++++
 .../AST/IFELSIF/ELSIFConditionNode.java       | 25 ++++++++++++++++
 .../Parser/AST/IFELSIF/ElSIFActionNode.java   | 24 +++++++++++++++
 .../java/Parser/AST/IFELSIF/EndIFNode.java    | 24 +++++++++++++++
 .../java/Parser/AST/IFELSIF/IFActionNode.java | 24 +++++++++++++++
 .../Parser/AST/IFELSIF/IFConditionNode.java   | 24 +++++++++++++++
 8 files changed, 163 insertions(+), 14 deletions(-)
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/IFELSIF/ELSENode.java
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/IFELSIF/ELSIFConditionNode.java
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/IFELSIF/ElSIFActionNode.java
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/IFELSIF/EndIFNode.java
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/IFELSIF/IFActionNode.java
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/IFELSIF/IFConditionNode.java

diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
index 311a6990..a584bd42 100644
--- a/sqlTranslate/.idea/workspace.xml
+++ b/sqlTranslate/.idea/workspace.xml
@@ -4,10 +4,14 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="revise">
-      <change afterPath="$PROJECT_DIR$/src/main/java/Document/IF ELSEIF ELSE in Oracle" afterDir="false" />
+    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add if elseif else endif document">
+      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/IFELSIF/ELSENode.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/IFELSIF/ELSIFConditionNode.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/IFELSIF/ElSIFActionNode.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/IFELSIF/EndIFNode.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/IFELSIF/IFActionNode.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/IFELSIF/IFConditionNode.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Document/Todolist" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Document/Todolist" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/Lexer/OracleLexer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Lexer/OracleLexer.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -106,13 +110,6 @@
       <option name="presentableId" value="Default" />
       <updated>1723106789329</updated>
     </task>
-    <task id="LOCAL-00015" summary="add function">
-      <created>1724472081080</created>
-      <option name="number" value="00015" />
-      <option name="presentableId" value="LOCAL-00015" />
-      <option name="project" value="LOCAL" />
-      <updated>1724472081080</updated>
-    </task>
     <task id="LOCAL-00016" summary="add function">
       <created>1724487486717</created>
       <option name="number" value="00016" />
@@ -449,7 +446,14 @@
       <option name="project" value="LOCAL" />
       <updated>1726235703488</updated>
     </task>
-    <option name="localTasksCounter" value="64" />
+    <task id="LOCAL-00064" summary="add if elseif else endif document">
+      <created>1726236869086</created>
+      <option name="number" value="00064" />
+      <option name="presentableId" value="LOCAL-00064" />
+      <option name="project" value="LOCAL" />
+      <updated>1726236869087</updated>
+    </task>
+    <option name="localTasksCounter" value="65" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
@@ -464,7 +468,6 @@
     </option>
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="add pattern of functions in select" />
     <MESSAGE value="add some comments" />
     <MESSAGE value="add parseSelect" />
     <MESSAGE value="add join pattern" />
@@ -489,7 +492,8 @@
     <MESSAGE value="add view" />
     <MESSAGE value="add view generate method" />
     <MESSAGE value="revise" />
-    <option name="LAST_COMMIT_MESSAGE" value="revise" />
+    <MESSAGE value="add if elseif else endif document" />
+    <option name="LAST_COMMIT_MESSAGE" value="add if elseif else endif document" />
   </component>
   <component name="XDebuggerManager">
     <watches-manager>
diff --git a/sqlTranslate/src/main/java/Lexer/OracleLexer.java b/sqlTranslate/src/main/java/Lexer/OracleLexer.java
index 48fb4644..fe2c6239 100644
--- a/sqlTranslate/src/main/java/Lexer/OracleLexer.java
+++ b/sqlTranslate/src/main/java/Lexer/OracleLexer.java
@@ -30,7 +30,7 @@ public class OracleLexer {
             // keywords of view
             , "REPLACE", "VIEW"
             // PL/SQL
-            , ":="
+            , ":=", "IF", "ELSIF"
     };
     private static final Pattern TOKEN_PATTERN = Pattern.compile(
             "(NUMBER\\(.*?\\))|" +                     // NUMBER() function
diff --git a/sqlTranslate/src/main/java/Parser/AST/IFELSIF/ELSENode.java b/sqlTranslate/src/main/java/Parser/AST/IFELSIF/ELSENode.java
new file mode 100644
index 00000000..3e07790e
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/IFELSIF/ELSENode.java
@@ -0,0 +1,24 @@
+package Parser.AST.IFELSIF;
+
+import Lexer.Token;
+import Parser.AST.ASTNode;
+
+import java.util.List;
+
+public class ELSENode extends ASTNode {
+    public ELSENode(ASTNode node) {
+        super(node);
+    }
+
+    public ELSENode(List<Token> tokens) {
+        super(tokens);
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString) {
+        queryString.append(toString() + " ");
+        for (ASTNode child : node.getChildren()) {
+            child.visit(child, queryString);
+        }
+    }
+}
diff --git a/sqlTranslate/src/main/java/Parser/AST/IFELSIF/ELSIFConditionNode.java b/sqlTranslate/src/main/java/Parser/AST/IFELSIF/ELSIFConditionNode.java
new file mode 100644
index 00000000..89bca15f
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/IFELSIF/ELSIFConditionNode.java
@@ -0,0 +1,25 @@
+package Parser.AST.IFELSIF;
+
+import Lexer.Token;
+import Parser.AST.ASTNode;
+
+import java.util.List;
+
+public class ELSIFConditionNode extends ASTNode {
+    public ELSIFConditionNode(ASTNode node) {
+        super(node);
+    }
+
+    public ELSIFConditionNode(List<Token> tokens) {
+        super(tokens);
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString) {
+        queryString.append(toString() + " ");
+        for (ASTNode child : node.getChildren()) {
+            child.visit(child, queryString);
+        }
+    }
+}
+
diff --git a/sqlTranslate/src/main/java/Parser/AST/IFELSIF/ElSIFActionNode.java b/sqlTranslate/src/main/java/Parser/AST/IFELSIF/ElSIFActionNode.java
new file mode 100644
index 00000000..a4e403bc
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/IFELSIF/ElSIFActionNode.java
@@ -0,0 +1,24 @@
+package Parser.AST.IFELSIF;
+
+import Lexer.Token;
+import Parser.AST.ASTNode;
+
+import java.util.List;
+
+public class ElSIFActionNode extends ASTNode {
+    public ElSIFActionNode(ASTNode node) {
+        super(node);
+    }
+
+    public ElSIFActionNode(List<Token> tokens) {
+        super(tokens);
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString) {
+        queryString.append(toString() + " ");
+        for (ASTNode child : node.getChildren()) {
+            child.visit(child, queryString);
+        }
+    }
+}
diff --git a/sqlTranslate/src/main/java/Parser/AST/IFELSIF/EndIFNode.java b/sqlTranslate/src/main/java/Parser/AST/IFELSIF/EndIFNode.java
new file mode 100644
index 00000000..5eaf727a
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/IFELSIF/EndIFNode.java
@@ -0,0 +1,24 @@
+package Parser.AST.IFELSIF;
+
+import Lexer.Token;
+import Parser.AST.ASTNode;
+
+import java.util.List;
+
+public class EndIFNode extends ASTNode {
+    public EndIFNode (ASTNode node) {
+        super(node);
+    }
+
+    public EndIFNode (List<Token> tokens) {
+        super(tokens);
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString) {
+        queryString.append(toString());
+        for (ASTNode child : node.getChildren()) {
+            child.visit(child, queryString);
+        }
+    }
+}
diff --git a/sqlTranslate/src/main/java/Parser/AST/IFELSIF/IFActionNode.java b/sqlTranslate/src/main/java/Parser/AST/IFELSIF/IFActionNode.java
new file mode 100644
index 00000000..2a141ce9
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/IFELSIF/IFActionNode.java
@@ -0,0 +1,24 @@
+package Parser.AST.IFELSIF;
+
+import Lexer.Token;
+import Parser.AST.ASTNode;
+
+import java.util.List;
+
+public class IFActionNode extends ASTNode {
+    public IFActionNode(ASTNode node) {
+        super(node);
+    }
+
+    public IFActionNode(List<Token> tokens) {
+        super(tokens);
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString) {
+        queryString.append(toString() + " ");
+        for (ASTNode child : node.getChildren()) {
+            child.visit(child, queryString);
+        }
+    }
+}
diff --git a/sqlTranslate/src/main/java/Parser/AST/IFELSIF/IFConditionNode.java b/sqlTranslate/src/main/java/Parser/AST/IFELSIF/IFConditionNode.java
new file mode 100644
index 00000000..2a673a6f
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/IFELSIF/IFConditionNode.java
@@ -0,0 +1,24 @@
+package Parser.AST.IFELSIF;
+
+import Lexer.Token;
+import Parser.AST.ASTNode;
+
+import java.util.List;
+
+public class IFConditionNode extends ASTNode {
+    public IFConditionNode(ASTNode node) {
+        super(node);
+    }
+
+    public IFConditionNode(List<Token> tokens) {
+        super(tokens);
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString) {
+        queryString.append(toString() + " ");
+        for (ASTNode child : node.getChildren()) {
+            child.visit(child, queryString);
+        }
+    }
+}
-- 
Gitee


From 5d49c5bb3d95208e258cdcb8c23548bd5f4e8dde Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Fri, 13 Sep 2024 23:35:47 +0800
Subject: [PATCH 068/113] add IF ELSIF

---
 sqlTranslate/.idea/workspace.xml              | 30 ++++++++-----------
 .../src/main/java/Parser/OracleParser.java    | 13 ++++++++
 2 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
index a584bd42..2785af1d 100644
--- a/sqlTranslate/.idea/workspace.xml
+++ b/sqlTranslate/.idea/workspace.xml
@@ -4,15 +4,9 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add if elseif else endif document">
-      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/IFELSIF/ELSENode.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/IFELSIF/ELSIFConditionNode.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/IFELSIF/ElSIFActionNode.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/IFELSIF/EndIFNode.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/IFELSIF/IFActionNode.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/IFELSIF/IFConditionNode.java" afterDir="false" />
+    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add if elseif else endif ast classes">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Lexer/OracleLexer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Lexer/OracleLexer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -110,13 +104,6 @@
       <option name="presentableId" value="Default" />
       <updated>1723106789329</updated>
     </task>
-    <task id="LOCAL-00016" summary="add function">
-      <created>1724487486717</created>
-      <option name="number" value="00016" />
-      <option name="presentableId" value="LOCAL-00016" />
-      <option name="project" value="LOCAL" />
-      <updated>1724487486717</updated>
-    </task>
     <task id="LOCAL-00017" summary="coding">
       <created>1724506701566</created>
       <option name="number" value="00017" />
@@ -453,7 +440,14 @@
       <option name="project" value="LOCAL" />
       <updated>1726236869087</updated>
     </task>
-    <option name="localTasksCounter" value="65" />
+    <task id="LOCAL-00065" summary="add if elseif else endif ast classes">
+      <created>1726238974056</created>
+      <option name="number" value="00065" />
+      <option name="presentableId" value="LOCAL-00065" />
+      <option name="project" value="LOCAL" />
+      <updated>1726238974056</updated>
+    </task>
+    <option name="localTasksCounter" value="66" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
@@ -468,7 +462,6 @@
     </option>
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="add some comments" />
     <MESSAGE value="add parseSelect" />
     <MESSAGE value="add join pattern" />
     <MESSAGE value="add join class" />
@@ -493,7 +486,8 @@
     <MESSAGE value="add view generate method" />
     <MESSAGE value="revise" />
     <MESSAGE value="add if elseif else endif document" />
-    <option name="LAST_COMMIT_MESSAGE" value="add if elseif else endif document" />
+    <MESSAGE value="add if elseif else endif ast classes" />
+    <option name="LAST_COMMIT_MESSAGE" value="add if elseif else endif ast classes" />
   </component>
   <component name="XDebuggerManager">
     <watches-manager>
diff --git a/sqlTranslate/src/main/java/Parser/OracleParser.java b/sqlTranslate/src/main/java/Parser/OracleParser.java
index bd4b5cdf..b3a43d56 100644
--- a/sqlTranslate/src/main/java/Parser/OracleParser.java
+++ b/sqlTranslate/src/main/java/Parser/OracleParser.java
@@ -544,6 +544,19 @@ public class OracleParser {
         return root;
     }
 
+    /**
+     * IF condition1 THEN ...
+     * (ELSIF condition2 THEN ...)*
+     * [ELSE...]
+     * END IF;
+     * @param parseTokens should start with IF
+     */
+    public static ASTNode parseIFELSE(List<Token> parseTokens) {
+        //TODO: implement
+        return null;
+    }
+
+
     /**
      * CASE WHEN expr THEN expr [ELSE expr] END
      * @param parseTokens should start with CASE
-- 
Gitee


From 3f81250c9c3fd8b555153dbc73e97a500f8e7b2b Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Sat, 14 Sep 2024 11:36:08 +0800
Subject: [PATCH 069/113] add IF ELSIF

---
 sqlTranslate/.idea/workspace.xml              | 29 ++++++++++++-------
 .../src/main/java/Parser/AST/ASTNode.java     |  4 +++
 .../java/Parser/AST/IFELSIF/ELSENode.java     |  4 +++
 .../AST/IFELSIF/ELSIFConditionNode.java       |  4 +++
 .../Parser/AST/IFELSIF/ElSIFActionNode.java   |  4 +++
 .../java/Parser/AST/IFELSIF/EndIFNode.java    |  4 +++
 .../java/Parser/AST/IFELSIF/IFActionNode.java |  4 +++
 .../Parser/AST/IFELSIF/IFConditionNode.java   |  4 +++
 .../src/main/java/Parser/OracleParser.java    |  8 +++--
 9 files changed, 52 insertions(+), 13 deletions(-)

diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
index 2785af1d..a6e79dec 100644
--- a/sqlTranslate/.idea/workspace.xml
+++ b/sqlTranslate/.idea/workspace.xml
@@ -4,8 +4,15 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add if elseif else endif ast classes">
+    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add IF ELSIF">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/ASTNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/ASTNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/IFELSIF/ELSENode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/IFELSIF/ELSENode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/IFELSIF/ELSIFConditionNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/IFELSIF/ELSIFConditionNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/IFELSIF/ElSIFActionNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/IFELSIF/ElSIFActionNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/IFELSIF/EndIFNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/IFELSIF/EndIFNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/IFELSIF/IFActionNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/IFELSIF/IFActionNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/IFELSIF/IFConditionNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/IFELSIF/IFConditionNode.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -104,13 +111,6 @@
       <option name="presentableId" value="Default" />
       <updated>1723106789329</updated>
     </task>
-    <task id="LOCAL-00017" summary="coding">
-      <created>1724506701566</created>
-      <option name="number" value="00017" />
-      <option name="presentableId" value="LOCAL-00017" />
-      <option name="project" value="LOCAL" />
-      <updated>1724506701566</updated>
-    </task>
     <task id="LOCAL-00018" summary="coding">
       <created>1724507228242</created>
       <option name="number" value="00018" />
@@ -447,7 +447,14 @@
       <option name="project" value="LOCAL" />
       <updated>1726238974056</updated>
     </task>
-    <option name="localTasksCounter" value="66" />
+    <task id="LOCAL-00066" summary="add IF ELSIF">
+      <created>1726241748943</created>
+      <option name="number" value="00066" />
+      <option name="presentableId" value="LOCAL-00066" />
+      <option name="project" value="LOCAL" />
+      <updated>1726241748943</updated>
+    </task>
+    <option name="localTasksCounter" value="67" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
@@ -462,7 +469,6 @@
     </option>
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="add parseSelect" />
     <MESSAGE value="add join pattern" />
     <MESSAGE value="add join class" />
     <MESSAGE value="add join" />
@@ -487,7 +493,8 @@
     <MESSAGE value="revise" />
     <MESSAGE value="add if elseif else endif document" />
     <MESSAGE value="add if elseif else endif ast classes" />
-    <option name="LAST_COMMIT_MESSAGE" value="add if elseif else endif ast classes" />
+    <MESSAGE value="add IF ELSIF" />
+    <option name="LAST_COMMIT_MESSAGE" value="add IF ELSIF" />
   </component>
   <component name="XDebuggerManager">
     <watches-manager>
diff --git a/sqlTranslate/src/main/java/Parser/AST/ASTNode.java b/sqlTranslate/src/main/java/Parser/AST/ASTNode.java
index 1df1d867..bed4c61a 100644
--- a/sqlTranslate/src/main/java/Parser/AST/ASTNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/ASTNode.java
@@ -31,6 +31,10 @@ public abstract class ASTNode {
         this.tokens = tokens;
     }
 
+    public void addToken(Token token) {
+        tokens.add(token);
+    }
+
     public boolean tokensEqual(List<Token> tokens) {
         if (this.tokens.size() != tokens.size())
             return false;
diff --git a/sqlTranslate/src/main/java/Parser/AST/IFELSIF/ELSENode.java b/sqlTranslate/src/main/java/Parser/AST/IFELSIF/ELSENode.java
index 3e07790e..c114d7ed 100644
--- a/sqlTranslate/src/main/java/Parser/AST/IFELSIF/ELSENode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/IFELSIF/ELSENode.java
@@ -6,6 +6,10 @@ import Parser.AST.ASTNode;
 import java.util.List;
 
 public class ELSENode extends ASTNode {
+    public ELSENode() {
+        super();
+    }
+
     public ELSENode(ASTNode node) {
         super(node);
     }
diff --git a/sqlTranslate/src/main/java/Parser/AST/IFELSIF/ELSIFConditionNode.java b/sqlTranslate/src/main/java/Parser/AST/IFELSIF/ELSIFConditionNode.java
index 89bca15f..9b9e2c76 100644
--- a/sqlTranslate/src/main/java/Parser/AST/IFELSIF/ELSIFConditionNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/IFELSIF/ELSIFConditionNode.java
@@ -6,6 +6,10 @@ import Parser.AST.ASTNode;
 import java.util.List;
 
 public class ELSIFConditionNode extends ASTNode {
+    public ELSIFConditionNode() {
+        super();
+    }
+
     public ELSIFConditionNode(ASTNode node) {
         super(node);
     }
diff --git a/sqlTranslate/src/main/java/Parser/AST/IFELSIF/ElSIFActionNode.java b/sqlTranslate/src/main/java/Parser/AST/IFELSIF/ElSIFActionNode.java
index a4e403bc..20d72bc1 100644
--- a/sqlTranslate/src/main/java/Parser/AST/IFELSIF/ElSIFActionNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/IFELSIF/ElSIFActionNode.java
@@ -6,6 +6,10 @@ import Parser.AST.ASTNode;
 import java.util.List;
 
 public class ElSIFActionNode extends ASTNode {
+    public ElSIFActionNode() {
+        super();
+    }
+
     public ElSIFActionNode(ASTNode node) {
         super(node);
     }
diff --git a/sqlTranslate/src/main/java/Parser/AST/IFELSIF/EndIFNode.java b/sqlTranslate/src/main/java/Parser/AST/IFELSIF/EndIFNode.java
index 5eaf727a..00d84681 100644
--- a/sqlTranslate/src/main/java/Parser/AST/IFELSIF/EndIFNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/IFELSIF/EndIFNode.java
@@ -6,6 +6,10 @@ import Parser.AST.ASTNode;
 import java.util.List;
 
 public class EndIFNode extends ASTNode {
+    public EndIFNode() {
+        super();
+    }
+
     public EndIFNode (ASTNode node) {
         super(node);
     }
diff --git a/sqlTranslate/src/main/java/Parser/AST/IFELSIF/IFActionNode.java b/sqlTranslate/src/main/java/Parser/AST/IFELSIF/IFActionNode.java
index 2a141ce9..8b8df211 100644
--- a/sqlTranslate/src/main/java/Parser/AST/IFELSIF/IFActionNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/IFELSIF/IFActionNode.java
@@ -6,6 +6,10 @@ import Parser.AST.ASTNode;
 import java.util.List;
 
 public class IFActionNode extends ASTNode {
+    public IFActionNode() {
+        super();
+    }
+
     public IFActionNode(ASTNode node) {
         super(node);
     }
diff --git a/sqlTranslate/src/main/java/Parser/AST/IFELSIF/IFConditionNode.java b/sqlTranslate/src/main/java/Parser/AST/IFELSIF/IFConditionNode.java
index 2a673a6f..5fe23cc1 100644
--- a/sqlTranslate/src/main/java/Parser/AST/IFELSIF/IFConditionNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/IFELSIF/IFConditionNode.java
@@ -6,6 +6,10 @@ import Parser.AST.ASTNode;
 import java.util.List;
 
 public class IFConditionNode extends ASTNode {
+    public IFConditionNode() {
+        super();
+    }
+
     public IFConditionNode(ASTNode node) {
         super(node);
     }
diff --git a/sqlTranslate/src/main/java/Parser/OracleParser.java b/sqlTranslate/src/main/java/Parser/OracleParser.java
index b3a43d56..a378246a 100644
--- a/sqlTranslate/src/main/java/Parser/OracleParser.java
+++ b/sqlTranslate/src/main/java/Parser/OracleParser.java
@@ -18,6 +18,7 @@ import Parser.AST.Drop.DropEndNode;
 import Parser.AST.Drop.DropObjNameNode;
 import Parser.AST.Drop.DropNode;
 import Parser.AST.Drop.DropOptionNode;
+import Parser.AST.IFELSIF.IFConditionNode;
 import Parser.AST.Insert.InsertDataNode;
 import Parser.AST.Insert.InsertEndNode;
 import Parser.AST.Insert.InsertNode;
@@ -552,8 +553,11 @@ public class OracleParser {
      * @param parseTokens should start with IF
      */
     public static ASTNode parseIFELSE(List<Token> parseTokens) {
-        //TODO: implement
-        return null;
+        ASTNode root  = new IFConditionNode();
+        for (int i = 0; i < parseTokens.size(); i++) {
+            // TODO: implement
+        }
+        return root;
     }
 
 
-- 
Gitee


From 86b3eee86376dc78d499332e636dbad679ade4f4 Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Sat, 14 Sep 2024 15:26:01 +0800
Subject: [PATCH 070/113] add IF ELSIF

---
 sqlTranslate/.idea/workspace.xml              | 20 ++--
 sqlTranslate/src/main/java/Main.java          | 18 +++-
 .../java/Parser/AST/IFELSIF/ELSENode.java     |  4 +
 ...IFActionNode.java => ELSIFActionNode.java} | 12 ++-
 .../AST/IFELSIF/ELSIFConditionNode.java       |  4 +
 .../java/Parser/AST/IFELSIF/EndIFNode.java    |  4 +
 .../java/Parser/AST/IFELSIF/IFActionNode.java |  4 +
 .../Parser/AST/IFELSIF/IFConditionNode.java   |  4 +
 .../src/main/java/Parser/OracleParser.java    | 91 ++++++++++++++++++-
 9 files changed, 141 insertions(+), 20 deletions(-)
 rename sqlTranslate/src/main/java/Parser/AST/IFELSIF/{ElSIFActionNode.java => ELSIFActionNode.java} (57%)

diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
index a6e79dec..82028ad9 100644
--- a/sqlTranslate/.idea/workspace.xml
+++ b/sqlTranslate/.idea/workspace.xml
@@ -6,10 +6,10 @@
   <component name="ChangeListManager">
     <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add IF ELSIF">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/ASTNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/ASTNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Main.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/IFELSIF/ELSENode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/IFELSIF/ELSENode.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/IFELSIF/ELSIFConditionNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/IFELSIF/ELSIFConditionNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/IFELSIF/ElSIFActionNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/IFELSIF/ElSIFActionNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/IFELSIF/ElSIFActionNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/IFELSIF/ELSIFActionNode.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/IFELSIF/EndIFNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/IFELSIF/EndIFNode.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/IFELSIF/IFActionNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/IFELSIF/IFActionNode.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/IFELSIF/IFConditionNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/IFELSIF/IFConditionNode.java" afterDir="false" />
@@ -111,13 +111,6 @@
       <option name="presentableId" value="Default" />
       <updated>1723106789329</updated>
     </task>
-    <task id="LOCAL-00018" summary="coding">
-      <created>1724507228242</created>
-      <option name="number" value="00018" />
-      <option name="presentableId" value="LOCAL-00018" />
-      <option name="project" value="LOCAL" />
-      <updated>1724507228242</updated>
-    </task>
     <task id="LOCAL-00019" summary="coding">
       <created>1724510094392</created>
       <option name="number" value="00019" />
@@ -454,7 +447,14 @@
       <option name="project" value="LOCAL" />
       <updated>1726241748943</updated>
     </task>
-    <option name="localTasksCounter" value="67" />
+    <task id="LOCAL-00067" summary="add IF ELSIF">
+      <created>1726284970450</created>
+      <option name="number" value="00067" />
+      <option name="presentableId" value="LOCAL-00067" />
+      <option name="project" value="LOCAL" />
+      <updated>1726284970451</updated>
+    </task>
+    <option name="localTasksCounter" value="68" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
diff --git a/sqlTranslate/src/main/java/Main.java b/sqlTranslate/src/main/java/Main.java
index 5b072bf9..9a4cf148 100644
--- a/sqlTranslate/src/main/java/Main.java
+++ b/sqlTranslate/src/main/java/Main.java
@@ -32,12 +32,22 @@ public class Main {
 //                ");";
 //        String sql = "ALTER TABLE employees ADD email VARCHAR2(100) Check (email != '12813@163.com');";
 //        String sql = "CASE WHEN column2 > 0 THEN 'Positive' ELSE 'Non-positive' END";
-        String sql = "CREATE OR REPLACE VIEW emp_dept_info AS SELECT e.first_name, e.last_name, d.department_name FROM employees e JOIN departments d Using e.department_id = d.department_id;";
+//        String sql = "CREATE OR REPLACE VIEW emp_dept_info AS SELECT e.first_name, e.last_name, d.department_name FROM employees e JOIN departments d Using e.department_id = d.department_id;";
+        String sql = "IF v_salary >= 100000 THEN\n" +
+                "                 v_bonus := v_salary * 0.1;\n" +
+                "             ELSIF v_salary >= 50000 THEN\n" +
+                "                 v_bonus := v_salary * 0.08;\n" +
+                "             ELSIF v_salary >= 30000 THEN\n" +
+                "                 v_bonus := v_salary * 0.05;\n" +
+                "             ELSE\n" +
+                "                 v_bonus := v_salary * 0.03;\n" +
+                "             END IF;";
         OracleLexer lexer = new OracleLexer(sql);
         lexer.printTokens();
-        OracleParser parser = new OracleParser(lexer);
-        ASTNode root = parser.parse();
-//        ASTNode root = parser.parseCaseWhen(lexer.getTokens());
+//        OracleParser parser = new OracleParser(lexer);
+//        ASTNode root = parser.parse();
+        ASTNode root = OracleParser.parseIFELSE(lexer.getTokens());
+//        ASTNode root = OracleParser.parseCaseWhen(lexer.getTokens());
 //        ASTNode root = OracleParser.parseJoin(lexer.getTokens());
         System.out.println(root.toQueryString());
         System.out.println(root.getASTString());
diff --git a/sqlTranslate/src/main/java/Parser/AST/IFELSIF/ELSENode.java b/sqlTranslate/src/main/java/Parser/AST/IFELSIF/ELSENode.java
index c114d7ed..dfb14200 100644
--- a/sqlTranslate/src/main/java/Parser/AST/IFELSIF/ELSENode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/IFELSIF/ELSENode.java
@@ -3,19 +3,23 @@ package Parser.AST.IFELSIF;
 import Lexer.Token;
 import Parser.AST.ASTNode;
 
+import java.util.ArrayList;
 import java.util.List;
 
 public class ELSENode extends ASTNode {
     public ELSENode() {
         super();
+        setTokens(new ArrayList<>());
     }
 
     public ELSENode(ASTNode node) {
         super(node);
+        setTokens(new ArrayList<>());
     }
 
     public ELSENode(List<Token> tokens) {
         super(tokens);
+        setTokens(new ArrayList<>());
     }
 
     @Override
diff --git a/sqlTranslate/src/main/java/Parser/AST/IFELSIF/ElSIFActionNode.java b/sqlTranslate/src/main/java/Parser/AST/IFELSIF/ELSIFActionNode.java
similarity index 57%
rename from sqlTranslate/src/main/java/Parser/AST/IFELSIF/ElSIFActionNode.java
rename to sqlTranslate/src/main/java/Parser/AST/IFELSIF/ELSIFActionNode.java
index 20d72bc1..2c88cb19 100644
--- a/sqlTranslate/src/main/java/Parser/AST/IFELSIF/ElSIFActionNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/IFELSIF/ELSIFActionNode.java
@@ -3,19 +3,23 @@ package Parser.AST.IFELSIF;
 import Lexer.Token;
 import Parser.AST.ASTNode;
 
+import java.util.ArrayList;
 import java.util.List;
 
-public class ElSIFActionNode extends ASTNode {
-    public ElSIFActionNode() {
+public class ELSIFActionNode extends ASTNode {
+    public ELSIFActionNode() {
         super();
+        setTokens(new ArrayList<>());
     }
 
-    public ElSIFActionNode(ASTNode node) {
+    public ELSIFActionNode(ASTNode node) {
         super(node);
+        setTokens(new ArrayList<>());
     }
 
-    public ElSIFActionNode(List<Token> tokens) {
+    public ELSIFActionNode(List<Token> tokens) {
         super(tokens);
+        setTokens(new ArrayList<>());
     }
 
     @Override
diff --git a/sqlTranslate/src/main/java/Parser/AST/IFELSIF/ELSIFConditionNode.java b/sqlTranslate/src/main/java/Parser/AST/IFELSIF/ELSIFConditionNode.java
index 9b9e2c76..94379145 100644
--- a/sqlTranslate/src/main/java/Parser/AST/IFELSIF/ELSIFConditionNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/IFELSIF/ELSIFConditionNode.java
@@ -3,19 +3,23 @@ package Parser.AST.IFELSIF;
 import Lexer.Token;
 import Parser.AST.ASTNode;
 
+import java.util.ArrayList;
 import java.util.List;
 
 public class ELSIFConditionNode extends ASTNode {
     public ELSIFConditionNode() {
         super();
+        setTokens(new ArrayList<>());
     }
 
     public ELSIFConditionNode(ASTNode node) {
         super(node);
+        setTokens(new ArrayList<>());
     }
 
     public ELSIFConditionNode(List<Token> tokens) {
         super(tokens);
+        setTokens(new ArrayList<>());
     }
 
     @Override
diff --git a/sqlTranslate/src/main/java/Parser/AST/IFELSIF/EndIFNode.java b/sqlTranslate/src/main/java/Parser/AST/IFELSIF/EndIFNode.java
index 00d84681..b6aedf59 100644
--- a/sqlTranslate/src/main/java/Parser/AST/IFELSIF/EndIFNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/IFELSIF/EndIFNode.java
@@ -3,19 +3,23 @@ package Parser.AST.IFELSIF;
 import Lexer.Token;
 import Parser.AST.ASTNode;
 
+import java.util.ArrayList;
 import java.util.List;
 
 public class EndIFNode extends ASTNode {
     public EndIFNode() {
         super();
+        setTokens(new ArrayList<>());
     }
 
     public EndIFNode (ASTNode node) {
         super(node);
+        setTokens(new ArrayList<>());
     }
 
     public EndIFNode (List<Token> tokens) {
         super(tokens);
+        setTokens(new ArrayList<>());
     }
 
     @Override
diff --git a/sqlTranslate/src/main/java/Parser/AST/IFELSIF/IFActionNode.java b/sqlTranslate/src/main/java/Parser/AST/IFELSIF/IFActionNode.java
index 8b8df211..5736d147 100644
--- a/sqlTranslate/src/main/java/Parser/AST/IFELSIF/IFActionNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/IFELSIF/IFActionNode.java
@@ -3,19 +3,23 @@ package Parser.AST.IFELSIF;
 import Lexer.Token;
 import Parser.AST.ASTNode;
 
+import java.util.ArrayList;
 import java.util.List;
 
 public class IFActionNode extends ASTNode {
     public IFActionNode() {
         super();
+        setTokens(new ArrayList<>());
     }
 
     public IFActionNode(ASTNode node) {
         super(node);
+        setTokens(new ArrayList<>());
     }
 
     public IFActionNode(List<Token> tokens) {
         super(tokens);
+        setTokens(new ArrayList<>());
     }
 
     @Override
diff --git a/sqlTranslate/src/main/java/Parser/AST/IFELSIF/IFConditionNode.java b/sqlTranslate/src/main/java/Parser/AST/IFELSIF/IFConditionNode.java
index 5fe23cc1..46298304 100644
--- a/sqlTranslate/src/main/java/Parser/AST/IFELSIF/IFConditionNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/IFELSIF/IFConditionNode.java
@@ -3,19 +3,23 @@ package Parser.AST.IFELSIF;
 import Lexer.Token;
 import Parser.AST.ASTNode;
 
+import java.util.ArrayList;
 import java.util.List;
 
 public class IFConditionNode extends ASTNode {
     public IFConditionNode() {
         super();
+        setTokens(new ArrayList<>());
     }
 
     public IFConditionNode(ASTNode node) {
         super(node);
+        setTokens(new ArrayList<>());
     }
 
     public IFConditionNode(List<Token> tokens) {
         super(tokens);
+        setTokens(new ArrayList<>());
     }
 
     @Override
diff --git a/sqlTranslate/src/main/java/Parser/OracleParser.java b/sqlTranslate/src/main/java/Parser/OracleParser.java
index a378246a..d94c5f5a 100644
--- a/sqlTranslate/src/main/java/Parser/OracleParser.java
+++ b/sqlTranslate/src/main/java/Parser/OracleParser.java
@@ -18,7 +18,7 @@ import Parser.AST.Drop.DropEndNode;
 import Parser.AST.Drop.DropObjNameNode;
 import Parser.AST.Drop.DropNode;
 import Parser.AST.Drop.DropOptionNode;
-import Parser.AST.IFELSIF.IFConditionNode;
+import Parser.AST.IFELSIF.*;
 import Parser.AST.Insert.InsertDataNode;
 import Parser.AST.Insert.InsertEndNode;
 import Parser.AST.Insert.InsertNode;
@@ -554,9 +554,96 @@ public class OracleParser {
      */
     public static ASTNode parseIFELSE(List<Token> parseTokens) {
         ASTNode root  = new IFConditionNode();
+        ASTNode currentNode = root;
         for (int i = 0; i < parseTokens.size(); i++) {
-            // TODO: implement
+            // match IF condition
+            if (parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("IF")) {
+                for (int j = i; j < parseTokens.size(); j++) {
+                    if (parseTokens.get(j).hasType(Token.TokenType.KEYWORD) && parseTokens.get(j).getValue().equalsIgnoreCase("THEN")) {
+                        i = j - 1;
+                        break;
+                    }
+                    root.addToken(parseTokens.get(j));
+                }
+            }
+            // match IF action
+            else if (currentNode instanceof IFConditionNode && parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("THEN")) {
+                ASTNode childNode = new IFActionNode();
+                for (int j = i; j < parseTokens.size(); j++) {
+                    childNode.addToken(parseTokens.get(j));
+                    if (parseTokens.get(j).hasType(Token.TokenType.SYMBOL) && parseTokens.get(j).getValue().equals(";")) {
+                        i = j;
+                        break;
+                    }
+                }
+                currentNode.addChild(childNode);
+                currentNode = childNode;
+            }
+            // match ELSIF condition
+            else if (parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("ELSIF")) {
+                ASTNode childNode = new ELSIFConditionNode();
+                for (int j = i; j < parseTokens.size(); j++) {
+                    if (parseTokens.get(j).hasType(Token.TokenType.KEYWORD) && parseTokens.get(j).getValue().equalsIgnoreCase("THEN")) {
+                        i = j - 1;
+                        break;
+                    }
+                    childNode.addToken(parseTokens.get(j));
+                }
+                currentNode.addChild(childNode);
+                currentNode = childNode;
+            }
+            // match ELSIF action
+            else if (currentNode instanceof ELSIFConditionNode && parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("THEN")) {
+                ASTNode childNode = new ELSIFActionNode();
+                for (int j = i; j < parseTokens.size(); j++) {
+                    childNode.addToken(parseTokens.get(j));
+                    if (parseTokens.get(j).hasType(Token.TokenType.SYMBOL) && parseTokens.get(j).getValue().equals(";")) {
+                        i = j;
+                        break;
+                    }
+                }
+                currentNode.addChild(childNode);
+                currentNode = childNode;
+            }
+            // match ELSE
+            else if (parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("ELSE")) {
+                ASTNode childNode = new ELSENode();
+                for (int j = i; j < parseTokens.size(); j++) {
+                    childNode.addToken(parseTokens.get(j));
+                    if (parseTokens.get(j).hasType(Token.TokenType.SYMBOL) && parseTokens.get(j).getValue().equals(";")) {
+                        i = j;
+                        break;
+                    }
+                }
+                currentNode.addChild(childNode);
+                currentNode = childNode;
+            }
+            //match end if;
+            else if (parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("END")) {
+                ASTNode childNode = new EndIFNode();
+                for (int j = i; j < parseTokens.size(); j++) {
+                    childNode.addToken(parseTokens.get(j));
+                    if (parseTokens.get(j).hasType(Token.TokenType.SYMBOL) && parseTokens.get(j).getValue().equals(";")) {
+                        i = j;
+                        break;
+                    }
+                }
+                currentNode.addChild(childNode);
+                currentNode = childNode;
+            }
+            else if (parseTokens.get(i).hasType(Token.TokenType.EOF)) {
+                break;
+            }
+            else {
+                try {
+                    throw new ParseFailedException("Parse failed!--" + parseTokens.get(i).getValue());
+                }
+                catch (ParseFailedException e) {
+                    e.printStackTrace();
+                }
+            }
         }
+
         return root;
     }
 
-- 
Gitee


From 405dcf656913e7c4f9d18040b229ba2cec0c2ba2 Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Sat, 14 Sep 2024 19:56:46 +0800
Subject: [PATCH 071/113] add Loop document

---
 sqlTranslate/.idea/workspace.xml              | 25 +++++-------
 .../src/main/java/Document/Loop in PLSQL      | 40 +++++++++++++++++++
 sqlTranslate/src/main/java/Document/Todolist  |  8 ++--
 3 files changed, 53 insertions(+), 20 deletions(-)
 create mode 100644 sqlTranslate/src/main/java/Document/Loop in PLSQL

diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
index 82028ad9..d1a37113 100644
--- a/sqlTranslate/.idea/workspace.xml
+++ b/sqlTranslate/.idea/workspace.xml
@@ -6,14 +6,7 @@
   <component name="ChangeListManager">
     <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add IF ELSIF">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Main.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/IFELSIF/ELSENode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/IFELSIF/ELSENode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/IFELSIF/ELSIFConditionNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/IFELSIF/ELSIFConditionNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/IFELSIF/ElSIFActionNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/IFELSIF/ELSIFActionNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/IFELSIF/EndIFNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/IFELSIF/EndIFNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/IFELSIF/IFActionNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/IFELSIF/IFActionNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/IFELSIF/IFConditionNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/IFELSIF/IFConditionNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Document/Todolist" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Document/Todolist" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -111,13 +104,6 @@
       <option name="presentableId" value="Default" />
       <updated>1723106789329</updated>
     </task>
-    <task id="LOCAL-00019" summary="coding">
-      <created>1724510094392</created>
-      <option name="number" value="00019" />
-      <option name="presentableId" value="LOCAL-00019" />
-      <option name="project" value="LOCAL" />
-      <updated>1724510094392</updated>
-    </task>
     <task id="LOCAL-00020" summary="finish the framework of sqltranslate (createTab sql is now being supported!)">
       <created>1724511620952</created>
       <option name="number" value="00020" />
@@ -454,7 +440,14 @@
       <option name="project" value="LOCAL" />
       <updated>1726284970451</updated>
     </task>
-    <option name="localTasksCounter" value="68" />
+    <task id="LOCAL-00068" summary="add IF ELSIF">
+      <created>1726298762626</created>
+      <option name="number" value="00068" />
+      <option name="presentableId" value="LOCAL-00068" />
+      <option name="project" value="LOCAL" />
+      <updated>1726298762627</updated>
+    </task>
+    <option name="localTasksCounter" value="69" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
diff --git a/sqlTranslate/src/main/java/Document/Loop in PLSQL b/sqlTranslate/src/main/java/Document/Loop in PLSQL
new file mode 100644
index 00000000..e0d42493
--- /dev/null
+++ b/sqlTranslate/src/main/java/Document/Loop in PLSQL	
@@ -0,0 +1,40 @@
+LOOP
+    -- 循环体
+    EXIT WHEN condition;
+END LOOP;
+
+Example:
+    DECLARE
+        v_counter NUMBER := 1;
+    BEGIN
+        LOOP
+            DBMS_OUTPUT.PUT_LINE(v_counter);
+            v_counter := v_counter + 1;
+            EXIT WHEN v_counter > 10;
+        END LOOP;
+    END;
+
+WHILE condition LOOP
+    -- 循环体
+END LOOP;
+
+Example:
+    DECLARE
+        v_counter NUMBER := 1;
+    BEGIN
+        WHILE v_counter <= 10 LOOP
+            DBMS_OUTPUT.PUT_LINE(v_counter);
+            v_counter := v_counter + 1;
+        END LOOP;
+    END;
+
+FOR counter IN start..stop LOOP
+    -- 循环体
+END LOOP;
+
+Example:
+    BEGIN
+        FOR i IN 1..10 LOOP
+            DBMS_OUTPUT.PUT_LINE(i);
+        END LOOP;
+    END;
\ No newline at end of file
diff --git a/sqlTranslate/src/main/java/Document/Todolist b/sqlTranslate/src/main/java/Document/Todolist
index 3ca9c4be..fed81ff2 100644
--- a/sqlTranslate/src/main/java/Document/Todolist
+++ b/sqlTranslate/src/main/java/Document/Todolist
@@ -7,11 +7,11 @@ Operation
  insert into 1
  update... set 1
  delete 1
- if... elsif... else... end if
+ if... elsif... else... end if 1
  case... when... then 1
- loop... end loop
- while... loop... end loop
- for ... in () loop end loop
+ loop... end loop 1
+ while... loop... end loop 1
+ for ... in () loop end loop 1
  continue、exit
  return
  exception
-- 
Gitee


From 477e4843851ddcc62359d5daa9770f27cc78d8a6 Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Sat, 14 Sep 2024 20:00:17 +0800
Subject: [PATCH 072/113] add Loop keywords

---
 sqlTranslate/src/main/java/Lexer/OracleLexer.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sqlTranslate/src/main/java/Lexer/OracleLexer.java b/sqlTranslate/src/main/java/Lexer/OracleLexer.java
index fe2c6239..cc443a94 100644
--- a/sqlTranslate/src/main/java/Lexer/OracleLexer.java
+++ b/sqlTranslate/src/main/java/Lexer/OracleLexer.java
@@ -30,7 +30,9 @@ public class OracleLexer {
             // keywords of view
             , "REPLACE", "VIEW"
             // PL/SQL
-            , ":=", "IF", "ELSIF"
+            , ":=", "IF", "ELSIF", "BEGIN"
+            // Loop
+            , "LOOP", "EXIT", "WHILE", "FOR", "IN"
     };
     private static final Pattern TOKEN_PATTERN = Pattern.compile(
             "(NUMBER\\(.*?\\))|" +                     // NUMBER() function
-- 
Gitee


From d15d4cf123a1fe28e5b72825c037be70d27a42ca Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Sat, 14 Sep 2024 20:16:17 +0800
Subject: [PATCH 073/113] add Loop ast classes

---
 sqlTranslate/.idea/workspace.xml              | 41 +++++++++----------
 .../main/java/Parser/AST/Loop/ForNode.java    | 33 +++++++++++++++
 .../java/Parser/AST/Loop/LoopBodyNode.java    | 33 +++++++++++++++
 .../java/Parser/AST/Loop/LoopEndNode.java     | 33 +++++++++++++++
 .../java/Parser/AST/Loop/LoopExitNode.java    | 33 +++++++++++++++
 .../main/java/Parser/AST/Loop/LoopNode.java   | 33 +++++++++++++++
 .../main/java/Parser/AST/Loop/WhileNode.java  | 33 +++++++++++++++
 .../src/main/java/Parser/OracleParser.java    | 30 +++++++++++++-
 8 files changed, 247 insertions(+), 22 deletions(-)
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/Loop/ForNode.java
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/Loop/LoopBodyNode.java
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/Loop/LoopEndNode.java
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/Loop/LoopExitNode.java
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/Loop/LoopNode.java
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/Loop/WhileNode.java

diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
index d1a37113..664b0258 100644
--- a/sqlTranslate/.idea/workspace.xml
+++ b/sqlTranslate/.idea/workspace.xml
@@ -4,9 +4,8 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add IF ELSIF">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Document/Todolist" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Document/Todolist" afterDir="false" />
+    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add Loop keywords">
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -104,20 +103,6 @@
       <option name="presentableId" value="Default" />
       <updated>1723106789329</updated>
     </task>
-    <task id="LOCAL-00020" summary="finish the framework of sqltranslate (createTab sql is now being supported!)">
-      <created>1724511620952</created>
-      <option name="number" value="00020" />
-      <option name="presentableId" value="LOCAL-00020" />
-      <option name="project" value="LOCAL" />
-      <updated>1724511620952</updated>
-    </task>
-    <task id="LOCAL-00021" summary="add insert sql">
-      <created>1725117071687</created>
-      <option name="number" value="00021" />
-      <option name="presentableId" value="LOCAL-00021" />
-      <option name="project" value="LOCAL" />
-      <updated>1725117071687</updated>
-    </task>
     <task id="LOCAL-00022" summary="add insert sql">
       <created>1725885115923</created>
       <option name="number" value="00022" />
@@ -447,7 +432,21 @@
       <option name="project" value="LOCAL" />
       <updated>1726298762627</updated>
     </task>
-    <option name="localTasksCounter" value="69" />
+    <task id="LOCAL-00069" summary="add Loop document">
+      <created>1726315007495</created>
+      <option name="number" value="00069" />
+      <option name="presentableId" value="LOCAL-00069" />
+      <option name="project" value="LOCAL" />
+      <updated>1726315007495</updated>
+    </task>
+    <task id="LOCAL-00070" summary="add Loop keywords">
+      <created>1726315219011</created>
+      <option name="number" value="00070" />
+      <option name="presentableId" value="LOCAL-00070" />
+      <option name="project" value="LOCAL" />
+      <updated>1726315219011</updated>
+    </task>
+    <option name="localTasksCounter" value="71" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
@@ -462,8 +461,6 @@
     </option>
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="add join pattern" />
-    <MESSAGE value="add join class" />
     <MESSAGE value="add join" />
     <MESSAGE value="add join convert rule" />
     <MESSAGE value="refractor" />
@@ -487,7 +484,9 @@
     <MESSAGE value="add if elseif else endif document" />
     <MESSAGE value="add if elseif else endif ast classes" />
     <MESSAGE value="add IF ELSIF" />
-    <option name="LAST_COMMIT_MESSAGE" value="add IF ELSIF" />
+    <MESSAGE value="add Loop document" />
+    <MESSAGE value="add Loop keywords" />
+    <option name="LAST_COMMIT_MESSAGE" value="add Loop keywords" />
   </component>
   <component name="XDebuggerManager">
     <watches-manager>
diff --git a/sqlTranslate/src/main/java/Parser/AST/Loop/ForNode.java b/sqlTranslate/src/main/java/Parser/AST/Loop/ForNode.java
new file mode 100644
index 00000000..c70d1ac3
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/Loop/ForNode.java
@@ -0,0 +1,33 @@
+package Parser.AST.Loop;
+
+import Lexer.Token;
+import Parser.AST.ASTNode;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ForNode extends ASTNode {
+    public ForNode() {
+        super();
+        setTokens(new ArrayList<>());
+    }
+
+    public ForNode(ASTNode node) {
+        super(node);
+        setTokens(new ArrayList<>());
+    }
+
+    public ForNode(List<Token> tokens) {
+        super(tokens);
+        setTokens(new ArrayList<>());
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString) {
+        queryString.append(toString() + " ");
+        for (ASTNode child : getChildren())
+        {
+            child.visit(child, queryString);
+        }
+    }
+}
diff --git a/sqlTranslate/src/main/java/Parser/AST/Loop/LoopBodyNode.java b/sqlTranslate/src/main/java/Parser/AST/Loop/LoopBodyNode.java
new file mode 100644
index 00000000..84140970
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/Loop/LoopBodyNode.java
@@ -0,0 +1,33 @@
+package Parser.AST.Loop;
+
+import Lexer.Token;
+import Parser.AST.ASTNode;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class LoopBodyNode extends ASTNode {
+    public LoopBodyNode() {
+        super();
+        setTokens(new ArrayList<>());
+    }
+
+    public LoopBodyNode(ASTNode node) {
+        super(node);
+        setTokens(new ArrayList<>());
+    }
+
+    public LoopBodyNode(List<Token> tokens) {
+        super(tokens);
+        setTokens(new ArrayList<>());
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString) {
+        queryString.append(toString() + " ");
+        for (ASTNode child : getChildren())
+        {
+            child.visit(child, queryString);
+        }
+    }
+}
diff --git a/sqlTranslate/src/main/java/Parser/AST/Loop/LoopEndNode.java b/sqlTranslate/src/main/java/Parser/AST/Loop/LoopEndNode.java
new file mode 100644
index 00000000..895b5a2a
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/Loop/LoopEndNode.java
@@ -0,0 +1,33 @@
+package Parser.AST.Loop;
+
+import Lexer.Token;
+import Parser.AST.ASTNode;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class LoopEndNode extends ASTNode {
+    public LoopEndNode() {
+        super();
+        setTokens(new ArrayList<>());
+    }
+
+    public LoopEndNode(ASTNode node) {
+        super(node);
+        setTokens(new ArrayList<>());
+    }
+
+    public LoopEndNode(List<Token> tokens) {
+        super(tokens);
+        setTokens(new ArrayList<>());
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString) {
+        queryString.append(toString());
+        for (ASTNode child : getChildren())
+        {
+            child.visit(child, queryString);
+        }
+    }
+}
diff --git a/sqlTranslate/src/main/java/Parser/AST/Loop/LoopExitNode.java b/sqlTranslate/src/main/java/Parser/AST/Loop/LoopExitNode.java
new file mode 100644
index 00000000..76f105c7
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/Loop/LoopExitNode.java
@@ -0,0 +1,33 @@
+package Parser.AST.Loop;
+
+import Lexer.Token;
+import Parser.AST.ASTNode;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class LoopExitNode extends ASTNode {
+    public LoopExitNode() {
+        super();
+        setTokens(new ArrayList<>());
+    }
+
+    public LoopExitNode(ASTNode node) {
+        super(node);
+        setTokens(new ArrayList<>());
+    }
+
+    public LoopExitNode(List<Token> tokens) {
+        super(tokens);
+        setTokens(new ArrayList<>());
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString) {
+        queryString.append(toString() + " ");
+        for (ASTNode child : getChildren())
+        {
+            child.visit(child, queryString);
+        }
+    }
+}
diff --git a/sqlTranslate/src/main/java/Parser/AST/Loop/LoopNode.java b/sqlTranslate/src/main/java/Parser/AST/Loop/LoopNode.java
new file mode 100644
index 00000000..12800539
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/Loop/LoopNode.java
@@ -0,0 +1,33 @@
+package Parser.AST.Loop;
+
+import Lexer.Token;
+import Parser.AST.ASTNode;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class LoopNode extends ASTNode {
+    public LoopNode() {
+        super();
+        setTokens(new ArrayList<>());
+    }
+
+    public LoopNode(ASTNode node) {
+        super(node);
+        setTokens(new ArrayList<>());
+    }
+
+    public LoopNode(List<Token> tokens) {
+        super(tokens);
+        setTokens(new ArrayList<>());
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString) {
+        queryString.append(toString() + " ");
+        for (ASTNode child : getChildren())
+        {
+            child.visit(child, queryString);
+        }
+    }
+}
diff --git a/sqlTranslate/src/main/java/Parser/AST/Loop/WhileNode.java b/sqlTranslate/src/main/java/Parser/AST/Loop/WhileNode.java
new file mode 100644
index 00000000..d4e4a775
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/Loop/WhileNode.java
@@ -0,0 +1,33 @@
+package Parser.AST.Loop;
+
+import Lexer.Token;
+import Parser.AST.ASTNode;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class WhileNode extends ASTNode {
+    public WhileNode() {
+        super();
+        setTokens(new ArrayList<>());
+    }
+
+    public WhileNode(ASTNode node) {
+        super(node);
+        setTokens(new ArrayList<>());
+    }
+
+    public WhileNode(List<Token> tokens) {
+        super(tokens);
+        setTokens(new ArrayList<>());
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString) {
+        queryString.append(toString());
+        for (ASTNode child : getChildren())
+        {
+            child.visit(child, queryString);
+        }
+    }
+}
diff --git a/sqlTranslate/src/main/java/Parser/OracleParser.java b/sqlTranslate/src/main/java/Parser/OracleParser.java
index d94c5f5a..d83c3fea 100644
--- a/sqlTranslate/src/main/java/Parser/OracleParser.java
+++ b/sqlTranslate/src/main/java/Parser/OracleParser.java
@@ -65,7 +65,14 @@ public class OracleParser {
                             || (lexer.getTokens().get(0).getValue().equalsIgnoreCase("CREATE") && lexer.getTokens().get(1).getValue().equalsIgnoreCase("VIEW"))
             ) {
                 return parseCreateView(lexer.getTokens());
-            } else {
+            } else if (
+                    lexer.getTokens().get(0).getValue().equalsIgnoreCase("FOR")
+                    || lexer.getTokens().get(0).getValue().equalsIgnoreCase("LOOP")
+                    || lexer.getTokens().get(0).getValue().equalsIgnoreCase("WHILE")
+            ) {
+                return parseLoop(lexer.getTokens());
+            }
+            else {
                 try {
                     throw new ParseFailedException("Parse failed!--Unsupport SQL:" + lexer.getTokens().get(0).getValue());
                 } catch (ParseFailedException e) {
@@ -724,6 +731,27 @@ public class OracleParser {
         return root;
     }
 
+    /**
+     * Loop_clauses
+     * 1:LOOP
+     *     --
+     *     EXIT WHEN condition;
+     * END LOOP;
+     *
+     * 2:WHILE condition LOOP
+     *     --
+     * END LOOP;
+     *
+     * 3:FOR counter IN start..stop LOOP
+     *     --
+     * END LOOP;
+     *
+     * @param parseTokens should start with LOOP | WHILE | FOR
+     */
+    public static ASTNode parseLoop(List<Token> parseTokens) {
+        return null;
+    }
+
     /**
      * JOIN clause
      * For example: table1 t1 JOIN table2 t2 ON|USING t1.id = t2.id
-- 
Gitee


From f82a2acf79dd7d18dc68c3122b6a0d31708377c1 Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Sat, 14 Sep 2024 23:12:23 +0800
Subject: [PATCH 074/113] add Loop

---
 sqlTranslate/.idea/workspace.xml              | 29 +++---
 .../java/Generator/OpenGaussGenerator.java    | 50 +++++++++-
 .../src/main/java/Lexer/OracleLexer.java      |  9 +-
 sqlTranslate/src/main/java/Main.java          | 29 ++++--
 .../src/main/java/Parser/AST/ASTNode.java     |  4 +
 .../main/java/Parser/AST/Loop/WhileNode.java  |  2 +-
 .../src/main/java/Parser/OracleParser.java    | 99 ++++++++++++++++++-
 7 files changed, 193 insertions(+), 29 deletions(-)

diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
index 664b0258..927c33fb 100644
--- a/sqlTranslate/.idea/workspace.xml
+++ b/sqlTranslate/.idea/workspace.xml
@@ -4,7 +4,12 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add Loop keywords">
+    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add Loop ast classes">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Generator/OpenGaussGenerator.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Generator/OpenGaussGenerator.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Lexer/OracleLexer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Lexer/OracleLexer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Main.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/ASTNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/ASTNode.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -15,8 +20,8 @@
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
       <list>
-        <option value="Interface" />
         <option value="Class" />
+        <option value="Interface" />
       </list>
     </option>
   </component>
@@ -103,13 +108,6 @@
       <option name="presentableId" value="Default" />
       <updated>1723106789329</updated>
     </task>
-    <task id="LOCAL-00022" summary="add insert sql">
-      <created>1725885115923</created>
-      <option name="number" value="00022" />
-      <option name="presentableId" value="LOCAL-00022" />
-      <option name="project" value="LOCAL" />
-      <updated>1725885115924</updated>
-    </task>
     <task id="LOCAL-00023" summary="add todolist">
       <created>1725890826442</created>
       <option name="number" value="00023" />
@@ -446,7 +444,14 @@
       <option name="project" value="LOCAL" />
       <updated>1726315219011</updated>
     </task>
-    <option name="localTasksCounter" value="71" />
+    <task id="LOCAL-00071" summary="add Loop ast classes">
+      <created>1726316179151</created>
+      <option name="number" value="00071" />
+      <option name="presentableId" value="LOCAL-00071" />
+      <option name="project" value="LOCAL" />
+      <updated>1726316179152</updated>
+    </task>
+    <option name="localTasksCounter" value="72" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
@@ -461,7 +466,6 @@
     </option>
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="add join" />
     <MESSAGE value="add join convert rule" />
     <MESSAGE value="refractor" />
     <MESSAGE value="add select convert rules" />
@@ -486,7 +490,8 @@
     <MESSAGE value="add IF ELSIF" />
     <MESSAGE value="add Loop document" />
     <MESSAGE value="add Loop keywords" />
-    <option name="LAST_COMMIT_MESSAGE" value="add Loop keywords" />
+    <MESSAGE value="add Loop ast classes" />
+    <option name="LAST_COMMIT_MESSAGE" value="add Loop ast classes" />
   </component>
   <component name="XDebuggerManager">
     <watches-manager>
diff --git a/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java b/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java
index 031591ed..e104de42 100644
--- a/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java
+++ b/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java
@@ -15,15 +15,18 @@ import Parser.AST.Drop.DropOptionNode;
 import Parser.AST.Insert.InsertNode;
 import Parser.AST.Join.JoinConditionNode;
 import Parser.AST.Join.JoinSourceTabNode;
+import Parser.AST.Loop.ForNode;
+import Parser.AST.Loop.LoopBodyNode;
+import Parser.AST.Loop.LoopNode;
+import Parser.AST.Loop.WhileNode;
 import Parser.AST.Select.SelectNode;
-import Parser.AST.Select.SelectObjNode;
 import Parser.AST.Update.UpdateNode;
-import Parser.AST.Update.UpdateObjNode;
 import Parser.AST.View.ViewCreateNode;
-import Parser.OracleParser;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 public class OpenGaussGenerator {
     private ASTNode node;
@@ -63,6 +66,9 @@ public class OpenGaussGenerator {
         else if (node instanceof ViewCreateNode) {
             return GenCreateViewSQL(node);
         }
+        else if (node instanceof LoopNode || node instanceof WhileNode || node instanceof ForNode) {
+            return GenLoopSQL(node);
+        }
         else {
             try {
                 throw new GenerateFailedException("Root node:" + node.getClass() + "(Unsupported node type!)");
@@ -123,6 +129,11 @@ public class OpenGaussGenerator {
         return node.toQueryString();
     }
 
+    private String GenLoopSQL(ASTNode node) {
+        visitLoop(node);
+        return node.toQueryString();
+    }
+
     private void visitCrt(ASTNode node) {
         if (node instanceof ColumnNode) {
             ColumnTypeConvert((ColumnNode) node);
@@ -162,6 +173,15 @@ public class OpenGaussGenerator {
         }
     }
 
+    private void visitLoop(ASTNode node) {
+        if (node instanceof LoopBodyNode) {
+            PLConvert(node);
+        }
+        for (ASTNode child : node.getChildren()) {
+            visitLoop(child);
+        }
+    }
+
     private void visitSelect(ASTNode node) {
         if (node instanceof JoinSourceTabNode) {
             visitJoin(node);
@@ -200,6 +220,30 @@ public class OpenGaussGenerator {
             visitCreateView(child);
         }
     }
+    private void PLConvert(ASTNode node) {
+        if (node.checkExistsByRegex("(?i)DBMS_OUTPUT.PUT_LINE\\(.*?\\)")) {
+            String printObj = "";
+            for (Token token: node.getTokens()) {
+                if (token.getValue().matches("(?i)DBMS_OUTPUT.PUT_LINE\\(.*?\\)")) {
+                    Pattern pattern = Pattern.compile("\\(([^()]*)\\)");
+                    Matcher matcher = pattern.matcher(token.getValue());
+                    while (matcher.find()) {
+                        printObj = matcher.group(1);
+                    }
+                    break;
+                }
+            }
+            List<Token> tokens = new ArrayList<>();
+            tokens.add(new Token(Token.TokenType.KEYWORD, "RAISE"));
+            tokens.add(new Token(Token.TokenType.KEYWORD, "NOTICE"));
+            tokens.add(new Token(Token.TokenType.STRING, "'%'"));
+            tokens.add(new Token(Token.TokenType.SYMBOL, ","));
+            tokens.add(new Token(Token.TokenType.IDENTIFIER, printObj));
+            tokens.add(new Token(Token.TokenType.SYMBOL, ";"));
+            node.setTokens(tokens);
+        }
+    }
+
 
     private void ColumnTypeConvert(ColumnType node) {
         // type convert
diff --git a/sqlTranslate/src/main/java/Lexer/OracleLexer.java b/sqlTranslate/src/main/java/Lexer/OracleLexer.java
index cc443a94..fd5c8526 100644
--- a/sqlTranslate/src/main/java/Lexer/OracleLexer.java
+++ b/sqlTranslate/src/main/java/Lexer/OracleLexer.java
@@ -30,7 +30,7 @@ public class OracleLexer {
             // keywords of view
             , "REPLACE", "VIEW"
             // PL/SQL
-            , ":=", "IF", "ELSIF", "BEGIN"
+            , ":=", "IF", "ELSIF", "BEGIN", ".."
             // Loop
             , "LOOP", "EXIT", "WHILE", "FOR", "IN"
     };
@@ -50,6 +50,7 @@ public class OracleLexer {
                     "(MAX\\(.*?\\))|" +                     // MAX() function
                     "(MIN\\(.*?\\))|" +                     // MIN() function
                     "(\\|\\|\\s*'.*?'\\s*\\|\\|)|" +        // || '*' ||
+                    "(DBMS_OUTPUT.PUT_LINE\\(.*?\\))|" +                     // DBMS_OUTPUT.PUT_LINE() function
 
                     "(NOT NULL)|" +
                     "(PRIMARY KEY)|" +
@@ -73,7 +74,7 @@ public class OracleLexer {
                     "(CROSS JOIN)|" +
                     "(\\|\\|)|" +
                     "(:=)|" +
-
+                    "(\\.\\.)|" +
 
                     "(\\b[A-Za-z_][A-Za-z0-9_]*(\\.[A-Za-z_][A-Za-z0-9_]*)*\\b)|" + // Keywords and identifiers
                     "(\\b[A-Za-z_][A-Za-z0-9_]*\\b)|" + // Keywords and identifiers
@@ -168,6 +169,9 @@ public class OracleLexer {
         } else if (tokenValue.matches("\\|\\|\\s*'.*?'\\s*\\|\\|")) {
             // RAW() function, CASE_INSENSITIVE
             return new Token(Token.TokenType.KEYWORD, tokenValue);
+        } else if (tokenValue.matches("(?i)DBMS_OUTPUT.PUT_LINE\\(.*?\\)")) {
+            // RAW() function, CASE_INSENSITIVE
+            return new Token(Token.TokenType.KEYWORD, tokenValue);
         }
 
         else if (isKeyword(tokenValue)) {
@@ -194,6 +198,7 @@ public class OracleLexer {
             input = input.replace("  ", " ");
         }
         input = input.replace(" (", "(");
+        input = input.replace("..", " .. ");
         return input;
     }
 
diff --git a/sqlTranslate/src/main/java/Main.java b/sqlTranslate/src/main/java/Main.java
index 9a4cf148..35a3658c 100644
--- a/sqlTranslate/src/main/java/Main.java
+++ b/sqlTranslate/src/main/java/Main.java
@@ -4,6 +4,9 @@ import Lexer.OracleLexer;
 import Parser.AST.ASTNode;
 import Parser.OracleParser;
 
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 
 public class Main {
     public static void main(String[] args) {
@@ -33,20 +36,26 @@ public class Main {
 //        String sql = "ALTER TABLE employees ADD email VARCHAR2(100) Check (email != '12813@163.com');";
 //        String sql = "CASE WHEN column2 > 0 THEN 'Positive' ELSE 'Non-positive' END";
 //        String sql = "CREATE OR REPLACE VIEW emp_dept_info AS SELECT e.first_name, e.last_name, d.department_name FROM employees e JOIN departments d Using e.department_id = d.department_id;";
-        String sql = "IF v_salary >= 100000 THEN\n" +
-                "                 v_bonus := v_salary * 0.1;\n" +
-                "             ELSIF v_salary >= 50000 THEN\n" +
-                "                 v_bonus := v_salary * 0.08;\n" +
-                "             ELSIF v_salary >= 30000 THEN\n" +
-                "                 v_bonus := v_salary * 0.05;\n" +
-                "             ELSE\n" +
-                "                 v_bonus := v_salary * 0.03;\n" +
-                "             END IF;";
+//        String sql = "IF v_salary >= 100000 THEN\n" +
+//                "                 v_bonus := v_salary * 0.1;\n" +
+//                "             ELSIF v_salary >= 50000 THEN\n" +
+//                "                 v_bonus := v_salary * 0.08;\n" +
+//                "             ELSIF v_salary >= 30000 THEN\n" +
+//                "                 v_bonus := v_salary * 0.05;\n" +
+//                "             ELSE\n" +
+//                "                 v_bonus := v_salary * 0.03;\n" +
+//                "             END IF;";
+        String sql = "LOOP\n" +
+                "        DBMS_OUTPUT.PUT_LINE(v_counter);\n" +
+                "        v_counter := v_counter + 1;\n" +
+                "        EXIT WHEN v_counter > 10;\n" +
+                "    END LOOP;";
         OracleLexer lexer = new OracleLexer(sql);
         lexer.printTokens();
 //        OracleParser parser = new OracleParser(lexer);
 //        ASTNode root = parser.parse();
-        ASTNode root = OracleParser.parseIFELSE(lexer.getTokens());
+        ASTNode root = OracleParser.parseLoop(lexer.getTokens());
+//        ASTNode root = OracleParser.parseIFELSE(lexer.getTokens());
 //        ASTNode root = OracleParser.parseCaseWhen(lexer.getTokens());
 //        ASTNode root = OracleParser.parseJoin(lexer.getTokens());
         System.out.println(root.toQueryString());
diff --git a/sqlTranslate/src/main/java/Parser/AST/ASTNode.java b/sqlTranslate/src/main/java/Parser/AST/ASTNode.java
index bed4c61a..431fab54 100644
--- a/sqlTranslate/src/main/java/Parser/AST/ASTNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/ASTNode.java
@@ -31,6 +31,10 @@ public abstract class ASTNode {
         this.tokens = tokens;
     }
 
+    public boolean checkExistsByRegex (String regex) {
+        return tokens.stream().anyMatch(token -> token.getValue().matches(regex));
+    }
+
     public void addToken(Token token) {
         tokens.add(token);
     }
diff --git a/sqlTranslate/src/main/java/Parser/AST/Loop/WhileNode.java b/sqlTranslate/src/main/java/Parser/AST/Loop/WhileNode.java
index d4e4a775..5574da7d 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Loop/WhileNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/Loop/WhileNode.java
@@ -24,7 +24,7 @@ public class WhileNode extends ASTNode {
 
     @Override
     public void visit(ASTNode node, StringBuilder queryString) {
-        queryString.append(toString());
+        queryString.append(toString() + " ");
         for (ASTNode child : getChildren())
         {
             child.visit(child, queryString);
diff --git a/sqlTranslate/src/main/java/Parser/OracleParser.java b/sqlTranslate/src/main/java/Parser/OracleParser.java
index d83c3fea..2f893ac3 100644
--- a/sqlTranslate/src/main/java/Parser/OracleParser.java
+++ b/sqlTranslate/src/main/java/Parser/OracleParser.java
@@ -24,6 +24,7 @@ import Parser.AST.Insert.InsertEndNode;
 import Parser.AST.Insert.InsertNode;
 import Parser.AST.Insert.InsertObjNode;
 import Parser.AST.Join.*;
+import Parser.AST.Loop.*;
 import Parser.AST.Select.*;
 import Parser.AST.Update.*;
 import Parser.AST.View.ViewCreateNode;
@@ -749,7 +750,103 @@ public class OracleParser {
      * @param parseTokens should start with LOOP | WHILE | FOR
      */
     public static ASTNode parseLoop(List<Token> parseTokens) {
-        return null;
+        ASTNode root = null;
+        ASTNode currentNode = null;
+        for (int i = 0; i < parseTokens.size(); i++) {
+            //match LOOP
+            if (parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("LOOP")) {
+                root = new LoopNode();
+                root.addToken(parseTokens.get(i));
+                currentNode = root;
+            }
+            // match WHILE condition LOOP
+            else if (parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("WHILE")) {
+                root = new WhileNode();
+                for (int j = i; j < parseTokens.size(); j++) {
+                    root.addToken(parseTokens.get(j));
+                    if (parseTokens.get(j).hasType(Token.TokenType.KEYWORD) && parseTokens.get(j).getValue().equals("LOOP")) {
+                        i = j;
+                        break;
+                    }
+                }
+                currentNode = root;
+
+            }
+            // match FOR counter IN start..stop LOOP
+            else if (parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("FOR")) {
+                root = new ForNode();
+                for (int j = i; j < parseTokens.size(); j++) {
+                    root.addToken(parseTokens.get(j));
+                    if (parseTokens.get(j).hasType(Token.TokenType.KEYWORD) && parseTokens.get(j).getValue().equals("LOOP")) {
+                        i = j;
+                        break;
+                    }
+                }
+                currentNode = root;
+            }
+            // match END LOOP;
+            else if (parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("END")) {
+                ASTNode childNode = new LoopEndNode();
+                for (int j = i; j < parseTokens.size(); j++) {
+                    childNode.addToken(parseTokens.get(j));
+                    if (parseTokens.get(j).hasType(Token.TokenType.SYMBOL) && parseTokens.get(j).getValue().equals(";")) {
+                        i = j;
+                        break;
+                    }
+                }
+                currentNode.addChild(childNode);
+                currentNode = childNode;
+            }
+            // match EXIT WHEN condition;
+            else if (parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("EXIT")) {
+                ASTNode childNode = new LoopExitNode();
+                for (int j = i; j < parseTokens.size(); j++) {
+                    childNode.addToken(parseTokens.get(j));
+                    if (parseTokens.get(j).hasType(Token.TokenType.SYMBOL) && parseTokens.get(j).getValue().equals(";")) {
+                        i = j;
+                        break;
+                    }
+                }
+                currentNode.addChild(childNode);
+                currentNode = childNode;
+            }
+            //match LOOP BODY
+            else if (
+                    (currentNode == root && root instanceof LoopNode)
+                    || (currentNode == root && root instanceof WhileNode)
+                    || (currentNode == root && root instanceof ForNode)
+            ) {
+                ASTNode childNode = new LoopBodyNode();
+                for (int j = i; j < parseTokens.size(); j++) {
+                    if (
+                            parseTokens.get(j).hasType(Token.TokenType.KEYWORD) && parseTokens.get(j).getValue().equals("EXIT")
+                                    || parseTokens.get(j).hasType(Token.TokenType.KEYWORD) && parseTokens.get(j).getValue().equals("END")
+                    ) {
+                        i = j - 1;
+                        break;
+                    }
+                    childNode.addToken(parseTokens.get(j));
+                    if (parseTokens.get(j).hasType(Token.TokenType.SYMBOL) && parseTokens.get(j).getValue().equals(";")) {
+                        currentNode.addChild(childNode);
+                        currentNode = childNode;
+                        childNode = new LoopBodyNode();
+                    }
+                }
+            }
+            else if (parseTokens.get(i).hasType(Token.TokenType.EOF)) {
+                break;
+            }
+            else {
+                try {
+                    throw new ParseFailedException("Parse failed!--" + parseTokens.get(i));
+                }
+                catch (ParseFailedException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+
+        return root;
     }
 
     /**
-- 
Gitee


From f871f595d6a3be7064e30c3f513d19e398d9bc73 Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Sun, 15 Sep 2024 23:10:55 +0800
Subject: [PATCH 075/113] add Exception document

---
 sqlTranslate/.idea/workspace.xml              | 28 +++++++++----------
 .../main/java/Document/Exception in Oracle    | 20 +++++++++++++
 sqlTranslate/src/main/java/Document/Todolist  | 14 +++++-----
 .../src/main/java/Lexer/OracleLexer.java      |  2 +-
 sqlTranslate/src/main/java/Main.java          |  1 +
 .../src/main/java/Parser/OracleParser.java    |  2 +-
 6 files changed, 44 insertions(+), 23 deletions(-)
 create mode 100644 sqlTranslate/src/main/java/Document/Exception in Oracle

diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
index 927c33fb..c13465a4 100644
--- a/sqlTranslate/.idea/workspace.xml
+++ b/sqlTranslate/.idea/workspace.xml
@@ -4,12 +4,12 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add Loop ast classes">
+    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add Loop">
+      <change afterPath="$PROJECT_DIR$/src/main/java/Document/Exception in Oracle" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Generator/OpenGaussGenerator.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Generator/OpenGaussGenerator.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Document/Todolist" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Document/Todolist" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/Lexer/OracleLexer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Lexer/OracleLexer.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Main.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/ASTNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/ASTNode.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -20,8 +20,8 @@
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
       <list>
-        <option value="Class" />
         <option value="Interface" />
+        <option value="Class" />
       </list>
     </option>
   </component>
@@ -108,13 +108,6 @@
       <option name="presentableId" value="Default" />
       <updated>1723106789329</updated>
     </task>
-    <task id="LOCAL-00023" summary="add todolist">
-      <created>1725890826442</created>
-      <option name="number" value="00023" />
-      <option name="presentableId" value="LOCAL-00023" />
-      <option name="project" value="LOCAL" />
-      <updated>1725890826442</updated>
-    </task>
     <task id="LOCAL-00024" summary="add todolist">
       <created>1725896687932</created>
       <option name="number" value="00024" />
@@ -451,7 +444,14 @@
       <option name="project" value="LOCAL" />
       <updated>1726316179152</updated>
     </task>
-    <option name="localTasksCounter" value="72" />
+    <task id="LOCAL-00072" summary="add Loop">
+      <created>1726326745122</created>
+      <option name="number" value="00072" />
+      <option name="presentableId" value="LOCAL-00072" />
+      <option name="project" value="LOCAL" />
+      <updated>1726326745123</updated>
+    </task>
+    <option name="localTasksCounter" value="73" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
@@ -466,7 +466,6 @@
     </option>
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="add join convert rule" />
     <MESSAGE value="refractor" />
     <MESSAGE value="add select convert rules" />
     <MESSAGE value="add update ast class" />
@@ -491,7 +490,8 @@
     <MESSAGE value="add Loop document" />
     <MESSAGE value="add Loop keywords" />
     <MESSAGE value="add Loop ast classes" />
-    <option name="LAST_COMMIT_MESSAGE" value="add Loop ast classes" />
+    <MESSAGE value="add Loop" />
+    <option name="LAST_COMMIT_MESSAGE" value="add Loop" />
   </component>
   <component name="XDebuggerManager">
     <watches-manager>
diff --git a/sqlTranslate/src/main/java/Document/Exception in Oracle b/sqlTranslate/src/main/java/Document/Exception in Oracle
new file mode 100644
index 00000000..b608c4fd
--- /dev/null
+++ b/sqlTranslate/src/main/java/Document/Exception in Oracle	
@@ -0,0 +1,20 @@
+EXCEPTION
+    -- custom exception
+    WHEN e_custom_exception THEN
+        DBMS_OUTPUT.PUT_LINE('Caught an exception: Custom exception raised');
+    -- divide by zero
+    WHEN ZERO_DIVIDE THEN
+        DBMS_OUTPUT.PUT_LINE('Caught an exception: Division by zero');
+    -- invalid text representations
+    WHEN INVALID_NUMBER THEN
+        DBMS_OUTPUT.PUT_LINE('Caught an exception: Invalid number');
+    -- other exceptions
+    WHEN OTHERS THEN
+        DBMS_OUTPUT.PUT_LINE('Caught an exception: ' || SQLERRM);
+
+Example:
+    EXCEPTION
+        WHEN ZERO_DIVIDE THEN
+            DBMS_OUTPUT.PUT_LINE('Caught an exception: Division by zero');
+        WHEN OTHERS THEN
+            DBMS_OUTPUT.PUT_LINE('Caught an exception: ' || SQLERRM);
\ No newline at end of file
diff --git a/sqlTranslate/src/main/java/Document/Todolist b/sqlTranslate/src/main/java/Document/Todolist
index fed81ff2..13fdb933 100644
--- a/sqlTranslate/src/main/java/Document/Todolist
+++ b/sqlTranslate/src/main/java/Document/Todolist
@@ -12,16 +12,16 @@ Operation
  loop... end loop 1
  while... loop... end loop 1
  for ... in () loop end loop 1
- continue、exit
- return
- exception
- commit、rollback、execute
+ continue、exit 1
+ return ****
+ exception **
+ commit、rollback、execute ****
  alter table 1
  create table 1
  drop table 1
 Object
  table 1
  view 1
- function
- procedure
- trigger
\ No newline at end of file
+ function ***
+ procedure ***
+ trigger *****
\ No newline at end of file
diff --git a/sqlTranslate/src/main/java/Lexer/OracleLexer.java b/sqlTranslate/src/main/java/Lexer/OracleLexer.java
index fd5c8526..96e3a49d 100644
--- a/sqlTranslate/src/main/java/Lexer/OracleLexer.java
+++ b/sqlTranslate/src/main/java/Lexer/OracleLexer.java
@@ -32,7 +32,7 @@ public class OracleLexer {
             // PL/SQL
             , ":=", "IF", "ELSIF", "BEGIN", ".."
             // Loop
-            , "LOOP", "EXIT", "WHILE", "FOR", "IN"
+            , "LOOP", "EXIT", "WHILE", "FOR", "IN", "CONTINUE"
     };
     private static final Pattern TOKEN_PATTERN = Pattern.compile(
             "(NUMBER\\(.*?\\))|" +                     // NUMBER() function
diff --git a/sqlTranslate/src/main/java/Main.java b/sqlTranslate/src/main/java/Main.java
index 35a3658c..7fc0ed16 100644
--- a/sqlTranslate/src/main/java/Main.java
+++ b/sqlTranslate/src/main/java/Main.java
@@ -47,6 +47,7 @@ public class Main {
 //                "             END IF;";
         String sql = "LOOP\n" +
                 "        DBMS_OUTPUT.PUT_LINE(v_counter);\n" +
+                "        Continue;\n" +
                 "        v_counter := v_counter + 1;\n" +
                 "        EXIT WHEN v_counter > 10;\n" +
                 "    END LOOP;";
diff --git a/sqlTranslate/src/main/java/Parser/OracleParser.java b/sqlTranslate/src/main/java/Parser/OracleParser.java
index 2f893ac3..7844d920 100644
--- a/sqlTranslate/src/main/java/Parser/OracleParser.java
+++ b/sqlTranslate/src/main/java/Parser/OracleParser.java
@@ -797,7 +797,7 @@ public class OracleParser {
                 currentNode.addChild(childNode);
                 currentNode = childNode;
             }
-            // match EXIT WHEN condition;
+            // match EXIT condition;
             else if (parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("EXIT")) {
                 ASTNode childNode = new LoopExitNode();
                 for (int j = i; j < parseTokens.size(); j++) {
-- 
Gitee


From 9a06b2e574947f3b5b2b9f99dcfe0105b9c6da8e Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Sun, 15 Sep 2024 23:11:07 +0800
Subject: [PATCH 076/113] add Exception document

---
 sqlTranslate/src/main/java/Document/Exception in Oracle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sqlTranslate/src/main/java/Document/Exception in Oracle b/sqlTranslate/src/main/java/Document/Exception in Oracle
index b608c4fd..448b02eb 100644
--- a/sqlTranslate/src/main/java/Document/Exception in Oracle	
+++ b/sqlTranslate/src/main/java/Document/Exception in Oracle	
@@ -5,7 +5,7 @@ EXCEPTION
     -- divide by zero
     WHEN ZERO_DIVIDE THEN
         DBMS_OUTPUT.PUT_LINE('Caught an exception: Division by zero');
-    -- invalid text representations
+    -- invalid number
     WHEN INVALID_NUMBER THEN
         DBMS_OUTPUT.PUT_LINE('Caught an exception: Invalid number');
     -- other exceptions
-- 
Gitee


From 2566ca965bf5b9e118e33440040b4ed891449ab2 Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Mon, 16 Sep 2024 15:17:37 +0800
Subject: [PATCH 077/113] revise

---
 sqlTranslate/.idea/workspace.xml              | 47 ++++++++++---------
 .../main/java/Document/Exception in Oracle    |  7 ---
 .../java/Generator/OpenGaussGenerator.java    | 46 ++++++++++++++----
 .../src/main/java/Lexer/OracleLexer.java      |  2 +
 .../AST/Exception/CustomExceptionNode.java    | 32 +++++++++++++
 .../AST/Exception/ExceptionActionNode.java    |  4 ++
 .../Parser/AST/Exception/ExceptionNode.java   |  4 ++
 .../AST/Exception/Invalid_numberNode.java     |  4 ++
 .../AST/Exception/OtherExceptionNode.java     |  4 ++
 .../Parser/AST/Exception/Zero_divideNode.java |  4 ++
 10 files changed, 118 insertions(+), 36 deletions(-)
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/Exception/CustomExceptionNode.java
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/Exception/ExceptionActionNode.java
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/Exception/ExceptionNode.java
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/Exception/Invalid_numberNode.java
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/Exception/OtherExceptionNode.java
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/Exception/Zero_divideNode.java

diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
index c13465a4..c93dd657 100644
--- a/sqlTranslate/.idea/workspace.xml
+++ b/sqlTranslate/.idea/workspace.xml
@@ -4,13 +4,18 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add Loop">
-      <change afterPath="$PROJECT_DIR$/src/main/java/Document/Exception in Oracle" afterDir="false" />
+    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add Exception document">
+      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Exception/CustomExceptionNode.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Exception/ExceptionActionNode.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Exception/ExceptionNode.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Exception/Invalid_numberNode.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Exception/OtherExceptionNode.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Exception/Zero_divideNode.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Document/Todolist" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Document/Todolist" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Document/Exception in Oracle" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Document/Exception in Oracle" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Generator/OpenGaussGenerator.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Generator/OpenGaussGenerator.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/Lexer/OracleLexer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Lexer/OracleLexer.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Main.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -108,20 +113,6 @@
       <option name="presentableId" value="Default" />
       <updated>1723106789329</updated>
     </task>
-    <task id="LOCAL-00024" summary="add todolist">
-      <created>1725896687932</created>
-      <option name="number" value="00024" />
-      <option name="presentableId" value="LOCAL-00024" />
-      <option name="project" value="LOCAL" />
-      <updated>1725896687932</updated>
-    </task>
-    <task id="LOCAL-00025" summary="add select">
-      <created>1725937361130</created>
-      <option name="number" value="00025" />
-      <option name="presentableId" value="LOCAL-00025" />
-      <option name="project" value="LOCAL" />
-      <updated>1725937361130</updated>
-    </task>
     <task id="LOCAL-00026" summary="add select">
       <created>1725955766774</created>
       <option name="number" value="00026" />
@@ -451,7 +442,21 @@
       <option name="project" value="LOCAL" />
       <updated>1726326745123</updated>
     </task>
-    <option name="localTasksCounter" value="73" />
+    <task id="LOCAL-00073" summary="add Exception document">
+      <created>1726413056810</created>
+      <option name="number" value="00073" />
+      <option name="presentableId" value="LOCAL-00073" />
+      <option name="project" value="LOCAL" />
+      <updated>1726413056811</updated>
+    </task>
+    <task id="LOCAL-00074" summary="add Exception document">
+      <created>1726413069101</created>
+      <option name="number" value="00074" />
+      <option name="presentableId" value="LOCAL-00074" />
+      <option name="project" value="LOCAL" />
+      <updated>1726413069101</updated>
+    </task>
+    <option name="localTasksCounter" value="75" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
@@ -466,7 +471,6 @@
     </option>
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="refractor" />
     <MESSAGE value="add select convert rules" />
     <MESSAGE value="add update ast class" />
     <MESSAGE value="add update convert rules" />
@@ -491,7 +495,8 @@
     <MESSAGE value="add Loop keywords" />
     <MESSAGE value="add Loop ast classes" />
     <MESSAGE value="add Loop" />
-    <option name="LAST_COMMIT_MESSAGE" value="add Loop" />
+    <MESSAGE value="add Exception document" />
+    <option name="LAST_COMMIT_MESSAGE" value="add Exception document" />
   </component>
   <component name="XDebuggerManager">
     <watches-manager>
diff --git a/sqlTranslate/src/main/java/Document/Exception in Oracle b/sqlTranslate/src/main/java/Document/Exception in Oracle
index 448b02eb..71952a4f 100644
--- a/sqlTranslate/src/main/java/Document/Exception in Oracle	
+++ b/sqlTranslate/src/main/java/Document/Exception in Oracle	
@@ -11,10 +11,3 @@ EXCEPTION
     -- other exceptions
     WHEN OTHERS THEN
         DBMS_OUTPUT.PUT_LINE('Caught an exception: ' || SQLERRM);
-
-Example:
-    EXCEPTION
-        WHEN ZERO_DIVIDE THEN
-            DBMS_OUTPUT.PUT_LINE('Caught an exception: Division by zero');
-        WHEN OTHERS THEN
-            DBMS_OUTPUT.PUT_LINE('Caught an exception: ' || SQLERRM);
\ No newline at end of file
diff --git a/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java b/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java
index e104de42..548bcba6 100644
--- a/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java
+++ b/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java
@@ -1,6 +1,7 @@
 package Generator;
 
 import Interface.ColumnType;
+import Lexer.OracleLexer;
 import Lexer.Token;
 import Parser.AST.ASTNode;
 import Parser.AST.AlterTable.AlterAddColumnNode;
@@ -233,14 +234,43 @@ public class OpenGaussGenerator {
                     break;
                 }
             }
-            List<Token> tokens = new ArrayList<>();
-            tokens.add(new Token(Token.TokenType.KEYWORD, "RAISE"));
-            tokens.add(new Token(Token.TokenType.KEYWORD, "NOTICE"));
-            tokens.add(new Token(Token.TokenType.STRING, "'%'"));
-            tokens.add(new Token(Token.TokenType.SYMBOL, ","));
-            tokens.add(new Token(Token.TokenType.IDENTIFIER, printObj));
-            tokens.add(new Token(Token.TokenType.SYMBOL, ";"));
-            node.setTokens(tokens);
+            if (!printObj.contains("||")) {
+                List<Token> tokens = new ArrayList<>();
+                tokens.add(new Token(Token.TokenType.KEYWORD, "RAISE"));
+                tokens.add(new Token(Token.TokenType.KEYWORD, "NOTICE"));
+                tokens.add(new Token(Token.TokenType.STRING, "'%'"));
+                tokens.add(new Token(Token.TokenType.SYMBOL, ","));
+                tokens.add(new Token(Token.TokenType.IDENTIFIER, printObj));
+                tokens.add(new Token(Token.TokenType.SYMBOL, ";"));
+                node.setTokens(tokens);
+            }
+            else {
+                OracleLexer lexer = new OracleLexer(printObj.replace("||", " "));
+                String output = "";
+                List<Token> outputObj = new ArrayList<>();
+                for (Token token: lexer.getTokens()) {
+                    if (token.hasType(Token.TokenType.STRING)) {
+                        output += token.getValue().replace("'", "");
+                    }
+                    else if (token.hasType(Token.TokenType.IDENTIFIER)) {
+                        output += "%";
+                        outputObj.add(token);
+                    }
+                    else {
+                        continue;
+                    }
+                }
+                List<Token> tokens = new ArrayList<>();
+                tokens.add(new Token(Token.TokenType.KEYWORD, "RAISE"));
+                tokens.add(new Token(Token.TokenType.KEYWORD, "NOTICE"));
+                tokens.add(new Token(Token.TokenType.STRING, "'" + output + "'"));
+                for (Token token: outputObj) {
+                    tokens.add(new Token(Token.TokenType.SYMBOL, ","));
+                    tokens.add(token);
+                }
+                tokens.add(new Token(Token.TokenType.SYMBOL, ";"));
+                node.setTokens(tokens);
+            }
         }
     }
 
diff --git a/sqlTranslate/src/main/java/Lexer/OracleLexer.java b/sqlTranslate/src/main/java/Lexer/OracleLexer.java
index 96e3a49d..9fb4e848 100644
--- a/sqlTranslate/src/main/java/Lexer/OracleLexer.java
+++ b/sqlTranslate/src/main/java/Lexer/OracleLexer.java
@@ -33,6 +33,8 @@ public class OracleLexer {
             , ":=", "IF", "ELSIF", "BEGIN", ".."
             // Loop
             , "LOOP", "EXIT", "WHILE", "FOR", "IN", "CONTINUE"
+            // Exception
+            , "EXCEPTION", "SQLERRM", "ZERO_DIVIDE", "INVALID_NUMBER"
     };
     private static final Pattern TOKEN_PATTERN = Pattern.compile(
             "(NUMBER\\(.*?\\))|" +                     // NUMBER() function
diff --git a/sqlTranslate/src/main/java/Parser/AST/Exception/CustomExceptionNode.java b/sqlTranslate/src/main/java/Parser/AST/Exception/CustomExceptionNode.java
new file mode 100644
index 00000000..16b20946
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/Exception/CustomExceptionNode.java
@@ -0,0 +1,32 @@
+package Parser.AST.Exception;
+
+import Lexer.Token;
+import Parser.AST.ASTNode;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class CustomExceptionNode extends ASTNode {
+    public CustomExceptionNode () {
+        super();
+        setTokens(new ArrayList<>());
+    }
+
+    public CustomExceptionNode (ASTNode node) {
+        super(node);
+        setTokens(new ArrayList<>());
+    }
+
+    public CustomExceptionNode (List<Token> tokens) {
+        super(tokens);
+        setTokens(new ArrayList<>());
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString) {
+        queryString.append(toString() + " ");
+        for (ASTNode child : node.getChildren()) {
+            child.visit(child, queryString);
+        }
+    }
+}
diff --git a/sqlTranslate/src/main/java/Parser/AST/Exception/ExceptionActionNode.java b/sqlTranslate/src/main/java/Parser/AST/Exception/ExceptionActionNode.java
new file mode 100644
index 00000000..cdddba7b
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/Exception/ExceptionActionNode.java
@@ -0,0 +1,4 @@
+package Parser.AST.Exception;
+
+public class ExceptionActionNode {
+}
diff --git a/sqlTranslate/src/main/java/Parser/AST/Exception/ExceptionNode.java b/sqlTranslate/src/main/java/Parser/AST/Exception/ExceptionNode.java
new file mode 100644
index 00000000..c4b1ecff
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/Exception/ExceptionNode.java
@@ -0,0 +1,4 @@
+package Parser.AST.Exception;
+
+public class ExceptionNode {
+}
diff --git a/sqlTranslate/src/main/java/Parser/AST/Exception/Invalid_numberNode.java b/sqlTranslate/src/main/java/Parser/AST/Exception/Invalid_numberNode.java
new file mode 100644
index 00000000..7acbb935
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/Exception/Invalid_numberNode.java
@@ -0,0 +1,4 @@
+package Parser.AST.Exception;
+
+public class Invalid_numberNode {
+}
diff --git a/sqlTranslate/src/main/java/Parser/AST/Exception/OtherExceptionNode.java b/sqlTranslate/src/main/java/Parser/AST/Exception/OtherExceptionNode.java
new file mode 100644
index 00000000..5c309e2d
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/Exception/OtherExceptionNode.java
@@ -0,0 +1,4 @@
+package Parser.AST.Exception;
+
+public class OtherExceptionNode {
+}
diff --git a/sqlTranslate/src/main/java/Parser/AST/Exception/Zero_divideNode.java b/sqlTranslate/src/main/java/Parser/AST/Exception/Zero_divideNode.java
new file mode 100644
index 00000000..fb0fe895
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/Exception/Zero_divideNode.java
@@ -0,0 +1,4 @@
+package Parser.AST.Exception;
+
+public class Zero_divideNode {
+}
-- 
Gitee


From 82c337f52d4bb0491e6c996a90e5a8495e7fc127 Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Mon, 16 Sep 2024 15:23:01 +0800
Subject: [PATCH 078/113] add exception classes

---
 sqlTranslate/.idea/workspace.xml              | 34 ++++++-------------
 .../AST/Exception/ExceptionActionNode.java    | 30 +++++++++++++++-
 .../Parser/AST/Exception/ExceptionNode.java   | 30 +++++++++++++++-
 .../AST/Exception/Invalid_numberNode.java     | 31 ++++++++++++++++-
 .../AST/Exception/OtherExceptionNode.java     | 31 ++++++++++++++++-
 .../Parser/AST/Exception/Zero_divideNode.java | 31 ++++++++++++++++-
 6 files changed, 159 insertions(+), 28 deletions(-)

diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
index c93dd657..134f1e26 100644
--- a/sqlTranslate/.idea/workspace.xml
+++ b/sqlTranslate/.idea/workspace.xml
@@ -4,19 +4,7 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add Exception document">
-      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Exception/CustomExceptionNode.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Exception/ExceptionActionNode.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Exception/ExceptionNode.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Exception/Invalid_numberNode.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Exception/OtherExceptionNode.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Exception/Zero_divideNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Document/Exception in Oracle" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Document/Exception in Oracle" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Generator/OpenGaussGenerator.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Generator/OpenGaussGenerator.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Lexer/OracleLexer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Lexer/OracleLexer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Main.java" afterDir="false" />
-    </list>
+    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="revise" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -113,13 +101,6 @@
       <option name="presentableId" value="Default" />
       <updated>1723106789329</updated>
     </task>
-    <task id="LOCAL-00026" summary="add select">
-      <created>1725955766774</created>
-      <option name="number" value="00026" />
-      <option name="presentableId" value="LOCAL-00026" />
-      <option name="project" value="LOCAL" />
-      <updated>1725955766774</updated>
-    </task>
     <task id="LOCAL-00027" summary="add case when">
       <created>1725956415475</created>
       <option name="number" value="00027" />
@@ -456,7 +437,14 @@
       <option name="project" value="LOCAL" />
       <updated>1726413069101</updated>
     </task>
-    <option name="localTasksCounter" value="75" />
+    <task id="LOCAL-00075" summary="revise">
+      <created>1726471059208</created>
+      <option name="number" value="00075" />
+      <option name="presentableId" value="LOCAL-00075" />
+      <option name="project" value="LOCAL" />
+      <updated>1726471059208</updated>
+    </task>
+    <option name="localTasksCounter" value="76" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
@@ -487,7 +475,6 @@
     <MESSAGE value="add ast class of view" />
     <MESSAGE value="add view" />
     <MESSAGE value="add view generate method" />
-    <MESSAGE value="revise" />
     <MESSAGE value="add if elseif else endif document" />
     <MESSAGE value="add if elseif else endif ast classes" />
     <MESSAGE value="add IF ELSIF" />
@@ -496,7 +483,8 @@
     <MESSAGE value="add Loop ast classes" />
     <MESSAGE value="add Loop" />
     <MESSAGE value="add Exception document" />
-    <option name="LAST_COMMIT_MESSAGE" value="add Exception document" />
+    <MESSAGE value="revise" />
+    <option name="LAST_COMMIT_MESSAGE" value="revise" />
   </component>
   <component name="XDebuggerManager">
     <watches-manager>
diff --git a/sqlTranslate/src/main/java/Parser/AST/Exception/ExceptionActionNode.java b/sqlTranslate/src/main/java/Parser/AST/Exception/ExceptionActionNode.java
index cdddba7b..7d6a1d5b 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Exception/ExceptionActionNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/Exception/ExceptionActionNode.java
@@ -1,4 +1,32 @@
 package Parser.AST.Exception;
 
-public class ExceptionActionNode {
+import Lexer.Token;
+import Parser.AST.ASTNode;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ExceptionActionNode extends ASTNode {
+    public ExceptionActionNode() {
+        super();
+        setTokens(new ArrayList<>());
+    }
+
+    public ExceptionActionNode(ASTNode node) {
+        super(node);
+        setTokens(new ArrayList<>());
+    }
+
+    public ExceptionActionNode(List<Token> tokens) {
+        super(tokens);
+        setTokens(new ArrayList<>());
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString) {
+        queryString.append(toString() + " ");
+        for (ASTNode child : node.getChildren()) {
+            child.visit(child, queryString);
+        }
+    }
 }
diff --git a/sqlTranslate/src/main/java/Parser/AST/Exception/ExceptionNode.java b/sqlTranslate/src/main/java/Parser/AST/Exception/ExceptionNode.java
index c4b1ecff..9ec0752a 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Exception/ExceptionNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/Exception/ExceptionNode.java
@@ -1,4 +1,32 @@
 package Parser.AST.Exception;
 
-public class ExceptionNode {
+import Lexer.Token;
+import Parser.AST.ASTNode;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ExceptionNode extends ASTNode {
+
+    public ExceptionNode() {
+        super();
+        setTokens(new ArrayList<>());
+    }
+
+    public ExceptionNode(ASTNode node) {
+        super(node);
+        setTokens(new ArrayList<>());
+    }
+
+    public ExceptionNode(List<Token> tokens) {
+        super(tokens);
+        setTokens(new ArrayList<>());
+    }
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString) {
+        queryString.append(toString() + " ");
+        for (ASTNode child : node.getChildren()) {
+            child.visit(child, queryString);
+        }
+    }
 }
diff --git a/sqlTranslate/src/main/java/Parser/AST/Exception/Invalid_numberNode.java b/sqlTranslate/src/main/java/Parser/AST/Exception/Invalid_numberNode.java
index 7acbb935..e66e84b1 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Exception/Invalid_numberNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/Exception/Invalid_numberNode.java
@@ -1,4 +1,33 @@
 package Parser.AST.Exception;
 
-public class Invalid_numberNode {
+import Lexer.Token;
+import Parser.AST.ASTNode;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class Invalid_numberNode extends ASTNode {
+
+    public Invalid_numberNode() {
+        super();
+        setTokens(new ArrayList<>());
+    }
+
+    public Invalid_numberNode(ASTNode node) {
+        super(node);
+        setTokens(new ArrayList<>());
+    }
+
+    public Invalid_numberNode(List<Token> tokens) {
+        super(tokens);
+        setTokens(new ArrayList<>());
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString) {
+        queryString.append(toString() + " ");
+        for (ASTNode child : node.getChildren()) {
+            child.visit(child, queryString);
+        }
+    }
 }
diff --git a/sqlTranslate/src/main/java/Parser/AST/Exception/OtherExceptionNode.java b/sqlTranslate/src/main/java/Parser/AST/Exception/OtherExceptionNode.java
index 5c309e2d..9d7ac557 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Exception/OtherExceptionNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/Exception/OtherExceptionNode.java
@@ -1,4 +1,33 @@
 package Parser.AST.Exception;
 
-public class OtherExceptionNode {
+import Lexer.Token;
+import Parser.AST.ASTNode;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class OtherExceptionNode extends ASTNode {
+
+    public OtherExceptionNode() {
+        super();
+        setTokens(new ArrayList<>());
+    }
+
+    public OtherExceptionNode(ASTNode node) {
+        super(node);
+        setTokens(new ArrayList<>());
+    }
+
+    public OtherExceptionNode(List<Token> tokens) {
+        super(tokens);
+        setTokens(new ArrayList<>());
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString) {
+        queryString.append(toString() + " ");
+        for (ASTNode child : node.getChildren()) {
+            child.visit(child, queryString);
+        }
+    }
 }
diff --git a/sqlTranslate/src/main/java/Parser/AST/Exception/Zero_divideNode.java b/sqlTranslate/src/main/java/Parser/AST/Exception/Zero_divideNode.java
index fb0fe895..7b29a0c9 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Exception/Zero_divideNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/Exception/Zero_divideNode.java
@@ -1,4 +1,33 @@
 package Parser.AST.Exception;
 
-public class Zero_divideNode {
+import Lexer.Token;
+import Parser.AST.ASTNode;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class Zero_divideNode extends ASTNode {
+
+    public Zero_divideNode() {
+        super();
+        setTokens(new ArrayList<>());
+    }
+
+    public Zero_divideNode(ASTNode node) {
+        super(node);
+        setTokens(new ArrayList<>());
+    }
+
+    public Zero_divideNode(List<Token> tokens) {
+        super(tokens);
+        setTokens(new ArrayList<>());
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString) {
+        queryString.append(toString() + " ");
+        for (ASTNode child : node.getChildren()) {
+            child.visit(child, queryString);
+        }
+    }
 }
-- 
Gitee


From 565851cb6cd7da4a5fc0f4fa55107cabea83229d Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Mon, 16 Sep 2024 15:38:40 +0800
Subject: [PATCH 079/113] revise

---
 sqlTranslate/.idea/workspace.xml              | 25 +++++++++--------
 .../main/java/Document/Exception in Oracle    |  5 ++++
 .../AST/Exception/CustomExceptionNode.java    |  2 --
 .../AST/Exception/ExceptionActionNode.java    |  2 --
 .../AST/Exception/ExceptionEndNode.java       | 27 +++++++++++++++++++
 .../Parser/AST/Exception/ExceptionNode.java   |  2 --
 .../AST/Exception/Invalid_numberNode.java     |  2 --
 .../AST/Exception/OtherExceptionNode.java     |  2 --
 .../Parser/AST/Exception/Zero_divideNode.java |  2 --
 .../java/Parser/AST/IFELSIF/ELSENode.java     |  2 --
 .../Parser/AST/IFELSIF/ELSIFActionNode.java   |  2 --
 .../AST/IFELSIF/ELSIFConditionNode.java       |  2 --
 .../java/Parser/AST/IFELSIF/EndIFNode.java    |  2 --
 .../java/Parser/AST/IFELSIF/IFActionNode.java |  2 --
 .../Parser/AST/IFELSIF/IFConditionNode.java   |  2 --
 .../main/java/Parser/AST/Loop/ForNode.java    |  2 --
 .../java/Parser/AST/Loop/LoopBodyNode.java    |  2 --
 .../java/Parser/AST/Loop/LoopEndNode.java     |  2 --
 .../java/Parser/AST/Loop/LoopExitNode.java    |  2 --
 .../main/java/Parser/AST/Loop/LoopNode.java   |  2 --
 .../main/java/Parser/AST/Loop/WhileNode.java  |  2 --
 21 files changed, 46 insertions(+), 47 deletions(-)
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/Exception/ExceptionEndNode.java

diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
index 134f1e26..84610ff8 100644
--- a/sqlTranslate/.idea/workspace.xml
+++ b/sqlTranslate/.idea/workspace.xml
@@ -4,7 +4,10 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="revise" />
+    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add exception classes">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Document/Exception in Oracle" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Document/Exception in Oracle" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -101,13 +104,6 @@
       <option name="presentableId" value="Default" />
       <updated>1723106789329</updated>
     </task>
-    <task id="LOCAL-00027" summary="add case when">
-      <created>1725956415475</created>
-      <option name="number" value="00027" />
-      <option name="presentableId" value="LOCAL-00027" />
-      <option name="project" value="LOCAL" />
-      <updated>1725956415475</updated>
-    </task>
     <task id="LOCAL-00028" summary="revise">
       <created>1725958136981</created>
       <option name="number" value="00028" />
@@ -444,7 +440,14 @@
       <option name="project" value="LOCAL" />
       <updated>1726471059208</updated>
     </task>
-    <option name="localTasksCounter" value="76" />
+    <task id="LOCAL-00076" summary="add exception classes">
+      <created>1726471382852</created>
+      <option name="number" value="00076" />
+      <option name="presentableId" value="LOCAL-00076" />
+      <option name="project" value="LOCAL" />
+      <updated>1726471382852</updated>
+    </task>
+    <option name="localTasksCounter" value="77" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
@@ -459,7 +462,6 @@
     </option>
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="add select convert rules" />
     <MESSAGE value="add update ast class" />
     <MESSAGE value="add update convert rules" />
     <MESSAGE value="add Delete ast class" />
@@ -484,7 +486,8 @@
     <MESSAGE value="add Loop" />
     <MESSAGE value="add Exception document" />
     <MESSAGE value="revise" />
-    <option name="LAST_COMMIT_MESSAGE" value="revise" />
+    <MESSAGE value="add exception classes" />
+    <option name="LAST_COMMIT_MESSAGE" value="add exception classes" />
   </component>
   <component name="XDebuggerManager">
     <watches-manager>
diff --git a/sqlTranslate/src/main/java/Document/Exception in Oracle b/sqlTranslate/src/main/java/Document/Exception in Oracle
index 71952a4f..769660b6 100644
--- a/sqlTranslate/src/main/java/Document/Exception in Oracle	
+++ b/sqlTranslate/src/main/java/Document/Exception in Oracle	
@@ -1,3 +1,7 @@
+DECLARE
+    -- declaration of variable
+BEGIN
+    -- PL/SQL
 EXCEPTION
     -- custom exception
     WHEN e_custom_exception THEN
@@ -11,3 +15,4 @@ EXCEPTION
     -- other exceptions
     WHEN OTHERS THEN
         DBMS_OUTPUT.PUT_LINE('Caught an exception: ' || SQLERRM);
+END;
\ No newline at end of file
diff --git a/sqlTranslate/src/main/java/Parser/AST/Exception/CustomExceptionNode.java b/sqlTranslate/src/main/java/Parser/AST/Exception/CustomExceptionNode.java
index 16b20946..4ac33083 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Exception/CustomExceptionNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/Exception/CustomExceptionNode.java
@@ -14,12 +14,10 @@ public class CustomExceptionNode extends ASTNode {
 
     public CustomExceptionNode (ASTNode node) {
         super(node);
-        setTokens(new ArrayList<>());
     }
 
     public CustomExceptionNode (List<Token> tokens) {
         super(tokens);
-        setTokens(new ArrayList<>());
     }
 
     @Override
diff --git a/sqlTranslate/src/main/java/Parser/AST/Exception/ExceptionActionNode.java b/sqlTranslate/src/main/java/Parser/AST/Exception/ExceptionActionNode.java
index 7d6a1d5b..9665acd4 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Exception/ExceptionActionNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/Exception/ExceptionActionNode.java
@@ -14,12 +14,10 @@ public class ExceptionActionNode extends ASTNode {
 
     public ExceptionActionNode(ASTNode node) {
         super(node);
-        setTokens(new ArrayList<>());
     }
 
     public ExceptionActionNode(List<Token> tokens) {
         super(tokens);
-        setTokens(new ArrayList<>());
     }
 
     @Override
diff --git a/sqlTranslate/src/main/java/Parser/AST/Exception/ExceptionEndNode.java b/sqlTranslate/src/main/java/Parser/AST/Exception/ExceptionEndNode.java
new file mode 100644
index 00000000..a1b82963
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/Exception/ExceptionEndNode.java
@@ -0,0 +1,27 @@
+package Parser.AST.Exception;
+
+import Lexer.Token;
+import Parser.AST.ASTNode;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ExceptionEndNode extends ASTNode {
+    public ExceptionEndNode() {
+        super();
+        setTokens(new ArrayList<>());
+    }
+
+    public ExceptionEndNode(ASTNode node) {
+        super(node);
+    }
+
+    public ExceptionEndNode(List<Token> tokens) {
+        super(tokens);
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString) {
+
+    }
+}
diff --git a/sqlTranslate/src/main/java/Parser/AST/Exception/ExceptionNode.java b/sqlTranslate/src/main/java/Parser/AST/Exception/ExceptionNode.java
index 9ec0752a..100833be 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Exception/ExceptionNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/Exception/ExceptionNode.java
@@ -15,12 +15,10 @@ public class ExceptionNode extends ASTNode {
 
     public ExceptionNode(ASTNode node) {
         super(node);
-        setTokens(new ArrayList<>());
     }
 
     public ExceptionNode(List<Token> tokens) {
         super(tokens);
-        setTokens(new ArrayList<>());
     }
     @Override
     public void visit(ASTNode node, StringBuilder queryString) {
diff --git a/sqlTranslate/src/main/java/Parser/AST/Exception/Invalid_numberNode.java b/sqlTranslate/src/main/java/Parser/AST/Exception/Invalid_numberNode.java
index e66e84b1..0a404522 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Exception/Invalid_numberNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/Exception/Invalid_numberNode.java
@@ -15,12 +15,10 @@ public class Invalid_numberNode extends ASTNode {
 
     public Invalid_numberNode(ASTNode node) {
         super(node);
-        setTokens(new ArrayList<>());
     }
 
     public Invalid_numberNode(List<Token> tokens) {
         super(tokens);
-        setTokens(new ArrayList<>());
     }
 
     @Override
diff --git a/sqlTranslate/src/main/java/Parser/AST/Exception/OtherExceptionNode.java b/sqlTranslate/src/main/java/Parser/AST/Exception/OtherExceptionNode.java
index 9d7ac557..4dbd5596 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Exception/OtherExceptionNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/Exception/OtherExceptionNode.java
@@ -15,12 +15,10 @@ public class OtherExceptionNode extends ASTNode {
 
     public OtherExceptionNode(ASTNode node) {
         super(node);
-        setTokens(new ArrayList<>());
     }
 
     public OtherExceptionNode(List<Token> tokens) {
         super(tokens);
-        setTokens(new ArrayList<>());
     }
 
     @Override
diff --git a/sqlTranslate/src/main/java/Parser/AST/Exception/Zero_divideNode.java b/sqlTranslate/src/main/java/Parser/AST/Exception/Zero_divideNode.java
index 7b29a0c9..0b79158d 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Exception/Zero_divideNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/Exception/Zero_divideNode.java
@@ -15,12 +15,10 @@ public class Zero_divideNode extends ASTNode {
 
     public Zero_divideNode(ASTNode node) {
         super(node);
-        setTokens(new ArrayList<>());
     }
 
     public Zero_divideNode(List<Token> tokens) {
         super(tokens);
-        setTokens(new ArrayList<>());
     }
 
     @Override
diff --git a/sqlTranslate/src/main/java/Parser/AST/IFELSIF/ELSENode.java b/sqlTranslate/src/main/java/Parser/AST/IFELSIF/ELSENode.java
index dfb14200..d14c3d61 100644
--- a/sqlTranslate/src/main/java/Parser/AST/IFELSIF/ELSENode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/IFELSIF/ELSENode.java
@@ -14,12 +14,10 @@ public class ELSENode extends ASTNode {
 
     public ELSENode(ASTNode node) {
         super(node);
-        setTokens(new ArrayList<>());
     }
 
     public ELSENode(List<Token> tokens) {
         super(tokens);
-        setTokens(new ArrayList<>());
     }
 
     @Override
diff --git a/sqlTranslate/src/main/java/Parser/AST/IFELSIF/ELSIFActionNode.java b/sqlTranslate/src/main/java/Parser/AST/IFELSIF/ELSIFActionNode.java
index 2c88cb19..2d88be55 100644
--- a/sqlTranslate/src/main/java/Parser/AST/IFELSIF/ELSIFActionNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/IFELSIF/ELSIFActionNode.java
@@ -14,12 +14,10 @@ public class ELSIFActionNode extends ASTNode {
 
     public ELSIFActionNode(ASTNode node) {
         super(node);
-        setTokens(new ArrayList<>());
     }
 
     public ELSIFActionNode(List<Token> tokens) {
         super(tokens);
-        setTokens(new ArrayList<>());
     }
 
     @Override
diff --git a/sqlTranslate/src/main/java/Parser/AST/IFELSIF/ELSIFConditionNode.java b/sqlTranslate/src/main/java/Parser/AST/IFELSIF/ELSIFConditionNode.java
index 94379145..d0a2a1c1 100644
--- a/sqlTranslate/src/main/java/Parser/AST/IFELSIF/ELSIFConditionNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/IFELSIF/ELSIFConditionNode.java
@@ -14,12 +14,10 @@ public class ELSIFConditionNode extends ASTNode {
 
     public ELSIFConditionNode(ASTNode node) {
         super(node);
-        setTokens(new ArrayList<>());
     }
 
     public ELSIFConditionNode(List<Token> tokens) {
         super(tokens);
-        setTokens(new ArrayList<>());
     }
 
     @Override
diff --git a/sqlTranslate/src/main/java/Parser/AST/IFELSIF/EndIFNode.java b/sqlTranslate/src/main/java/Parser/AST/IFELSIF/EndIFNode.java
index b6aedf59..bb39895d 100644
--- a/sqlTranslate/src/main/java/Parser/AST/IFELSIF/EndIFNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/IFELSIF/EndIFNode.java
@@ -14,12 +14,10 @@ public class EndIFNode extends ASTNode {
 
     public EndIFNode (ASTNode node) {
         super(node);
-        setTokens(new ArrayList<>());
     }
 
     public EndIFNode (List<Token> tokens) {
         super(tokens);
-        setTokens(new ArrayList<>());
     }
 
     @Override
diff --git a/sqlTranslate/src/main/java/Parser/AST/IFELSIF/IFActionNode.java b/sqlTranslate/src/main/java/Parser/AST/IFELSIF/IFActionNode.java
index 5736d147..e6ca67d1 100644
--- a/sqlTranslate/src/main/java/Parser/AST/IFELSIF/IFActionNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/IFELSIF/IFActionNode.java
@@ -14,12 +14,10 @@ public class IFActionNode extends ASTNode {
 
     public IFActionNode(ASTNode node) {
         super(node);
-        setTokens(new ArrayList<>());
     }
 
     public IFActionNode(List<Token> tokens) {
         super(tokens);
-        setTokens(new ArrayList<>());
     }
 
     @Override
diff --git a/sqlTranslate/src/main/java/Parser/AST/IFELSIF/IFConditionNode.java b/sqlTranslate/src/main/java/Parser/AST/IFELSIF/IFConditionNode.java
index 46298304..12b392ca 100644
--- a/sqlTranslate/src/main/java/Parser/AST/IFELSIF/IFConditionNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/IFELSIF/IFConditionNode.java
@@ -14,12 +14,10 @@ public class IFConditionNode extends ASTNode {
 
     public IFConditionNode(ASTNode node) {
         super(node);
-        setTokens(new ArrayList<>());
     }
 
     public IFConditionNode(List<Token> tokens) {
         super(tokens);
-        setTokens(new ArrayList<>());
     }
 
     @Override
diff --git a/sqlTranslate/src/main/java/Parser/AST/Loop/ForNode.java b/sqlTranslate/src/main/java/Parser/AST/Loop/ForNode.java
index c70d1ac3..357e1725 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Loop/ForNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/Loop/ForNode.java
@@ -14,12 +14,10 @@ public class ForNode extends ASTNode {
 
     public ForNode(ASTNode node) {
         super(node);
-        setTokens(new ArrayList<>());
     }
 
     public ForNode(List<Token> tokens) {
         super(tokens);
-        setTokens(new ArrayList<>());
     }
 
     @Override
diff --git a/sqlTranslate/src/main/java/Parser/AST/Loop/LoopBodyNode.java b/sqlTranslate/src/main/java/Parser/AST/Loop/LoopBodyNode.java
index 84140970..28655c4d 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Loop/LoopBodyNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/Loop/LoopBodyNode.java
@@ -14,12 +14,10 @@ public class LoopBodyNode extends ASTNode {
 
     public LoopBodyNode(ASTNode node) {
         super(node);
-        setTokens(new ArrayList<>());
     }
 
     public LoopBodyNode(List<Token> tokens) {
         super(tokens);
-        setTokens(new ArrayList<>());
     }
 
     @Override
diff --git a/sqlTranslate/src/main/java/Parser/AST/Loop/LoopEndNode.java b/sqlTranslate/src/main/java/Parser/AST/Loop/LoopEndNode.java
index 895b5a2a..abcd3a56 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Loop/LoopEndNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/Loop/LoopEndNode.java
@@ -14,12 +14,10 @@ public class LoopEndNode extends ASTNode {
 
     public LoopEndNode(ASTNode node) {
         super(node);
-        setTokens(new ArrayList<>());
     }
 
     public LoopEndNode(List<Token> tokens) {
         super(tokens);
-        setTokens(new ArrayList<>());
     }
 
     @Override
diff --git a/sqlTranslate/src/main/java/Parser/AST/Loop/LoopExitNode.java b/sqlTranslate/src/main/java/Parser/AST/Loop/LoopExitNode.java
index 76f105c7..3311826a 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Loop/LoopExitNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/Loop/LoopExitNode.java
@@ -14,12 +14,10 @@ public class LoopExitNode extends ASTNode {
 
     public LoopExitNode(ASTNode node) {
         super(node);
-        setTokens(new ArrayList<>());
     }
 
     public LoopExitNode(List<Token> tokens) {
         super(tokens);
-        setTokens(new ArrayList<>());
     }
 
     @Override
diff --git a/sqlTranslate/src/main/java/Parser/AST/Loop/LoopNode.java b/sqlTranslate/src/main/java/Parser/AST/Loop/LoopNode.java
index 12800539..bd44a6b4 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Loop/LoopNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/Loop/LoopNode.java
@@ -14,12 +14,10 @@ public class LoopNode extends ASTNode {
 
     public LoopNode(ASTNode node) {
         super(node);
-        setTokens(new ArrayList<>());
     }
 
     public LoopNode(List<Token> tokens) {
         super(tokens);
-        setTokens(new ArrayList<>());
     }
 
     @Override
diff --git a/sqlTranslate/src/main/java/Parser/AST/Loop/WhileNode.java b/sqlTranslate/src/main/java/Parser/AST/Loop/WhileNode.java
index 5574da7d..31bfdc0b 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Loop/WhileNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/Loop/WhileNode.java
@@ -14,12 +14,10 @@ public class WhileNode extends ASTNode {
 
     public WhileNode(ASTNode node) {
         super(node);
-        setTokens(new ArrayList<>());
     }
 
     public WhileNode(List<Token> tokens) {
         super(tokens);
-        setTokens(new ArrayList<>());
     }
 
     @Override
-- 
Gitee


From a4c7aa2acf8a4e0741b13f7e4f60f03a199428d8 Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Mon, 16 Sep 2024 16:19:26 +0800
Subject: [PATCH 080/113] add exception

---
 sqlTranslate/.idea/workspace.xml              |  27 ++--
 .../java/Generator/OpenGaussGenerator.java    |  50 ++++++--
 .../src/main/java/Lexer/OracleLexer.java      |   2 +-
 sqlTranslate/src/main/java/Main.java          |  24 ++--
 .../src/main/java/Parser/OracleParser.java    | 117 ++++++++++++++++++
 5 files changed, 191 insertions(+), 29 deletions(-)

diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
index 84610ff8..d0c566e2 100644
--- a/sqlTranslate/.idea/workspace.xml
+++ b/sqlTranslate/.idea/workspace.xml
@@ -4,9 +4,12 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add exception classes">
+    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="revise">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Document/Exception in Oracle" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Document/Exception in Oracle" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Generator/OpenGaussGenerator.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Generator/OpenGaussGenerator.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Lexer/OracleLexer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Lexer/OracleLexer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Main.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -104,13 +107,6 @@
       <option name="presentableId" value="Default" />
       <updated>1723106789329</updated>
     </task>
-    <task id="LOCAL-00028" summary="revise">
-      <created>1725958136981</created>
-      <option name="number" value="00028" />
-      <option name="presentableId" value="LOCAL-00028" />
-      <option name="project" value="LOCAL" />
-      <updated>1725958136981</updated>
-    </task>
     <task id="LOCAL-00029" summary="revise">
       <created>1725978582486</created>
       <option name="number" value="00029" />
@@ -447,7 +443,14 @@
       <option name="project" value="LOCAL" />
       <updated>1726471382852</updated>
     </task>
-    <option name="localTasksCounter" value="77" />
+    <task id="LOCAL-00077" summary="revise">
+      <created>1726472321577</created>
+      <option name="number" value="00077" />
+      <option name="presentableId" value="LOCAL-00077" />
+      <option name="project" value="LOCAL" />
+      <updated>1726472321577</updated>
+    </task>
+    <option name="localTasksCounter" value="78" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
@@ -485,9 +488,9 @@
     <MESSAGE value="add Loop ast classes" />
     <MESSAGE value="add Loop" />
     <MESSAGE value="add Exception document" />
-    <MESSAGE value="revise" />
     <MESSAGE value="add exception classes" />
-    <option name="LAST_COMMIT_MESSAGE" value="add exception classes" />
+    <MESSAGE value="revise" />
+    <option name="LAST_COMMIT_MESSAGE" value="revise" />
   </component>
   <component name="XDebuggerManager">
     <watches-manager>
diff --git a/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java b/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java
index 548bcba6..1014f31f 100644
--- a/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java
+++ b/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java
@@ -13,6 +13,8 @@ import Exception.GenerateFailedException;
 import Parser.AST.Delete.DeleteNode;
 import Parser.AST.Drop.DropNode;
 import Parser.AST.Drop.DropOptionNode;
+import Parser.AST.Exception.ExceptionActionNode;
+import Parser.AST.Exception.ExceptionNode;
 import Parser.AST.Insert.InsertNode;
 import Parser.AST.Join.JoinConditionNode;
 import Parser.AST.Join.JoinSourceTabNode;
@@ -70,6 +72,9 @@ public class OpenGaussGenerator {
         else if (node instanceof LoopNode || node instanceof WhileNode || node instanceof ForNode) {
             return GenLoopSQL(node);
         }
+        else if (node instanceof ExceptionNode) {
+            return GenExceptionSQL(node);
+        }
         else {
             try {
                 throw new GenerateFailedException("Root node:" + node.getClass() + "(Unsupported node type!)");
@@ -135,6 +140,11 @@ public class OpenGaussGenerator {
         return node.toQueryString();
     }
 
+    private String GenExceptionSQL(ASTNode node) {
+        visitException(node);
+        return node.toQueryString();
+    }
+
     private void visitCrt(ASTNode node) {
         if (node instanceof ColumnNode) {
             ColumnTypeConvert((ColumnNode) node);
@@ -183,6 +193,15 @@ public class OpenGaussGenerator {
         }
     }
 
+    private void visitException(ASTNode node) {
+        if (node instanceof ExceptionActionNode) {
+            PLConvert(node);
+        }
+        for (ASTNode child : node.getChildren()) {
+            visitException(child);
+        }
+    }
+
     private void visitSelect(ASTNode node) {
         if (node instanceof JoinSourceTabNode) {
             visitJoin(node);
@@ -252,7 +271,7 @@ public class OpenGaussGenerator {
                     if (token.hasType(Token.TokenType.STRING)) {
                         output += token.getValue().replace("'", "");
                     }
-                    else if (token.hasType(Token.TokenType.IDENTIFIER)) {
+                    else if (token.hasType(Token.TokenType.IDENTIFIER) || token.hasType(Token.TokenType.KEYWORD)) {
                         output += "%";
                         outputObj.add(token);
                     }
@@ -260,16 +279,29 @@ public class OpenGaussGenerator {
                         continue;
                     }
                 }
-                List<Token> tokens = new ArrayList<>();
-                tokens.add(new Token(Token.TokenType.KEYWORD, "RAISE"));
-                tokens.add(new Token(Token.TokenType.KEYWORD, "NOTICE"));
-                tokens.add(new Token(Token.TokenType.STRING, "'" + output + "'"));
-                for (Token token: outputObj) {
+                if (!outputObj.isEmpty()) {
+                    List<Token> tokens = new ArrayList<>();
+                    tokens.add(new Token(Token.TokenType.KEYWORD, "RAISE"));
+                    tokens.add(new Token(Token.TokenType.KEYWORD, "NOTICE"));
+                    tokens.add(new Token(Token.TokenType.STRING, "'" + output + "'"));
+                    for (Token token: outputObj) {
+                        tokens.add(new Token(Token.TokenType.SYMBOL, ","));
+                        tokens.add(token);
+                    }
+                    tokens.add(new Token(Token.TokenType.SYMBOL, ";"));
+                    node.setTokens(tokens);
+                }
+                else {
+                    List<Token> tokens = new ArrayList<>();
+                    tokens.add(new Token(Token.TokenType.KEYWORD, "RAISE"));
+                    tokens.add(new Token(Token.TokenType.KEYWORD, "NOTICE"));
+                    tokens.add(new Token(Token.TokenType.STRING, "'%'"));
                     tokens.add(new Token(Token.TokenType.SYMBOL, ","));
-                    tokens.add(token);
+                    tokens.add(new Token(Token.TokenType.STRING, "'" + output + "'"));
+                    tokens.add(new Token(Token.TokenType.SYMBOL, ";"));
+                    node.setTokens(tokens);
                 }
-                tokens.add(new Token(Token.TokenType.SYMBOL, ";"));
-                node.setTokens(tokens);
+
             }
         }
     }
diff --git a/sqlTranslate/src/main/java/Lexer/OracleLexer.java b/sqlTranslate/src/main/java/Lexer/OracleLexer.java
index 9fb4e848..ac4d1a0b 100644
--- a/sqlTranslate/src/main/java/Lexer/OracleLexer.java
+++ b/sqlTranslate/src/main/java/Lexer/OracleLexer.java
@@ -34,7 +34,7 @@ public class OracleLexer {
             // Loop
             , "LOOP", "EXIT", "WHILE", "FOR", "IN", "CONTINUE"
             // Exception
-            , "EXCEPTION", "SQLERRM", "ZERO_DIVIDE", "INVALID_NUMBER"
+            , "EXCEPTION", "SQLERRM", "ZERO_DIVIDE", "INVALID_NUMBER", "OTHERS"
     };
     private static final Pattern TOKEN_PATTERN = Pattern.compile(
             "(NUMBER\\(.*?\\))|" +                     // NUMBER() function
diff --git a/sqlTranslate/src/main/java/Main.java b/sqlTranslate/src/main/java/Main.java
index 7fc0ed16..3d7016c0 100644
--- a/sqlTranslate/src/main/java/Main.java
+++ b/sqlTranslate/src/main/java/Main.java
@@ -45,17 +45,27 @@ public class Main {
 //                "             ELSE\n" +
 //                "                 v_bonus := v_salary * 0.03;\n" +
 //                "             END IF;";
-        String sql = "LOOP\n" +
-                "        DBMS_OUTPUT.PUT_LINE(v_counter);\n" +
-                "        Continue;\n" +
-                "        v_counter := v_counter + 1;\n" +
-                "        EXIT WHEN v_counter > 10;\n" +
-                "    END LOOP;";
+//        String sql = "LOOP\n" +
+//                "        DBMS_OUTPUT.PUT_LINE(v_counter);\n" +
+//                "        Continue;\n" +
+//                "        v_counter := v_counter + 1;\n" +
+//                "        EXIT WHEN v_counter > 10;\n" +
+//                "    END LOOP;";
+        String sql = "EXCEPTION\n" +
+                "    WHEN e_custom_exception THEN\n" +
+                "        DBMS_OUTPUT.PUT_LINE('Caught an exception: Custom exception raised');\n" +
+                "    WHEN ZERO_DIVIDE THEN\n" +
+                "        DBMS_OUTPUT.PUT_LINE('Caught an exception: Division by zero');\n" +
+                "    WHEN INVALID_NUMBER THEN\n" +
+                "        DBMS_OUTPUT.PUT_LINE('Caught an exception: Invalid number');\n" +
+                "    WHEN OTHERS THEN\n" +
+                "        DBMS_OUTPUT.PUT_LINE('Caught an exception: ' || SQLERRM);";
         OracleLexer lexer = new OracleLexer(sql);
         lexer.printTokens();
 //        OracleParser parser = new OracleParser(lexer);
 //        ASTNode root = parser.parse();
-        ASTNode root = OracleParser.parseLoop(lexer.getTokens());
+        ASTNode root = OracleParser.parseException(lexer.getTokens());
+//        ASTNode root = OracleParser.parseLoop(lexer.getTokens());
 //        ASTNode root = OracleParser.parseIFELSE(lexer.getTokens());
 //        ASTNode root = OracleParser.parseCaseWhen(lexer.getTokens());
 //        ASTNode root = OracleParser.parseJoin(lexer.getTokens());
diff --git a/sqlTranslate/src/main/java/Parser/OracleParser.java b/sqlTranslate/src/main/java/Parser/OracleParser.java
index 7844d920..f3a310f5 100644
--- a/sqlTranslate/src/main/java/Parser/OracleParser.java
+++ b/sqlTranslate/src/main/java/Parser/OracleParser.java
@@ -18,6 +18,7 @@ import Parser.AST.Drop.DropEndNode;
 import Parser.AST.Drop.DropObjNameNode;
 import Parser.AST.Drop.DropNode;
 import Parser.AST.Drop.DropOptionNode;
+import Parser.AST.Exception.*;
 import Parser.AST.IFELSIF.*;
 import Parser.AST.Insert.InsertDataNode;
 import Parser.AST.Insert.InsertEndNode;
@@ -849,6 +850,122 @@ public class OracleParser {
         return root;
     }
 
+    /**
+     * Exception
+     * For example: EXCEPTION
+     *     -- custom exception
+     *     WHEN e_custom_exception THEN
+     *         DBMS_OUTPUT.PUT_LINE('Caught an exception: Custom exception raised');
+     *     -- divide by zero
+     *     WHEN ZERO_DIVIDE THEN
+     *         DBMS_OUTPUT.PUT_LINE('Caught an exception: Division by zero');
+     *     -- invalid number
+     *     WHEN INVALID_NUMBER THEN
+     *         DBMS_OUTPUT.PUT_LINE('Caught an exception: Invalid number');
+     *     -- other exceptions
+     *     WHEN OTHERS THEN
+     *         DBMS_OUTPUT.PUT_LINE('Caught an exception: ' || SQLERRM);
+     * @param parseTokens should start with Exception keyword
+     * @return ASTNode will not contain 'END'
+     */
+    public static ASTNode parseException(List<Token> parseTokens) {
+        ASTNode root = new ExceptionNode();
+        root.addToken(parseTokens.get(0));
+        ASTNode currentNode = root;
+        for (int i = 1; i < parseTokens.size(); i++) {
+            // match exception type
+            if (parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("WHEN")) {
+                if (i + 1 < parseTokens.size() && parseTokens.get(i + 1).hasType(Token.TokenType.IDENTIFIER)) {
+                    ASTNode childNode = new CustomExceptionNode();
+                    for (int j = i; j < parseTokens.size(); j++) {
+                        childNode.addToken(parseTokens.get(j));
+                        if (parseTokens.get(j).hasType(Token.TokenType.KEYWORD) && parseTokens.get(j).getValue().equalsIgnoreCase("THEN")) {
+                            i = j;
+                            break;
+                        }
+                    }
+                    currentNode.addChild(childNode);
+                    currentNode = childNode;
+                }
+                else if (i + 1 < parseTokens.size() && parseTokens.get(i + 1).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i + 1).getValue().equalsIgnoreCase("ZERO_DIVIDE")) {
+                    ASTNode childNode = new Zero_divideNode();
+                    for (int j = i; j < parseTokens.size(); j++) {
+                        childNode.addToken(parseTokens.get(j));
+                        if (parseTokens.get(j).hasType(Token.TokenType.KEYWORD) && parseTokens.get(j).getValue().equalsIgnoreCase("THEN")) {
+                            i = j;
+                            break;
+                        }
+                    }
+                    currentNode.addChild(childNode);
+                    currentNode = childNode;
+                }
+                else if (i + 1 < parseTokens.size() && parseTokens.get(i + 1).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i + 1).getValue().equalsIgnoreCase("INVALID_NUMBER")) {
+                    ASTNode childNode = new Invalid_numberNode();
+                    for (int j = i; j < parseTokens.size(); j++) {
+                        childNode.addToken(parseTokens.get(j));
+                        if (parseTokens.get(j).hasType(Token.TokenType.KEYWORD) && parseTokens.get(j).getValue().equalsIgnoreCase("THEN")) {
+                            i = j;
+                            break;
+                        }
+                    }
+                    currentNode.addChild(childNode);
+                    currentNode = childNode;
+                }
+                else if (i + 1 < parseTokens.size() && parseTokens.get(i + 1).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i + 1).getValue().equalsIgnoreCase("OTHERS")) {
+                    ASTNode childNode = new OtherExceptionNode();
+                    for (int j = i; j < parseTokens.size(); j++) {
+                        childNode.addToken(parseTokens.get(j));
+                        if (parseTokens.get(j).hasType(Token.TokenType.KEYWORD) && parseTokens.get(j).getValue().equalsIgnoreCase("THEN")) {
+                            i = j;
+                            break;
+                        }
+                    }
+                    currentNode.addChild(childNode);
+                    currentNode = childNode;
+                }
+                else {
+                    try {
+                        throw new ParseFailedException("Parse failed:There exists syntex error in the input sql!");
+                    }
+                    catch (ParseFailedException e) {
+                        e.printStackTrace();
+                    }
+                }
+            }
+            else if (parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("END")) {
+                ASTNode childNode = new ExceptionEndNode();
+                currentNode.addChild(childNode);
+                currentNode = childNode;
+                break;
+            }
+            else if (parseTokens.get(i).hasType(Token.TokenType.EOF)) {
+                if (!(currentNode instanceof ExceptionEndNode)) {
+                    ASTNode childNode = new ExceptionEndNode();
+                    currentNode.addChild(childNode);
+                    currentNode = childNode;
+                }
+                else {
+                    break;
+                }
+            }
+            // match exception action
+            else {
+                ASTNode childNode = new ExceptionActionNode();
+                for (int j = i; j < parseTokens.size(); j++) {
+                    childNode.addToken(parseTokens.get(j));
+                    if (parseTokens.get(j).hasType(Token.TokenType.SYMBOL) && parseTokens.get(j).getValue().equals(";")) {
+                        i = j;
+                        break;
+                    }
+                }
+                currentNode.addChild(childNode);
+                currentNode = childNode;
+            }
+        }
+
+        return root;
+    }
+
     /**
      * JOIN clause
      * For example: table1 t1 JOIN table2 t2 ON|USING t1.id = t2.id
-- 
Gitee


From 81458e5ef7991341a8b4d1200c1a227fc3fd110a Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Mon, 16 Sep 2024 21:06:37 +0800
Subject: [PATCH 081/113] add document of Procedure

---
 sqlTranslate/.idea/workspace.xml              | 28 +++++++++----------
 .../main/java/Document/Procedure in Oracle    | 20 +++++++++++++
 sqlTranslate/src/main/java/Document/Todolist  |  4 +--
 3 files changed, 35 insertions(+), 17 deletions(-)
 create mode 100644 sqlTranslate/src/main/java/Document/Procedure in Oracle

diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
index d0c566e2..1cc00376 100644
--- a/sqlTranslate/.idea/workspace.xml
+++ b/sqlTranslate/.idea/workspace.xml
@@ -4,12 +4,10 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="revise">
+    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add exception">
+      <change afterPath="$PROJECT_DIR$/src/main/java/Document/Procedure in Oracle" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Generator/OpenGaussGenerator.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Generator/OpenGaussGenerator.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Lexer/OracleLexer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Lexer/OracleLexer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Main.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Document/Todolist" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Document/Todolist" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -107,13 +105,6 @@
       <option name="presentableId" value="Default" />
       <updated>1723106789329</updated>
     </task>
-    <task id="LOCAL-00029" summary="revise">
-      <created>1725978582486</created>
-      <option name="number" value="00029" />
-      <option name="presentableId" value="LOCAL-00029" />
-      <option name="project" value="LOCAL" />
-      <updated>1725978582486</updated>
-    </task>
     <task id="LOCAL-00030" summary="add pattern of functions in select">
       <created>1725981063195</created>
       <option name="number" value="00030" />
@@ -450,7 +441,14 @@
       <option name="project" value="LOCAL" />
       <updated>1726472321577</updated>
     </task>
-    <option name="localTasksCounter" value="78" />
+    <task id="LOCAL-00078" summary="add exception">
+      <created>1726474768114</created>
+      <option name="number" value="00078" />
+      <option name="presentableId" value="LOCAL-00078" />
+      <option name="project" value="LOCAL" />
+      <updated>1726474768114</updated>
+    </task>
+    <option name="localTasksCounter" value="79" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
@@ -465,7 +463,6 @@
     </option>
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="add update ast class" />
     <MESSAGE value="add update convert rules" />
     <MESSAGE value="add Delete ast class" />
     <MESSAGE value="add Delete" />
@@ -490,7 +487,8 @@
     <MESSAGE value="add Exception document" />
     <MESSAGE value="add exception classes" />
     <MESSAGE value="revise" />
-    <option name="LAST_COMMIT_MESSAGE" value="revise" />
+    <MESSAGE value="add exception" />
+    <option name="LAST_COMMIT_MESSAGE" value="add exception" />
   </component>
   <component name="XDebuggerManager">
     <watches-manager>
diff --git a/sqlTranslate/src/main/java/Document/Procedure in Oracle b/sqlTranslate/src/main/java/Document/Procedure in Oracle
new file mode 100644
index 00000000..8f6f1919
--- /dev/null
+++ b/sqlTranslate/src/main/java/Document/Procedure in Oracle	
@@ -0,0 +1,20 @@
+CREATE [OR REPLACE] PROCEDURE procedure_name ([parameter_list])
+IS [LOCAL DECLARATIONS]
+BEGIN
+    -- PL/SQL statements
+[EXCEPTION]
+    -- Exception handling
+END [procedure_name];
+
+Example: CREATE OR REPLACE PROCEDURE update_salary(
+             employee_id IN NUMBER,
+             new_salary IN OUT NUMBER
+         ) IS
+         BEGIN
+             IF new_salary < 3000 THEN
+                 new_salary := new_salary * 1.1;
+             ELSE
+                 new_salary := new_salary * 1.05;
+             END IF;
+         END update_salary;
+         /
\ No newline at end of file
diff --git a/sqlTranslate/src/main/java/Document/Todolist b/sqlTranslate/src/main/java/Document/Todolist
index 13fdb933..1dfaaa17 100644
--- a/sqlTranslate/src/main/java/Document/Todolist
+++ b/sqlTranslate/src/main/java/Document/Todolist
@@ -13,8 +13,8 @@ Operation
  while... loop... end loop 1
  for ... in () loop end loop 1
  continue、exit 1
- return ****
- exception **
+ return ***
+ exception 1
  commit、rollback、execute ****
  alter table 1
  create table 1
-- 
Gitee


From f0a909f288ef1b32358243a9a8282de5b5e22bec Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Mon, 16 Sep 2024 22:23:59 +0800
Subject: [PATCH 082/113] add ast classes of procedure

---
 sqlTranslate/.idea/workspace.xml              | 33 ++++---
 .../main/java/Document/Procedure in Oracle    |  2 +-
 .../Parser/AST/CreateTable/ColumnNode.java    |  1 +
 .../AST/Procedure/ProcedureBeginNode.java     | 31 ++++++
 .../AST/Procedure/ProcedureColumnNode.java    | 95 +++++++++++++++++++
 .../AST/Procedure/ProcedureEndNode.java       | 31 ++++++
 .../Parser/AST/Procedure/ProcedureNode.java   | 31 ++++++
 .../AST/Procedure/ProcedureObjNode.java       | 32 +++++++
 .../Procedure/ProcedurePLStatementNode.java   | 27 ++++++
 .../AST/Procedure/ProcedureRetDefNode.java    | 30 ++++++
 10 files changed, 299 insertions(+), 14 deletions(-)
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/Procedure/ProcedureBeginNode.java
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/Procedure/ProcedureColumnNode.java
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/Procedure/ProcedureEndNode.java
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/Procedure/ProcedureNode.java
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/Procedure/ProcedureObjNode.java
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/Procedure/ProcedurePLStatementNode.java
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/Procedure/ProcedureRetDefNode.java

diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
index 1cc00376..d2dacd75 100644
--- a/sqlTranslate/.idea/workspace.xml
+++ b/sqlTranslate/.idea/workspace.xml
@@ -4,10 +4,17 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add exception">
-      <change afterPath="$PROJECT_DIR$/src/main/java/Document/Procedure in Oracle" afterDir="false" />
+    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add document of Procedure">
+      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Procedure/ProcedureBeginNode.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Procedure/ProcedureColumnNode.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Procedure/ProcedureEndNode.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Procedure/ProcedureNode.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Procedure/ProcedureObjNode.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Procedure/ProcedurePLStatementNode.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Procedure/ProcedureRetDefNode.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Document/Todolist" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Document/Todolist" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Document/Procedure in Oracle" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Document/Procedure in Oracle" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/CreateTable/ColumnNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/CreateTable/ColumnNode.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -105,13 +112,6 @@
       <option name="presentableId" value="Default" />
       <updated>1723106789329</updated>
     </task>
-    <task id="LOCAL-00030" summary="add pattern of functions in select">
-      <created>1725981063195</created>
-      <option name="number" value="00030" />
-      <option name="presentableId" value="LOCAL-00030" />
-      <option name="project" value="LOCAL" />
-      <updated>1725981063195</updated>
-    </task>
     <task id="LOCAL-00031" summary="add some comments">
       <created>1725981511612</created>
       <option name="number" value="00031" />
@@ -448,7 +448,14 @@
       <option name="project" value="LOCAL" />
       <updated>1726474768114</updated>
     </task>
-    <option name="localTasksCounter" value="79" />
+    <task id="LOCAL-00079" summary="add document of Procedure">
+      <created>1726491998608</created>
+      <option name="number" value="00079" />
+      <option name="presentableId" value="LOCAL-00079" />
+      <option name="project" value="LOCAL" />
+      <updated>1726491998609</updated>
+    </task>
+    <option name="localTasksCounter" value="80" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
@@ -463,7 +470,6 @@
     </option>
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="add update convert rules" />
     <MESSAGE value="add Delete ast class" />
     <MESSAGE value="add Delete" />
     <MESSAGE value="add alter table grammar document" />
@@ -488,7 +494,8 @@
     <MESSAGE value="add exception classes" />
     <MESSAGE value="revise" />
     <MESSAGE value="add exception" />
-    <option name="LAST_COMMIT_MESSAGE" value="add exception" />
+    <MESSAGE value="add document of Procedure" />
+    <option name="LAST_COMMIT_MESSAGE" value="add document of Procedure" />
   </component>
   <component name="XDebuggerManager">
     <watches-manager>
diff --git a/sqlTranslate/src/main/java/Document/Procedure in Oracle b/sqlTranslate/src/main/java/Document/Procedure in Oracle
index 8f6f1919..4495b34c 100644
--- a/sqlTranslate/src/main/java/Document/Procedure in Oracle	
+++ b/sqlTranslate/src/main/java/Document/Procedure in Oracle	
@@ -4,7 +4,7 @@ BEGIN
     -- PL/SQL statements
 [EXCEPTION]
     -- Exception handling
-END [procedure_name];
+END [procedure_name]; -- [procedure_name] should be removed in OpenGauss
 
 Example: CREATE OR REPLACE PROCEDURE update_salary(
              employee_id IN NUMBER,
diff --git a/sqlTranslate/src/main/java/Parser/AST/CreateTable/ColumnNode.java b/sqlTranslate/src/main/java/Parser/AST/CreateTable/ColumnNode.java
index c470ffff..bd6a1e34 100644
--- a/sqlTranslate/src/main/java/Parser/AST/CreateTable/ColumnNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/CreateTable/ColumnNode.java
@@ -23,6 +23,7 @@ public class ColumnNode extends ASTNode implements ColumnType {
         super(tokens);
     }
 
+    @Override
     public void visit(ASTNode node, StringBuilder queryString)
     {
         if (node.hasChild() && !(node.getChildren().get(0) instanceof CRTEndNode) )
diff --git a/sqlTranslate/src/main/java/Parser/AST/Procedure/ProcedureBeginNode.java b/sqlTranslate/src/main/java/Parser/AST/Procedure/ProcedureBeginNode.java
new file mode 100644
index 00000000..481e9712
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/Procedure/ProcedureBeginNode.java
@@ -0,0 +1,31 @@
+package Parser.AST.Procedure;
+
+import Lexer.Token;
+import Parser.AST.ASTNode;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ProcedureBeginNode extends ASTNode {
+    public ProcedureBeginNode() {
+        super();
+        setTokens(new ArrayList<>());
+    }
+
+    public ProcedureBeginNode(ASTNode node) {
+        super(node);
+    }
+
+    public ProcedureBeginNode(List<Token> tokens) {
+        super(tokens);
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString) {
+        queryString.append(toString() + " ");
+        for (ASTNode child : getChildren())
+        {
+            child.visit(child, queryString);
+        }
+    }
+}
diff --git a/sqlTranslate/src/main/java/Parser/AST/Procedure/ProcedureColumnNode.java b/sqlTranslate/src/main/java/Parser/AST/Procedure/ProcedureColumnNode.java
new file mode 100644
index 00000000..f495fbff
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/Procedure/ProcedureColumnNode.java
@@ -0,0 +1,95 @@
+package Parser.AST.Procedure;
+
+import Interface.ColumnType;
+import Lexer.Token;
+import Parser.AST.ASTNode;
+import Parser.AST.CreateTable.CRTEndNode;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ProcedureColumnNode extends ASTNode implements ColumnType  {
+    private Token name;
+    private Token type;
+    private List<Token> constraint;
+    private List<Token> InOut;
+    public ProcedureColumnNode() {
+        super();
+        setTokens(new ArrayList<>());
+    }
+
+    public ProcedureColumnNode(ASTNode node)
+    {
+        super(node);
+    }
+
+    public ProcedureColumnNode(List<Token> tokens)
+    {
+        super(tokens);
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString)
+    {
+        if (node.hasChild() && !(node.getChildren().get(0) instanceof ProcedureColumnNode) )
+            queryString.append(toString() + ", ");
+        else if (node.hasChild() && (node.getChildren().get(0) instanceof ProcedureColumnNode))
+            queryString.append(toString() + " ");
+        for (ASTNode child : getChildren())
+        {
+            child.visit(child, queryString);
+        }
+    }
+
+    public Token getName() {
+        return name;
+    }
+
+    public void setName(Token name) {
+        this.name = name;
+    }
+
+    @Override
+    public Token getType() {
+        return type;
+    }
+
+    @Override
+    public void setType(Token type) {
+        this.type = type;
+    }
+
+    public List<Token> getConstraint() {
+        return constraint;
+    }
+
+    public void setConstraint(List<Token> constraint) {
+        this.constraint = constraint;
+    }
+
+    public List<Token> getInOut() {
+        return InOut;
+    }
+
+    public void setInOut(List<Token> InOut) {
+        this.InOut = InOut;
+    }
+
+    public void addInOut(Token InOut) {
+        this.InOut.add(InOut);
+    }
+
+    @Override
+    public void ResetTokensbyNameTypeConstraint() {
+        List <Token> tokens = new ArrayList<>();
+        tokens.add(name);
+        for (Token token : InOut) {
+            tokens.add(token);
+        }
+        tokens.add(type);
+        for (Token token : constraint) {
+            tokens.add(token);
+        }
+        setTokens(tokens);
+    }
+}
diff --git a/sqlTranslate/src/main/java/Parser/AST/Procedure/ProcedureEndNode.java b/sqlTranslate/src/main/java/Parser/AST/Procedure/ProcedureEndNode.java
new file mode 100644
index 00000000..7ebd9d93
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/Procedure/ProcedureEndNode.java
@@ -0,0 +1,31 @@
+package Parser.AST.Procedure;
+
+import Lexer.Token;
+import Parser.AST.ASTNode;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ProcedureEndNode extends ASTNode {
+    public ProcedureEndNode() {
+        super();
+        setTokens(new ArrayList<>());
+    }
+
+    public ProcedureEndNode(ASTNode node) {
+        super(node);
+    }
+
+    public ProcedureEndNode(List<Token> tokens) {
+        super(tokens);
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString) {
+        queryString.append(toString());
+        for (ASTNode child : getChildren())
+        {
+            child.visit(child, queryString);
+        }
+    }
+}
diff --git a/sqlTranslate/src/main/java/Parser/AST/Procedure/ProcedureNode.java b/sqlTranslate/src/main/java/Parser/AST/Procedure/ProcedureNode.java
new file mode 100644
index 00000000..9fc3afe0
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/Procedure/ProcedureNode.java
@@ -0,0 +1,31 @@
+package Parser.AST.Procedure;
+
+import Lexer.Token;
+import Parser.AST.ASTNode;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ProcedureNode extends ASTNode {
+    public ProcedureNode() {
+        super();
+        setTokens(new ArrayList<>());
+    }
+
+    public ProcedureNode(ASTNode node) {
+        super(node);
+    }
+
+    public ProcedureNode(List<Token> tokens) {
+        super(tokens);
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString) {
+        queryString.append(toString() + " ");
+        for (ASTNode child : getChildren())
+        {
+            child.visit(child, queryString);
+        }
+    }
+}
diff --git a/sqlTranslate/src/main/java/Parser/AST/Procedure/ProcedureObjNode.java b/sqlTranslate/src/main/java/Parser/AST/Procedure/ProcedureObjNode.java
new file mode 100644
index 00000000..eca2e3f4
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/Procedure/ProcedureObjNode.java
@@ -0,0 +1,32 @@
+package Parser.AST.Procedure;
+
+import Lexer.Token;
+import Parser.AST.ASTNode;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ProcedureObjNode extends ASTNode {
+    public ProcedureObjNode() {
+        super();
+        setTokens(new ArrayList<>());
+    }
+
+    public ProcedureObjNode(ASTNode node) {
+        super(node);
+    }
+
+    public ProcedureObjNode(List<Token> tokens) {
+        super(tokens);
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString) {
+        queryString.append(toString() + " (");
+        for (ASTNode child : getChildren())
+        {
+            child.visit(child, queryString);
+        }
+    }
+
+}
diff --git a/sqlTranslate/src/main/java/Parser/AST/Procedure/ProcedurePLStatementNode.java b/sqlTranslate/src/main/java/Parser/AST/Procedure/ProcedurePLStatementNode.java
new file mode 100644
index 00000000..bee1052f
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/Procedure/ProcedurePLStatementNode.java
@@ -0,0 +1,27 @@
+package Parser.AST.Procedure;
+
+import Lexer.Token;
+import Parser.AST.ASTNode;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ProcedurePLStatementNode extends ASTNode {
+    public ProcedurePLStatementNode() {
+        super();
+    }
+    public ProcedurePLStatementNode(ASTNode node) {
+        super(node);
+    }
+    public ProcedurePLStatementNode(List<Token> tokens) {
+        super(tokens);
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString) {
+        queryString.append(toString() + " ");
+        for (ASTNode child : node.getChildren()) {
+            child.visit(child, queryString);
+        }
+    }
+}
diff --git a/sqlTranslate/src/main/java/Parser/AST/Procedure/ProcedureRetDefNode.java b/sqlTranslate/src/main/java/Parser/AST/Procedure/ProcedureRetDefNode.java
new file mode 100644
index 00000000..40246805
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/Procedure/ProcedureRetDefNode.java
@@ -0,0 +1,30 @@
+package Parser.AST.Procedure;
+
+import Lexer.Token;
+import Parser.AST.ASTNode;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ProcedureRetDefNode extends ASTNode {
+    public ProcedureRetDefNode() {
+        super();
+    }
+
+    public ProcedureRetDefNode(ASTNode node) {
+        super(node);
+    }
+
+    public ProcedureRetDefNode(List<Token> tokens) {
+        super(tokens);
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString) {
+        queryString.append(") " + toString() + " ");
+        for (ASTNode child : getChildren())
+        {
+            child.visit(child, queryString);
+        }
+    }
+}
-- 
Gitee


From 9a54d05f1279b570248bd1082042eeae4f04d711 Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Tue, 17 Sep 2024 14:28:30 +0800
Subject: [PATCH 083/113] add procedure

---
 sqlTranslate/.idea/workspace.xml              |  39 +--
 .../main/java/Document/Procedure in Oracle    |  17 +-
 sqlTranslate/src/main/java/Document/Todolist  |   4 +-
 .../java/Generator/OpenGaussGenerator.java    |  55 ++++
 .../src/main/java/Lexer/OracleLexer.java      |   5 +
 sqlTranslate/src/main/java/Main.java          |  61 +++--
 .../AST/Exception/ExceptionEndNode.java       |   5 +-
 .../AST/Procedure/ProcedureColumnNode.java    |   5 +-
 .../Procedure/ProcedurePLStatementNode.java   |   1 +
 .../AST/Procedure/ProcedureRetDefNode.java    |   1 +
 .../java/Parser/AST/Update/UpdateObjNode.java |   2 +-
 .../java/Parser/AST/Update/UpdateSetNode.java |   2 +-
 .../src/main/java/Parser/OracleParser.java    | 255 ++++++++++++++++++
 13 files changed, 408 insertions(+), 44 deletions(-)

diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
index d2dacd75..c849afc3 100644
--- a/sqlTranslate/.idea/workspace.xml
+++ b/sqlTranslate/.idea/workspace.xml
@@ -4,17 +4,18 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add document of Procedure">
-      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Procedure/ProcedureBeginNode.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Procedure/ProcedureColumnNode.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Procedure/ProcedureEndNode.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Procedure/ProcedureNode.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Procedure/ProcedureObjNode.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Procedure/ProcedurePLStatementNode.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Procedure/ProcedureRetDefNode.java" afterDir="false" />
+    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add ast classes of procedure">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/Document/Procedure in Oracle" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Document/Procedure in Oracle" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/CreateTable/ColumnNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/CreateTable/ColumnNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Document/Todolist" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Document/Todolist" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Generator/OpenGaussGenerator.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Generator/OpenGaussGenerator.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Lexer/OracleLexer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Lexer/OracleLexer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Main.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Exception/ExceptionEndNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Exception/ExceptionEndNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Procedure/ProcedureColumnNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Procedure/ProcedureColumnNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Procedure/ProcedurePLStatementNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Procedure/ProcedurePLStatementNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Procedure/ProcedureRetDefNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Procedure/ProcedureRetDefNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -112,13 +113,6 @@
       <option name="presentableId" value="Default" />
       <updated>1723106789329</updated>
     </task>
-    <task id="LOCAL-00031" summary="add some comments">
-      <created>1725981511612</created>
-      <option name="number" value="00031" />
-      <option name="presentableId" value="LOCAL-00031" />
-      <option name="project" value="LOCAL" />
-      <updated>1725981511612</updated>
-    </task>
     <task id="LOCAL-00032" summary="add parseSelect">
       <created>1725981975960</created>
       <option name="number" value="00032" />
@@ -455,7 +449,14 @@
       <option name="project" value="LOCAL" />
       <updated>1726491998609</updated>
     </task>
-    <option name="localTasksCounter" value="80" />
+    <task id="LOCAL-00080" summary="add ast classes of procedure">
+      <created>1726496640760</created>
+      <option name="number" value="00080" />
+      <option name="presentableId" value="LOCAL-00080" />
+      <option name="project" value="LOCAL" />
+      <updated>1726496640760</updated>
+    </task>
+    <option name="localTasksCounter" value="81" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
@@ -470,7 +471,6 @@
     </option>
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="add Delete ast class" />
     <MESSAGE value="add Delete" />
     <MESSAGE value="add alter table grammar document" />
     <MESSAGE value="add alter table ast class" />
@@ -495,7 +495,8 @@
     <MESSAGE value="revise" />
     <MESSAGE value="add exception" />
     <MESSAGE value="add document of Procedure" />
-    <option name="LAST_COMMIT_MESSAGE" value="add document of Procedure" />
+    <MESSAGE value="add ast classes of procedure" />
+    <option name="LAST_COMMIT_MESSAGE" value="add ast classes of procedure" />
   </component>
   <component name="XDebuggerManager">
     <watches-manager>
diff --git a/sqlTranslate/src/main/java/Document/Procedure in Oracle b/sqlTranslate/src/main/java/Document/Procedure in Oracle
index 4495b34c..dc73b7ea 100644
--- a/sqlTranslate/src/main/java/Document/Procedure in Oracle	
+++ b/sqlTranslate/src/main/java/Document/Procedure in Oracle	
@@ -6,15 +6,30 @@ BEGIN
     -- Exception handling
 END [procedure_name]; -- [procedure_name] should be removed in OpenGauss
 
-Example: CREATE OR REPLACE PROCEDURE update_salary(
+Example: CREATE OR REPLACE PROCEDURE update_salary (
              employee_id IN NUMBER,
              new_salary IN OUT NUMBER
          ) IS
+             v_employee employees%ROWTYPE;
          BEGIN
+             SELECT * INTO v_employee FROM employees WHERE employee_id = employee_id;
+
              IF new_salary < 3000 THEN
                  new_salary := new_salary * 1.1;
              ELSE
                  new_salary := new_salary * 1.05;
              END IF;
+
+             UPDATE employees SET salary = new_salary WHERE employee_id = employee_id;
+             COMMIT;
+
+             DBMS_OUTPUT.PUT_LINE('Updated Salary: ' || new_salary);
+         EXCEPTION
+             WHEN NO_DATA_FOUND THEN
+                 DBMS_OUTPUT.PUT_LINE('Employee not found.');
+             WHEN TOO_MANY_ROWS THEN
+                 DBMS_OUTPUT.PUT_LINE('Multiple employees found.');
+             WHEN OTHERS THEN
+                 DBMS_OUTPUT.PUT_LINE('An error occurred: ' || SQLERRM);
          END update_salary;
          /
\ No newline at end of file
diff --git a/sqlTranslate/src/main/java/Document/Todolist b/sqlTranslate/src/main/java/Document/Todolist
index 1dfaaa17..25611b33 100644
--- a/sqlTranslate/src/main/java/Document/Todolist
+++ b/sqlTranslate/src/main/java/Document/Todolist
@@ -15,7 +15,7 @@ Operation
  continue、exit 1
  return ***
  exception 1
- commit、rollback、execute ****
+ commit、rollback、execute ***
  alter table 1
  create table 1
  drop table 1
@@ -24,4 +24,4 @@ Object
  view 1
  function ***
  procedure ***
- trigger *****
\ No newline at end of file
+ trigger ****
\ No newline at end of file
diff --git a/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java b/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java
index 1014f31f..a00185ee 100644
--- a/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java
+++ b/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java
@@ -22,6 +22,10 @@ import Parser.AST.Loop.ForNode;
 import Parser.AST.Loop.LoopBodyNode;
 import Parser.AST.Loop.LoopNode;
 import Parser.AST.Loop.WhileNode;
+import Parser.AST.Procedure.ProcedureColumnNode;
+import Parser.AST.Procedure.ProcedureEndNode;
+import Parser.AST.Procedure.ProcedureNode;
+import Parser.AST.Procedure.ProcedureRetDefNode;
 import Parser.AST.Select.SelectNode;
 import Parser.AST.Update.UpdateNode;
 import Parser.AST.View.ViewCreateNode;
@@ -75,6 +79,9 @@ public class OpenGaussGenerator {
         else if (node instanceof ExceptionNode) {
             return GenExceptionSQL(node);
         }
+        else if (node instanceof ProcedureNode) {
+            return GenProcedureSQL(node);
+        }
         else {
             try {
                 throw new GenerateFailedException("Root node:" + node.getClass() + "(Unsupported node type!)");
@@ -145,6 +152,12 @@ public class OpenGaussGenerator {
         return node.toQueryString();
     }
 
+    private String GenProcedureSQL(ASTNode node) {
+        visitPL(node);
+        System.out.println(node.getASTString());
+        return node.toQueryString();
+    }
+
     private void visitCrt(ASTNode node) {
         if (node instanceof ColumnNode) {
             ColumnTypeConvert((ColumnNode) node);
@@ -240,6 +253,24 @@ public class OpenGaussGenerator {
             visitCreateView(child);
         }
     }
+
+    private void visitPL(ASTNode node) {
+        if (node instanceof ProcedureRetDefNode) {
+            PLConvert(node);
+        }
+        else if (node instanceof ProcedureColumnNode) {
+            ColumnTypeConvert((ProcedureColumnNode) node);
+        }
+        else if (node instanceof ProcedureEndNode) {
+            PLConvert(node);
+        }
+        else if (node instanceof ExceptionNode) {
+            visitException(node);
+        }
+        for (ASTNode child : node.getChildren()) {
+            visitPL(child);
+        }
+    }
     private void PLConvert(ASTNode node) {
         if (node.checkExistsByRegex("(?i)DBMS_OUTPUT.PUT_LINE\\(.*?\\)")) {
             String printObj = "";
@@ -304,6 +335,30 @@ public class OpenGaussGenerator {
 
             }
         }
+        if (node instanceof ProcedureRetDefNode) {
+            List<Token> tokens = new ArrayList<>();
+            tokens.add(new Token(Token.TokenType.KEYWORD, "AS"));
+            tokens.add(new Token(Token.TokenType.KEYWORD, "$$"));
+            for (Token token: node.getTokens()) {
+                if (token.hasType(Token.TokenType.KEYWORD) && token.getValue().equalsIgnoreCase("IS")) {
+                    tokens.add(new Token(Token.TokenType.KEYWORD, "DECLARE"));
+                }
+                else {
+                    tokens.add(token);
+                }
+            }
+            node.setTokens(tokens);
+        }
+        if (node instanceof ProcedureEndNode) {
+            List<Token> tokens = new ArrayList<>();
+            tokens.add(new Token(Token.TokenType.KEYWORD, "END"));
+            tokens.add(new Token(Token.TokenType.SYMBOL, ";"));
+            tokens.add(new Token(Token.TokenType.KEYWORD, "$$"));
+            tokens.add(new Token(Token.TokenType.KEYWORD, "LANGUAGE"));
+            tokens.add(new Token(Token.TokenType.KEYWORD, "plpgsql"));
+            tokens.add(new Token(Token.TokenType.SYMBOL, ";"));
+            node.setTokens(tokens);
+        }
     }
 
 
diff --git a/sqlTranslate/src/main/java/Lexer/OracleLexer.java b/sqlTranslate/src/main/java/Lexer/OracleLexer.java
index ac4d1a0b..cda8db86 100644
--- a/sqlTranslate/src/main/java/Lexer/OracleLexer.java
+++ b/sqlTranslate/src/main/java/Lexer/OracleLexer.java
@@ -35,6 +35,8 @@ public class OracleLexer {
             , "LOOP", "EXIT", "WHILE", "FOR", "IN", "CONTINUE"
             // Exception
             , "EXCEPTION", "SQLERRM", "ZERO_DIVIDE", "INVALID_NUMBER", "OTHERS"
+            // Procedure
+            , "PROCEDURE", "IS", "IN", "OUT", "$$"
     };
     private static final Pattern TOKEN_PATTERN = Pattern.compile(
             "(NUMBER\\(.*?\\))|" +                     // NUMBER() function
@@ -78,6 +80,7 @@ public class OracleLexer {
                     "(:=)|" +
                     "(\\.\\.)|" +
 
+                    "(\\b[A-Za-z_][A-Za-z0-9_]*(%[A-Za-z_][A-Za-z0-9_]*)*\\b)|" + // Keywords and identifiers
                     "(\\b[A-Za-z_][A-Za-z0-9_]*(\\.[A-Za-z_][A-Za-z0-9_]*)*\\b)|" + // Keywords and identifiers
                     "(\\b[A-Za-z_][A-Za-z0-9_]*\\b)|" + // Keywords and identifiers
                     "(\\d+\\.?\\d*)|" +                 // Numbers (integer or decimal)
@@ -178,6 +181,8 @@ public class OracleLexer {
 
         else if (isKeyword(tokenValue)) {
             return new Token(Token.TokenType.KEYWORD, tokenValue);
+        } else if (tokenValue.matches("[A-Za-z_][A-Za-z0-9_]*(%[A-Za-z_][A-Za-z0-9_]*)*")) {
+            return new Token(Token.TokenType.IDENTIFIER, tokenValue);
         } else if (tokenValue.matches("[A-Za-z_][A-Za-z0-9_]*(\\.[A-Za-z_][A-Za-z0-9_]*)*")) {
             return new Token(Token.TokenType.IDENTIFIER, tokenValue);
         } else if (tokenValue.matches("[a-zA-Z_][a-zA-Z0-9_]*")) {
diff --git a/sqlTranslate/src/main/java/Main.java b/sqlTranslate/src/main/java/Main.java
index 3d7016c0..36ee8687 100644
--- a/sqlTranslate/src/main/java/Main.java
+++ b/sqlTranslate/src/main/java/Main.java
@@ -22,11 +22,11 @@ public class Main {
 //        String sql = "DROP TABLE employees CASCADE CONSTRAINTS;";
 //        String sql = "SELECT e.first_name, d.department_name FROM employees e JOIN departments d Using e.department_id = d.department_id;";
 //        String sql = "employees e JOIN departments d ON e.department_id = d.department_id;";
-//        String sql = "UPDATE employees e\n" +
-//                "JOIN departments d using e.department_id = d.department_id\n" +
-//                "SET e.salary = e.salary * 1.10,\n" +
-//                "    d.budget = d.budget * 1.10\n" +
-//                "WHERE d.department_name = 'Sales';";
+        String sql = "UPDATE employees e\n" +
+                "JOIN departments d using e.department_id = d.department_id\n" +
+                "SET e.salary = e.salary * 1.10,\n" +
+                "    d.budget = d.budget * 1.10\n" +
+                "WHERE d.department_name = 'Sales';";
 //        String sql = "DELETE FROM employees e\n" +
 //                "WHERE e.department_id IN (\n" +
 //                "    SELECT d.department_id\n" +
@@ -51,20 +51,47 @@ public class Main {
 //                "        v_counter := v_counter + 1;\n" +
 //                "        EXIT WHEN v_counter > 10;\n" +
 //                "    END LOOP;";
-        String sql = "EXCEPTION\n" +
-                "    WHEN e_custom_exception THEN\n" +
-                "        DBMS_OUTPUT.PUT_LINE('Caught an exception: Custom exception raised');\n" +
-                "    WHEN ZERO_DIVIDE THEN\n" +
-                "        DBMS_OUTPUT.PUT_LINE('Caught an exception: Division by zero');\n" +
-                "    WHEN INVALID_NUMBER THEN\n" +
-                "        DBMS_OUTPUT.PUT_LINE('Caught an exception: Invalid number');\n" +
-                "    WHEN OTHERS THEN\n" +
-                "        DBMS_OUTPUT.PUT_LINE('Caught an exception: ' || SQLERRM);";
+//        String sql = "EXCEPTION\n" +
+//                "    WHEN e_custom_exception THEN\n" +
+//                "        DBMS_OUTPUT.PUT_LINE('Caught an exception: Custom exception raised');\n" +
+//                "    WHEN ZERO_DIVIDE THEN\n" +
+//                "        DBMS_OUTPUT.PUT_LINE('Caught an exception: Division by zero');\n" +
+//                "    WHEN INVALID_NUMBER THEN\n" +
+//                "        DBMS_OUTPUT.PUT_LINE('Caught an exception: Invalid number');\n" +
+//                "    WHEN OTHERS THEN\n" +
+//                "        DBMS_OUTPUT.PUT_LINE('Caught an exception: ' || SQLERRM);";
+//        String sql = "CREATE OR REPLACE PROCEDURE update_salary (\n" +
+//                "             employee_id IN NUMBER,\n" +
+//                "             new_salary IN OUT NUMBER\n" +
+//                "         ) IS\n" +
+//                "             v_employee employees%ROWTYPE;\n" +
+//                "         BEGIN\n" +
+//                "             SELECT * INTO v_employee FROM employees WHERE employee_id = employee_id;\n" +
+//                "\n" +
+//                "             IF new_salary < 3000 THEN\n" +
+//                "                 new_salary := new_salary * 1.1;\n" +
+//                "             ELSE\n" +
+//                "                 new_salary := new_salary * 1.05;\n" +
+//                "             END IF;\n" +
+//                "\n" +
+//                "             UPDATE employees SET salary = new_salary WHERE employee_id = employee_id;\n" +
+//                "             COMMIT;\n" +
+//                "\n" +
+//                "             DBMS_OUTPUT.PUT_LINE('Updated Salary: ' || new_salary);\n" +
+//                "         EXCEPTION\n" +
+//                "             WHEN NO_DATA_FOUND THEN\n" +
+//                "                 DBMS_OUTPUT.PUT_LINE('Employee not found.');\n" +
+//                "             WHEN TOO_MANY_ROWS THEN\n" +
+//                "                 DBMS_OUTPUT.PUT_LINE('Multiple employees found.');\n" +
+//                "             WHEN OTHERS THEN\n" +
+//                "                 DBMS_OUTPUT.PUT_LINE('An error occurred: ' || SQLERRM);\n" +
+//                "         END update_salary;\n" +
+//                "         /";
         OracleLexer lexer = new OracleLexer(sql);
         lexer.printTokens();
-//        OracleParser parser = new OracleParser(lexer);
-//        ASTNode root = parser.parse();
-        ASTNode root = OracleParser.parseException(lexer.getTokens());
+        OracleParser parser = new OracleParser(lexer);
+        ASTNode root = parser.parse();
+//        ASTNode root = OracleParser.parseException(lexer.getTokens());
 //        ASTNode root = OracleParser.parseLoop(lexer.getTokens());
 //        ASTNode root = OracleParser.parseIFELSE(lexer.getTokens());
 //        ASTNode root = OracleParser.parseCaseWhen(lexer.getTokens());
diff --git a/sqlTranslate/src/main/java/Parser/AST/Exception/ExceptionEndNode.java b/sqlTranslate/src/main/java/Parser/AST/Exception/ExceptionEndNode.java
index a1b82963..42c3dd4b 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Exception/ExceptionEndNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/Exception/ExceptionEndNode.java
@@ -22,6 +22,9 @@ public class ExceptionEndNode extends ASTNode {
 
     @Override
     public void visit(ASTNode node, StringBuilder queryString) {
-
+        queryString.append(toString());
+        for (ASTNode child : node.getChildren()) {
+            child.visit(child, queryString);
+        }
     }
 }
diff --git a/sqlTranslate/src/main/java/Parser/AST/Procedure/ProcedureColumnNode.java b/sqlTranslate/src/main/java/Parser/AST/Procedure/ProcedureColumnNode.java
index f495fbff..e158fe8a 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Procedure/ProcedureColumnNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/Procedure/ProcedureColumnNode.java
@@ -16,6 +16,7 @@ public class ProcedureColumnNode extends ASTNode implements ColumnType  {
     public ProcedureColumnNode() {
         super();
         setTokens(new ArrayList<>());
+        setInOut(new ArrayList<>());
     }
 
     public ProcedureColumnNode(ASTNode node)
@@ -31,9 +32,9 @@ public class ProcedureColumnNode extends ASTNode implements ColumnType  {
     @Override
     public void visit(ASTNode node, StringBuilder queryString)
     {
-        if (node.hasChild() && !(node.getChildren().get(0) instanceof ProcedureColumnNode) )
+        if (node.hasChild() && (node.getChildren().get(0) instanceof ProcedureColumnNode) )
             queryString.append(toString() + ", ");
-        else if (node.hasChild() && (node.getChildren().get(0) instanceof ProcedureColumnNode))
+        else if (node.hasChild() && !(node.getChildren().get(0) instanceof ProcedureColumnNode))
             queryString.append(toString() + " ");
         for (ASTNode child : getChildren())
         {
diff --git a/sqlTranslate/src/main/java/Parser/AST/Procedure/ProcedurePLStatementNode.java b/sqlTranslate/src/main/java/Parser/AST/Procedure/ProcedurePLStatementNode.java
index bee1052f..66a89a58 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Procedure/ProcedurePLStatementNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/Procedure/ProcedurePLStatementNode.java
@@ -9,6 +9,7 @@ import java.util.List;
 public class ProcedurePLStatementNode extends ASTNode {
     public ProcedurePLStatementNode() {
         super();
+        setTokens(new ArrayList<>());
     }
     public ProcedurePLStatementNode(ASTNode node) {
         super(node);
diff --git a/sqlTranslate/src/main/java/Parser/AST/Procedure/ProcedureRetDefNode.java b/sqlTranslate/src/main/java/Parser/AST/Procedure/ProcedureRetDefNode.java
index 40246805..3f675221 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Procedure/ProcedureRetDefNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/Procedure/ProcedureRetDefNode.java
@@ -9,6 +9,7 @@ import java.util.List;
 public class ProcedureRetDefNode extends ASTNode {
     public ProcedureRetDefNode() {
         super();
+        setTokens(new ArrayList<>());
     }
 
     public ProcedureRetDefNode(ASTNode node) {
diff --git a/sqlTranslate/src/main/java/Parser/AST/Update/UpdateObjNode.java b/sqlTranslate/src/main/java/Parser/AST/Update/UpdateObjNode.java
index d7492d22..f5fb6b84 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Update/UpdateObjNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/Update/UpdateObjNode.java
@@ -18,7 +18,7 @@ public class UpdateObjNode extends ASTNode {
     public void visit(ASTNode node, StringBuilder queryString) {
         queryString.append(toString() + " ");
         for (ASTNode child : getChildren()) {
-            child.visit(this, queryString);
+            child.visit(child, queryString);
         }
     }
 }
diff --git a/sqlTranslate/src/main/java/Parser/AST/Update/UpdateSetNode.java b/sqlTranslate/src/main/java/Parser/AST/Update/UpdateSetNode.java
index c9ad6cb1..a46c5f64 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Update/UpdateSetNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/Update/UpdateSetNode.java
@@ -18,7 +18,7 @@ public class UpdateSetNode extends ASTNode {
     public void visit(ASTNode node, StringBuilder queryString) {
         queryString.append(toString() + " ");
         for (ASTNode child : getChildren()) {
-            child.visit(this, queryString);
+            child.visit(child, queryString);
         }
     }
 }
diff --git a/sqlTranslate/src/main/java/Parser/OracleParser.java b/sqlTranslate/src/main/java/Parser/OracleParser.java
index f3a310f5..4677e798 100644
--- a/sqlTranslate/src/main/java/Parser/OracleParser.java
+++ b/sqlTranslate/src/main/java/Parser/OracleParser.java
@@ -26,6 +26,7 @@ import Parser.AST.Insert.InsertNode;
 import Parser.AST.Insert.InsertObjNode;
 import Parser.AST.Join.*;
 import Parser.AST.Loop.*;
+import Parser.AST.Procedure.*;
 import Parser.AST.Select.*;
 import Parser.AST.Update.*;
 import Parser.AST.View.ViewCreateNode;
@@ -73,6 +74,12 @@ public class OracleParser {
                     || lexer.getTokens().get(0).getValue().equalsIgnoreCase("WHILE")
             ) {
                 return parseLoop(lexer.getTokens());
+            } else if (
+                    (lexer.getTokens().get(0).getValue().equalsIgnoreCase("CREATE") && lexer.getTokens().get(1).getValue().equalsIgnoreCase("PROCEDURE"))
+                    || (lexer.getTokens().get(0).getValue().equalsIgnoreCase("CREATE") && lexer.getTokens().get(1).getValue().equalsIgnoreCase("OR")  && lexer.getTokens().get(2).getValue().equalsIgnoreCase("REPLACE") && lexer.getTokens().get(3).getValue().equalsIgnoreCase("PROCEDURE"))
+            )
+            {
+                return parseProcedure(lexer.getTokens());
             }
             else {
                 try {
@@ -1642,4 +1649,252 @@ public class OracleParser {
 
         return root;
     }
+
+    /**
+     * Create PROCEDURE
+     * Grammar: CREATE [OR REPLACE] PROCEDURE procedure_name ([parameter_list])
+     * IS [LOCAL DECLARATIONS]
+     * BEGIN
+     *     -- PL/SQL statements
+     * [EXCEPTION]
+     *     -- Exception handling
+     * END [procedure_name];
+     * Example: CREATE OR REPLACE PROCEDURE update_salary(
+     *              employee_id IN NUMBER,
+     *              new_salary IN OUT NUMBER
+     *          ) IS
+     *          BEGIN
+     *              IF new_salary < 3000 THEN
+     *                  new_salary := new_salary * 1.1;
+     *              ELSE
+     *                  new_salary := new_salary * 1.05;
+     *              END IF;
+     *          END update_salary;
+     *          /
+     */
+    private ASTNode parseProcedure(List<Token> parseTokens) {
+        ASTNode root = new ProcedureNode(new ArrayList<>());
+        ASTNode currentNode = root;
+        for (int i = 0; i < parseTokens.size(); i++) {
+            // match CREATE PROCEDURE
+            if (root.getTokens().isEmpty()) {
+                for (int j = i; j < parseTokens.size(); j++) {
+                    root.addToken(parseTokens.get(j));
+                    if (parseTokens.get(j).hasType(Token.TokenType.KEYWORD) && parseTokens.get(j).getValue().equalsIgnoreCase("PROCEDURE")) {
+                        i = j;
+                        break;
+                    }
+                }
+            }
+            // match procedure name
+            else if (currentNode == root && parseTokens.get(i).hasType(Token.TokenType.IDENTIFIER)) {
+                ASTNode childNode = new ProcedureObjNode();
+                childNode.addToken(parseTokens.get(i));
+                currentNode.addChild(childNode);
+                currentNode = childNode;
+            }
+            // match parameter list
+            else if (currentNode instanceof ProcedureObjNode && parseTokens.get(i).hasType(Token.TokenType.SYMBOL) && parseTokens.get(i).getValue().equals("(")) {
+                i++;
+                for (int ii = i; ii < parseTokens.size(); ii++) {
+                    if (parseTokens.get(ii).hasType(Token.TokenType.KEYWORD) && parseTokens.get(ii).getValue().equalsIgnoreCase("IS")) {
+                        i = ii - 1;
+                        break;
+                    }
+                    List<Token> tokens = new ArrayList<>();
+                    ProcedureColumnNode child = new ProcedureColumnNode();
+                    child.setName(parseTokens.get(ii));
+                    tokens.add(parseTokens.get(ii));
+                    List<Token> constraint = new ArrayList<>();
+                    boolean typeMatch = false;
+                    int typeIdx = -1;
+                    for (int j = ii + 1; j < parseTokens.size(); j++) {
+                        if (!typeMatch && !(parseTokens.get(j).hasType(Token.TokenType.KEYWORD) && (parseTokens.get(j).getValue().equalsIgnoreCase("IN") || parseTokens.get(j).getValue().equalsIgnoreCase("OUT"))))
+                        {
+                            child.setType(parseTokens.get(j));
+                            typeMatch = true;
+                            typeIdx = j;
+                        }
+                        if (parseTokens.get(j).hasType(Token.TokenType.KEYWORD) && (parseTokens.get(j).getValue().equalsIgnoreCase("IN") || parseTokens.get(j).getValue().equalsIgnoreCase("OUT"))) {
+                            child.addInOut(parseTokens.get(j));
+                        }
+                        // Check () or REFERENCES other_table(other_column)
+                        if (parseTokens.get(j).hasType(Token.TokenType.KEYWORD) &&
+                                (parseTokens.get(j).getValue().equalsIgnoreCase("REFERENCES")
+                                        || parseTokens.get(j).getValue().equalsIgnoreCase("CHECK"))) {
+                            tokens.add(parseTokens.get(j));
+                            if (!(parseTokens.get(j).hasType(Token.TokenType.KEYWORD) && (parseTokens.get(j).getValue().equalsIgnoreCase("IN") || parseTokens.get(j).getValue().equalsIgnoreCase("OUT"))))
+                                constraint.add(parseTokens.get(j));
+                            Stack<String> stack = new Stack<>();
+                            for (int k = j + 1; k < parseTokens.size(); k++) {
+                                tokens.add(parseTokens.get(k));
+                                if (!(parseTokens.get(k).hasType(Token.TokenType.KEYWORD) && (parseTokens.get(k).getValue().equalsIgnoreCase("IN") || parseTokens.get(k).getValue().equalsIgnoreCase("OUT"))))
+                                    constraint.add(parseTokens.get(k));
+                                if (parseTokens.get(k).getValue().equals("(")) {
+                                    stack.push("(");
+                                    for (int t = k + 1; t < parseTokens.size(); t++) {
+                                        tokens.add(parseTokens.get(t));
+                                        if (!(parseTokens.get(t).hasType(Token.TokenType.KEYWORD) && (parseTokens.get(t).getValue().equalsIgnoreCase("IN") || parseTokens.get(t).getValue().equalsIgnoreCase("OUT"))))
+                                            constraint.add(parseTokens.get(t));
+                                        if (parseTokens.get(t).getValue().equals("(")) {
+                                            stack.push("(");
+                                        } else if (parseTokens.get(t).getValue().equals(")")) {
+                                            stack.pop();
+                                            if (stack.empty()) {
+                                                ii = t;
+                                                break;
+                                            }
+                                        }
+                                    }
+                                    break;
+                                }
+                            }
+                            break;
+                        }
+                        if ((parseTokens.get(j).hasType(Token.TokenType.SYMBOL) && parseTokens.get(j).getValue().equals(",")) ||
+                                (parseTokens.get(j).hasType(Token.TokenType.SYMBOL) && parseTokens.get(j).getValue().equals(")"))) {
+                            ii = j;
+                            break;
+                        }
+                        tokens.add(parseTokens.get(j));
+                        if (typeMatch && j != typeIdx) {
+                            if (!(parseTokens.get(j).hasType(Token.TokenType.KEYWORD) && (parseTokens.get(j).getValue().equalsIgnoreCase("IN") || parseTokens.get(j).getValue().equalsIgnoreCase("OUT"))))
+                                constraint.add(parseTokens.get(j));
+                        }
+                    }
+                    child.setTokens(tokens);
+                    child.setConstraint(constraint);
+                    currentNode.addChild(child);
+                    currentNode = child;
+                }
+            }
+            // match procedure return definition
+            else if (parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("IS")) {
+                ASTNode childNode = new ProcedureRetDefNode();
+                for (int j = i; j < parseTokens.size(); j++) {
+                    if (parseTokens.get(j).hasType(Token.TokenType.KEYWORD) && parseTokens.get(j).getValue().equalsIgnoreCase("BEGIN")) {
+                        i = j - 1;
+                        break;
+                    }
+                    childNode.addToken(parseTokens.get(j));
+                }
+                currentNode.addChild(childNode);
+                currentNode = childNode;
+            }
+            // match procedure begin
+            else if (parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("BEGIN")) {
+                ASTNode childNode = new ProcedureBeginNode();
+                childNode.addToken(parseTokens.get(i));
+                currentNode.addChild(childNode);
+                currentNode = childNode;
+            }
+            // match procedure body
+            else if (currentNode instanceof ProcedureBeginNode) {
+                for (int ii = i; ii < parseTokens.size(); ii++) {
+                    if (parseTokens.get(ii).hasType(Token.TokenType.KEYWORD) && parseTokens.get(ii).getValue().equalsIgnoreCase("END")) {
+                        i = ii - 1;
+                        break;
+                    }
+                    else if (parseTokens.get(ii).hasType(Token.TokenType.KEYWORD) && parseTokens.get(ii).getValue().equalsIgnoreCase("EXCEPTION")) {
+                        i = ii - 1;
+                        break;
+                    }
+                    else if (parseTokens.get(ii).hasType(Token.TokenType.KEYWORD) && parseTokens.get(ii).getValue().equalsIgnoreCase("IF")) {
+                        int index = -1;
+                        for (int j = ii; j < parseTokens.size(); j++) {
+                            if (parseTokens.get(j).hasType(Token.TokenType.KEYWORD) && parseTokens.get(j).getValue().equalsIgnoreCase("END")
+                            && j + 1 < parseTokens.size() && parseTokens.get(j + 1).hasType(Token.TokenType.KEYWORD) && parseTokens.get(j + 1).getValue().equalsIgnoreCase("IF")
+                                    && j + 2 < parseTokens.size() && parseTokens.get(j + 2).hasType(Token.TokenType.SYMBOL) && parseTokens.get(j + 2).getValue().equals(";") ) {
+                                index = j + 2;
+                                break;
+                            }
+                        }
+                        if (index == -1) {
+                            try {
+                                throw new ParseFailedException("There exists syntax error and no END if block is found!");
+                            } catch (ParseFailedException e) {
+                                e.printStackTrace();
+                            }
+                        }
+                        else {
+                            ASTNode childNode = parseIFELSE(parseTokens.subList(ii, index + 1));
+                            currentNode.addChild(childNode);
+                            currentNode = childNode.getDeepestChild();
+                            ii = index;
+                        }
+                    }
+                    else {
+                        ASTNode childNode = new ProcedurePLStatementNode();
+                        for (int j = ii; j < parseTokens.size(); j++) {
+                            childNode.addToken(parseTokens.get(j));
+                            if (parseTokens.get(j).hasType(Token.TokenType.SYMBOL) && parseTokens.get(j).getValue().equals(";")) {
+                                ii = j;
+                                break;
+                            }
+                        }
+                        currentNode.addChild(childNode);
+                        currentNode = childNode;
+                    }
+                }
+            }
+            // match exception
+            else if (parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("EXCEPTION")) {
+                int index = -1;
+                for (int j = i; j < parseTokens.size(); j++) {
+                    if (parseTokens.get(j).hasType(Token.TokenType.KEYWORD) && parseTokens.get(j).getValue().equalsIgnoreCase("END")) {
+                        index = j;
+                        break;
+                    }
+                }
+                if (index == -1) {
+                    try {
+                        throw new ParseFailedException("There exists syntax error and no END block is found!");
+                    } catch (ParseFailedException e) {
+                        e.printStackTrace();
+                    }
+                }
+                ASTNode childNode = parseException(parseTokens.subList(i, index + 1));
+                currentNode.addChild(childNode);
+                currentNode = childNode.getDeepestChild();
+                childNode = new ProcedureEndNode();
+                for (int j = index; j < parseTokens.size(); j++) {
+                    childNode.addToken(parseTokens.get(j));
+                    if (parseTokens.get(j).hasType(Token.TokenType.EOF)) {
+                        break;
+                    }
+                }
+                currentNode.addChild(childNode);
+                currentNode = childNode;
+                break;
+            }
+            // match procedure end
+            else if (parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("END")) {
+                ASTNode childNode = new ProcedureEndNode();
+                for (int j = i; j < parseTokens.size(); j++) {
+                    childNode.addToken(parseTokens.get(j));
+                    if (parseTokens.get(j).hasType(Token.TokenType.EOF)) {
+                        break;
+                    }
+                }
+                currentNode.addChild(childNode);
+                currentNode = childNode;
+                break;
+            }
+            else if (parseTokens.get(i).hasType(Token.TokenType.EOF)) {
+                break;
+            }
+            else {
+                try {
+                    throw new ParseFailedException("Failed to parse:" + parseTokens.get(i));
+                }
+                catch (ParseFailedException e) {
+                    e.printStackTrace();
+                }
+            }
+
+        }
+
+        return root;
+    }
+
 }
-- 
Gitee


From 1b04f51349d64d5dfceb1b2fd2ae91669437422e Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Tue, 17 Sep 2024 14:38:43 +0800
Subject: [PATCH 084/113] add document of rollback, commot, execute

---
 sqlTranslate/.idea/workspace.xml              | 31 +++++++------------
 .../Commit,rollback,execute in Oracle         | 14 +++++++++
 sqlTranslate/src/main/java/Document/Todolist  |  2 +-
 .../src/main/java/Lexer/OracleLexer.java      |  2 +-
 4 files changed, 28 insertions(+), 21 deletions(-)
 create mode 100644 sqlTranslate/src/main/java/Document/Commit,rollback,execute in Oracle

diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
index c849afc3..8b2fb823 100644
--- a/sqlTranslate/.idea/workspace.xml
+++ b/sqlTranslate/.idea/workspace.xml
@@ -4,18 +4,11 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add ast classes of procedure">
+    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add procedure">
+      <change afterPath="$PROJECT_DIR$/src/main/java/Document/Commit,rollback,execute in Oracle" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Document/Procedure in Oracle" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Document/Procedure in Oracle" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/Document/Todolist" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Document/Todolist" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Generator/OpenGaussGenerator.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Generator/OpenGaussGenerator.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/Lexer/OracleLexer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Lexer/OracleLexer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Main.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Exception/ExceptionEndNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Exception/ExceptionEndNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Procedure/ProcedureColumnNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Procedure/ProcedureColumnNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Procedure/ProcedurePLStatementNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Procedure/ProcedurePLStatementNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Procedure/ProcedureRetDefNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Procedure/ProcedureRetDefNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -113,13 +106,6 @@
       <option name="presentableId" value="Default" />
       <updated>1723106789329</updated>
     </task>
-    <task id="LOCAL-00032" summary="add parseSelect">
-      <created>1725981975960</created>
-      <option name="number" value="00032" />
-      <option name="presentableId" value="LOCAL-00032" />
-      <option name="project" value="LOCAL" />
-      <updated>1725981975960</updated>
-    </task>
     <task id="LOCAL-00033" summary="add parseSelect">
       <created>1726041355829</created>
       <option name="number" value="00033" />
@@ -456,7 +442,14 @@
       <option name="project" value="LOCAL" />
       <updated>1726496640760</updated>
     </task>
-    <option name="localTasksCounter" value="81" />
+    <task id="LOCAL-00081" summary="add procedure">
+      <created>1726554513045</created>
+      <option name="number" value="00081" />
+      <option name="presentableId" value="LOCAL-00081" />
+      <option name="project" value="LOCAL" />
+      <updated>1726554513046</updated>
+    </task>
+    <option name="localTasksCounter" value="82" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
@@ -471,7 +464,6 @@
     </option>
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="add Delete" />
     <MESSAGE value="add alter table grammar document" />
     <MESSAGE value="add alter table ast class" />
     <MESSAGE value="add alter table keywords" />
@@ -496,7 +488,8 @@
     <MESSAGE value="add exception" />
     <MESSAGE value="add document of Procedure" />
     <MESSAGE value="add ast classes of procedure" />
-    <option name="LAST_COMMIT_MESSAGE" value="add ast classes of procedure" />
+    <MESSAGE value="add procedure" />
+    <option name="LAST_COMMIT_MESSAGE" value="add procedure" />
   </component>
   <component name="XDebuggerManager">
     <watches-manager>
diff --git a/sqlTranslate/src/main/java/Document/Commit,rollback,execute in Oracle b/sqlTranslate/src/main/java/Document/Commit,rollback,execute in Oracle
new file mode 100644
index 00000000..c96ea33f
--- /dev/null
+++ b/sqlTranslate/src/main/java/Document/Commit,rollback,execute in Oracle	
@@ -0,0 +1,14 @@
+BEGIN
+    -- some ddl sql
+    INSERT INTO my_table (id, value) VALUES (1, 'test');
+
+    -- Commit
+    COMMIT;
+
+    -- Failed
+    ROLLBACK;
+END;
+/
+
+EXECUTE: EXEC my_procedure('some value');
+        | EXECUTE IMMEDIATE 'INSERT INTO my_table (id, name) VALUES (1, ''John'')';
\ No newline at end of file
diff --git a/sqlTranslate/src/main/java/Document/Todolist b/sqlTranslate/src/main/java/Document/Todolist
index 25611b33..9cc0476a 100644
--- a/sqlTranslate/src/main/java/Document/Todolist
+++ b/sqlTranslate/src/main/java/Document/Todolist
@@ -23,5 +23,5 @@ Object
  table 1
  view 1
  function ***
- procedure ***
+ procedure 1
  trigger ****
\ No newline at end of file
diff --git a/sqlTranslate/src/main/java/Lexer/OracleLexer.java b/sqlTranslate/src/main/java/Lexer/OracleLexer.java
index cda8db86..6f63c960 100644
--- a/sqlTranslate/src/main/java/Lexer/OracleLexer.java
+++ b/sqlTranslate/src/main/java/Lexer/OracleLexer.java
@@ -36,7 +36,7 @@ public class OracleLexer {
             // Exception
             , "EXCEPTION", "SQLERRM", "ZERO_DIVIDE", "INVALID_NUMBER", "OTHERS"
             // Procedure
-            , "PROCEDURE", "IS", "IN", "OUT", "$$"
+            , "PROCEDURE", "IS", "IN", "OUT", "$$", "COMMIT", "ROLLBACK", "EXEC", "EXECUTE"
     };
     private static final Pattern TOKEN_PATTERN = Pattern.compile(
             "(NUMBER\\(.*?\\))|" +                     // NUMBER() function
-- 
Gitee


From 9d91b73238fc7fd2c0689ea927cf6ab9bb5d9844 Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Tue, 17 Sep 2024 16:21:38 +0800
Subject: [PATCH 085/113] add document of function

---
 sqlTranslate/.idea/workspace.xml              | 25 +++++++++----------
 .../src/main/java/Document/Function in Oracle | 10 ++++++++
 sqlTranslate/src/main/java/Document/Todolist  |  2 +-
 3 files changed, 23 insertions(+), 14 deletions(-)
 create mode 100644 sqlTranslate/src/main/java/Document/Function in Oracle

diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
index 8b2fb823..045185df 100644
--- a/sqlTranslate/.idea/workspace.xml
+++ b/sqlTranslate/.idea/workspace.xml
@@ -4,11 +4,10 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add procedure">
-      <change afterPath="$PROJECT_DIR$/src/main/java/Document/Commit,rollback,execute in Oracle" afterDir="false" />
+    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add document of rollback, commot, execute">
+      <change afterPath="$PROJECT_DIR$/src/main/java/Document/Function in Oracle" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/Document/Todolist" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Document/Todolist" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Lexer/OracleLexer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Lexer/OracleLexer.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -106,13 +105,6 @@
       <option name="presentableId" value="Default" />
       <updated>1723106789329</updated>
     </task>
-    <task id="LOCAL-00033" summary="add parseSelect">
-      <created>1726041355829</created>
-      <option name="number" value="00033" />
-      <option name="presentableId" value="LOCAL-00033" />
-      <option name="project" value="LOCAL" />
-      <updated>1726041355829</updated>
-    </task>
     <task id="LOCAL-00034" summary="revise">
       <created>1726059547456</created>
       <option name="number" value="00034" />
@@ -449,7 +441,14 @@
       <option name="project" value="LOCAL" />
       <updated>1726554513046</updated>
     </task>
-    <option name="localTasksCounter" value="82" />
+    <task id="LOCAL-00082" summary="add document of rollback, commot, execute">
+      <created>1726555125392</created>
+      <option name="number" value="00082" />
+      <option name="presentableId" value="LOCAL-00082" />
+      <option name="project" value="LOCAL" />
+      <updated>1726555125392</updated>
+    </task>
+    <option name="localTasksCounter" value="83" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
@@ -464,7 +463,6 @@
     </option>
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="add alter table grammar document" />
     <MESSAGE value="add alter table ast class" />
     <MESSAGE value="add alter table keywords" />
     <MESSAGE value="add alter table parser" />
@@ -489,7 +487,8 @@
     <MESSAGE value="add document of Procedure" />
     <MESSAGE value="add ast classes of procedure" />
     <MESSAGE value="add procedure" />
-    <option name="LAST_COMMIT_MESSAGE" value="add procedure" />
+    <MESSAGE value="add document of rollback, commot, execute" />
+    <option name="LAST_COMMIT_MESSAGE" value="add document of rollback, commot, execute" />
   </component>
   <component name="XDebuggerManager">
     <watches-manager>
diff --git a/sqlTranslate/src/main/java/Document/Function in Oracle b/sqlTranslate/src/main/java/Document/Function in Oracle
new file mode 100644
index 00000000..f360a699
--- /dev/null
+++ b/sqlTranslate/src/main/java/Document/Function in Oracle	
@@ -0,0 +1,10 @@
+CREATE OR REPLACE FUNCTION function_name (
+    parameter1 [IN | OUT] datatype1 ,
+    parameter2 [IN | OUT] datatype2 ,
+    ...
+) RETURN return_datatype IS
+BEGIN
+    -- function body
+    RETURN result;
+END;
+/
\ No newline at end of file
diff --git a/sqlTranslate/src/main/java/Document/Todolist b/sqlTranslate/src/main/java/Document/Todolist
index 9cc0476a..d85fae2e 100644
--- a/sqlTranslate/src/main/java/Document/Todolist
+++ b/sqlTranslate/src/main/java/Document/Todolist
@@ -15,7 +15,7 @@ Operation
  continue、exit 1
  return ***
  exception 1
- commit、rollback、execute ***
+ commit、rollback、execute 1
  alter table 1
  create table 1
  drop table 1
-- 
Gitee


From d61e9d8460c5e991db220c2dd07c37884bf2ee25 Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Tue, 17 Sep 2024 22:29:50 +0800
Subject: [PATCH 086/113] add ast classes of function

---
 sqlTranslate/.idea/workspace.xml              | 34 ++++---
 .../src/main/java/Document/Function in Oracle | 10 +-
 sqlTranslate/src/main/java/Main.java          | 64 ++++++-------
 .../AST/Function/FunctionBeginNode.java       | 30 ++++++
 .../Parser/AST/Function/FunctionBodyNode.java | 30 ++++++
 .../AST/Function/FunctionColumnNode.java      | 93 +++++++++++++++++++
 .../Parser/AST/Function/FunctionEndNode.java  | 30 ++++++
 .../Parser/AST/Function/FunctionNameNode.java | 30 ++++++
 .../Parser/AST/Function/FunctionNode.java     | 31 +++++++
 .../AST/Function/FunctionRetDefNode.java      | 30 ++++++
 .../AST/Function/FunctionReturnNode.java      | 30 ++++++
 11 files changed, 366 insertions(+), 46 deletions(-)
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/Function/FunctionBeginNode.java
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/Function/FunctionBodyNode.java
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/Function/FunctionColumnNode.java
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/Function/FunctionEndNode.java
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/Function/FunctionNameNode.java
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/Function/FunctionNode.java
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/Function/FunctionRetDefNode.java
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/Function/FunctionReturnNode.java

diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
index 045185df..c8f8f17a 100644
--- a/sqlTranslate/.idea/workspace.xml
+++ b/sqlTranslate/.idea/workspace.xml
@@ -4,10 +4,18 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add document of rollback, commot, execute">
-      <change afterPath="$PROJECT_DIR$/src/main/java/Document/Function in Oracle" afterDir="false" />
+    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add document of function">
+      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Function/FunctionBeginNode.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Function/FunctionBodyNode.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Function/FunctionColumnNode.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Function/FunctionEndNode.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Function/FunctionNameNode.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Function/FunctionNode.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Function/FunctionRetDefNode.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Function/FunctionReturnNode.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Document/Todolist" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Document/Todolist" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Document/Function in Oracle" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Document/Function in Oracle" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Main.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -105,13 +113,6 @@
       <option name="presentableId" value="Default" />
       <updated>1723106789329</updated>
     </task>
-    <task id="LOCAL-00034" summary="revise">
-      <created>1726059547456</created>
-      <option name="number" value="00034" />
-      <option name="presentableId" value="LOCAL-00034" />
-      <option name="project" value="LOCAL" />
-      <updated>1726059547457</updated>
-    </task>
     <task id="LOCAL-00035" summary="revise">
       <created>1726065430463</created>
       <option name="number" value="00035" />
@@ -448,7 +449,14 @@
       <option name="project" value="LOCAL" />
       <updated>1726555125392</updated>
     </task>
-    <option name="localTasksCounter" value="83" />
+    <task id="LOCAL-00083" summary="add document of function">
+      <created>1726561299659</created>
+      <option name="number" value="00083" />
+      <option name="presentableId" value="LOCAL-00083" />
+      <option name="project" value="LOCAL" />
+      <updated>1726561299659</updated>
+    </task>
+    <option name="localTasksCounter" value="84" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
@@ -463,7 +471,6 @@
     </option>
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="add alter table ast class" />
     <MESSAGE value="add alter table keywords" />
     <MESSAGE value="add alter table parser" />
     <MESSAGE value="add alter" />
@@ -488,7 +495,8 @@
     <MESSAGE value="add ast classes of procedure" />
     <MESSAGE value="add procedure" />
     <MESSAGE value="add document of rollback, commot, execute" />
-    <option name="LAST_COMMIT_MESSAGE" value="add document of rollback, commot, execute" />
+    <MESSAGE value="add document of function" />
+    <option name="LAST_COMMIT_MESSAGE" value="add document of function" />
   </component>
   <component name="XDebuggerManager">
     <watches-manager>
diff --git a/sqlTranslate/src/main/java/Document/Function in Oracle b/sqlTranslate/src/main/java/Document/Function in Oracle
index f360a699..875eec5e 100644
--- a/sqlTranslate/src/main/java/Document/Function in Oracle	
+++ b/sqlTranslate/src/main/java/Document/Function in Oracle	
@@ -7,4 +7,12 @@ BEGIN
     -- function body
     RETURN result;
 END;
-/
\ No newline at end of file
+/
+
+Example: CREATE OR REPLACE FUNCTION string_length (
+             input_string VARCHAR2
+         ) RETURN NUMBER IS
+         BEGIN
+             RETURN LENGTH(input_string);
+         END;
+         /
\ No newline at end of file
diff --git a/sqlTranslate/src/main/java/Main.java b/sqlTranslate/src/main/java/Main.java
index 36ee8687..1f62f6ff 100644
--- a/sqlTranslate/src/main/java/Main.java
+++ b/sqlTranslate/src/main/java/Main.java
@@ -22,11 +22,11 @@ public class Main {
 //        String sql = "DROP TABLE employees CASCADE CONSTRAINTS;";
 //        String sql = "SELECT e.first_name, d.department_name FROM employees e JOIN departments d Using e.department_id = d.department_id;";
 //        String sql = "employees e JOIN departments d ON e.department_id = d.department_id;";
-        String sql = "UPDATE employees e\n" +
-                "JOIN departments d using e.department_id = d.department_id\n" +
-                "SET e.salary = e.salary * 1.10,\n" +
-                "    d.budget = d.budget * 1.10\n" +
-                "WHERE d.department_name = 'Sales';";
+//        String sql = "UPDATE employees e\n" +
+//                "JOIN departments d using e.department_id = d.department_id\n" +
+//                "SET e.salary = e.salary * 1.10,\n" +
+//                "    d.budget = d.budget * 1.10\n" +
+//                "WHERE d.department_name = 'Sales';";
 //        String sql = "DELETE FROM employees e\n" +
 //                "WHERE e.department_id IN (\n" +
 //                "    SELECT d.department_id\n" +
@@ -60,33 +60,33 @@ public class Main {
 //                "        DBMS_OUTPUT.PUT_LINE('Caught an exception: Invalid number');\n" +
 //                "    WHEN OTHERS THEN\n" +
 //                "        DBMS_OUTPUT.PUT_LINE('Caught an exception: ' || SQLERRM);";
-//        String sql = "CREATE OR REPLACE PROCEDURE update_salary (\n" +
-//                "             employee_id IN NUMBER,\n" +
-//                "             new_salary IN OUT NUMBER\n" +
-//                "         ) IS\n" +
-//                "             v_employee employees%ROWTYPE;\n" +
-//                "         BEGIN\n" +
-//                "             SELECT * INTO v_employee FROM employees WHERE employee_id = employee_id;\n" +
-//                "\n" +
-//                "             IF new_salary < 3000 THEN\n" +
-//                "                 new_salary := new_salary * 1.1;\n" +
-//                "             ELSE\n" +
-//                "                 new_salary := new_salary * 1.05;\n" +
-//                "             END IF;\n" +
-//                "\n" +
-//                "             UPDATE employees SET salary = new_salary WHERE employee_id = employee_id;\n" +
-//                "             COMMIT;\n" +
-//                "\n" +
-//                "             DBMS_OUTPUT.PUT_LINE('Updated Salary: ' || new_salary);\n" +
-//                "         EXCEPTION\n" +
-//                "             WHEN NO_DATA_FOUND THEN\n" +
-//                "                 DBMS_OUTPUT.PUT_LINE('Employee not found.');\n" +
-//                "             WHEN TOO_MANY_ROWS THEN\n" +
-//                "                 DBMS_OUTPUT.PUT_LINE('Multiple employees found.');\n" +
-//                "             WHEN OTHERS THEN\n" +
-//                "                 DBMS_OUTPUT.PUT_LINE('An error occurred: ' || SQLERRM);\n" +
-//                "         END update_salary;\n" +
-//                "         /";
+        String sql = "CREATE OR REPLACE PROCEDURE update_salary (\n" +
+                "             employee_id IN NUMBER,\n" +
+                "             new_salary IN OUT NUMBER\n" +
+                "         ) IS\n" +
+                "             v_employee employees%ROWTYPE;\n" +
+                "         BEGIN\n" +
+                "             SELECT * INTO v_employee FROM employees WHERE employee_id = employee_id;\n" +
+                "\n" +
+                "             IF new_salary < 3000 THEN\n" +
+                "                 new_salary := new_salary * 1.1;\n" +
+                "             ELSE\n" +
+                "                 new_salary := new_salary * 1.05;\n" +
+                "             END IF;\n" +
+                "\n" +
+                "             UPDATE employees SET salary = new_salary WHERE employee_id = employee_id;\n" +
+                "             COMMIT;\n" +
+                "\n" +
+                "             DBMS_OUTPUT.PUT_LINE('Updated Salary: ' || new_salary);\n" +
+                "         EXCEPTION\n" +
+                "             WHEN NO_DATA_FOUND THEN\n" +
+                "                 DBMS_OUTPUT.PUT_LINE('Employee not found.');\n" +
+                "             WHEN TOO_MANY_ROWS THEN\n" +
+                "                 DBMS_OUTPUT.PUT_LINE('Multiple employees found.');\n" +
+                "             WHEN OTHERS THEN\n" +
+                "                 DBMS_OUTPUT.PUT_LINE('An error occurred: ' || SQLERRM);\n" +
+                "         END update_salary;\n" +
+                "         /";
         OracleLexer lexer = new OracleLexer(sql);
         lexer.printTokens();
         OracleParser parser = new OracleParser(lexer);
diff --git a/sqlTranslate/src/main/java/Parser/AST/Function/FunctionBeginNode.java b/sqlTranslate/src/main/java/Parser/AST/Function/FunctionBeginNode.java
new file mode 100644
index 00000000..4d6e4076
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/Function/FunctionBeginNode.java
@@ -0,0 +1,30 @@
+package Parser.AST.Function;
+
+import Lexer.Token;
+import Parser.AST.ASTNode;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class FunctionBeginNode extends ASTNode {
+    public FunctionBeginNode(List<Token> tokens) {
+        super(tokens);
+    }
+
+    public FunctionBeginNode(ASTNode node) {
+        super(node);
+    }
+
+    public FunctionBeginNode() {
+        super();
+        setTokens(new ArrayList<>());
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString) {
+        queryString.append(toString() + " ");
+        for (ASTNode child : node.getChildren()) {
+            child.visit(child, queryString);
+        }
+    }
+}
diff --git a/sqlTranslate/src/main/java/Parser/AST/Function/FunctionBodyNode.java b/sqlTranslate/src/main/java/Parser/AST/Function/FunctionBodyNode.java
new file mode 100644
index 00000000..3796a182
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/Function/FunctionBodyNode.java
@@ -0,0 +1,30 @@
+package Parser.AST.Function;
+
+import Lexer.Token;
+import Parser.AST.ASTNode;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class FunctionBodyNode extends ASTNode {
+    public FunctionBodyNode() {
+        super();
+        setTokens(new ArrayList<>());
+    }
+
+    public FunctionBodyNode(ASTNode node) {
+        super(node);
+    }
+
+    public FunctionBodyNode(List<Token> tokens) {
+        super(tokens);
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString) {
+        queryString.append(toString() + " ");
+        for (ASTNode child : node.getChildren()) {
+            child.visit(child, queryString);
+        }
+    }
+}
diff --git a/sqlTranslate/src/main/java/Parser/AST/Function/FunctionColumnNode.java b/sqlTranslate/src/main/java/Parser/AST/Function/FunctionColumnNode.java
new file mode 100644
index 00000000..b00eaca4
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/Function/FunctionColumnNode.java
@@ -0,0 +1,93 @@
+package Parser.AST.Function;
+
+import Interface.ColumnType;
+import Lexer.Token;
+import Parser.AST.ASTNode;
+import Parser.AST.Procedure.ProcedureColumnNode;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class FunctionColumnNode extends ASTNode implements ColumnType {
+    private Token name;
+    private Token type;
+    private List<Token> constraint;
+    private List<Token> InOut;
+    public FunctionColumnNode() {
+        super();
+        setTokens(new ArrayList<>());
+    }
+
+    public FunctionColumnNode(ASTNode node) {
+        super(node);
+    }
+
+    public FunctionColumnNode(List<Token> tokens) {
+        super(tokens);
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString)
+    {
+        if (node.hasChild() && (node.getChildren().get(0) instanceof FunctionColumnNode) )
+            queryString.append(toString() + ", ");
+        else if (node.hasChild() && !(node.getChildren().get(0) instanceof FunctionColumnNode))
+            queryString.append(toString() + " ");
+        for (ASTNode child : getChildren())
+        {
+            child.visit(child, queryString);
+        }
+    }
+
+    public Token getName() {
+        return name;
+    }
+
+    public void setName(Token name) {
+        this.name = name;
+    }
+
+    @Override
+    public Token getType() {
+        return type;
+    }
+
+    @Override
+    public void setType(Token type) {
+        this.type = type;
+    }
+
+    public List<Token> getConstraint() {
+        return constraint;
+    }
+
+    public void setConstraint(List<Token> constraint) {
+        this.constraint = constraint;
+    }
+
+    public List<Token> getInOut() {
+        return InOut;
+    }
+
+    public void setInOut(List<Token> InOut) {
+        this.InOut = InOut;
+    }
+
+    public void addInOut(Token InOut) {
+        this.InOut.add(InOut);
+    }
+
+    @Override
+    public void ResetTokensbyNameTypeConstraint() {
+        List <Token> tokens = new ArrayList<>();
+        tokens.add(name);
+        for (Token token : InOut) {
+            tokens.add(token);
+        }
+        tokens.add(type);
+        for (Token token : constraint) {
+            tokens.add(token);
+        }
+        setTokens(tokens);
+    }
+}
diff --git a/sqlTranslate/src/main/java/Parser/AST/Function/FunctionEndNode.java b/sqlTranslate/src/main/java/Parser/AST/Function/FunctionEndNode.java
new file mode 100644
index 00000000..ef36e4da
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/Function/FunctionEndNode.java
@@ -0,0 +1,30 @@
+package Parser.AST.Function;
+
+import Lexer.Token;
+import Parser.AST.ASTNode;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class FunctionEndNode extends ASTNode {
+    public FunctionEndNode(List<Token> tokens) {
+        super(tokens);
+    }
+
+    public FunctionEndNode(ASTNode node) {
+        super(node);
+    }
+
+    public FunctionEndNode() {
+        super();
+        setTokens(new ArrayList<>());
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString) {
+        queryString.append(toString());
+        for (ASTNode child : node.getChildren()) {
+            child.visit(child, queryString);
+        }
+    }
+}
diff --git a/sqlTranslate/src/main/java/Parser/AST/Function/FunctionNameNode.java b/sqlTranslate/src/main/java/Parser/AST/Function/FunctionNameNode.java
new file mode 100644
index 00000000..e7fd6e63
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/Function/FunctionNameNode.java
@@ -0,0 +1,30 @@
+package Parser.AST.Function;
+
+import Lexer.Token;
+import Parser.AST.ASTNode;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class FunctionNameNode extends ASTNode {
+    public FunctionNameNode(List<Token> tokens) {
+        super(tokens);
+    }
+
+    public FunctionNameNode(ASTNode node) {
+        super(node);
+    }
+
+    public FunctionNameNode() {
+        super();
+        setTokens(new ArrayList<>());
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString) {
+        queryString.append(toString() + " ");
+        for (ASTNode child : node.getChildren()) {
+            child.visit(child, queryString);
+        }
+    }
+}
diff --git a/sqlTranslate/src/main/java/Parser/AST/Function/FunctionNode.java b/sqlTranslate/src/main/java/Parser/AST/Function/FunctionNode.java
new file mode 100644
index 00000000..f1564ed1
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/Function/FunctionNode.java
@@ -0,0 +1,31 @@
+package Parser.AST.Function;
+
+import Lexer.Token;
+import Parser.AST.ASTNode;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class FunctionNode extends ASTNode {
+    public FunctionNode() {
+        super();
+        setTokens(new ArrayList<>());
+    }
+
+    public FunctionNode(ASTNode node) {
+        super(node);
+    }
+
+    public FunctionNode(List<Token> tokens) {
+        super(tokens);
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString) {
+        queryString.append(toString() + " ");
+        for (ASTNode child : node.getChildren()) {
+            child.visit(child, queryString);
+        }
+    }
+
+}
diff --git a/sqlTranslate/src/main/java/Parser/AST/Function/FunctionRetDefNode.java b/sqlTranslate/src/main/java/Parser/AST/Function/FunctionRetDefNode.java
new file mode 100644
index 00000000..6d33b6a0
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/Function/FunctionRetDefNode.java
@@ -0,0 +1,30 @@
+package Parser.AST.Function;
+
+import Lexer.Token;
+import Parser.AST.ASTNode;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class FunctionRetDefNode extends ASTNode {
+    public FunctionRetDefNode() {
+        super();
+        setTokens(new ArrayList<>());
+    }
+
+    public FunctionRetDefNode(ASTNode node) {
+        super(node);
+    }
+
+    public FunctionRetDefNode(List<Token> tokens) {
+        super(tokens);
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString) {
+        queryString.append(toString() + " ");
+        for (ASTNode child : node.getChildren()) {
+            child.visit(child, queryString);
+        }
+    }
+}
diff --git a/sqlTranslate/src/main/java/Parser/AST/Function/FunctionReturnNode.java b/sqlTranslate/src/main/java/Parser/AST/Function/FunctionReturnNode.java
new file mode 100644
index 00000000..bd29139c
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/Function/FunctionReturnNode.java
@@ -0,0 +1,30 @@
+package Parser.AST.Function;
+
+import Lexer.Token;
+import Parser.AST.ASTNode;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class FunctionReturnNode extends ASTNode {
+    public FunctionReturnNode() {
+        super();
+        setTokens(new ArrayList<>());
+    }
+
+    public FunctionReturnNode(ASTNode node) {
+        super(node);
+    }
+
+    public FunctionReturnNode(List<Token> tokens) {
+        super(tokens);
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString) {
+        queryString.append(toString() + " ");
+        for (ASTNode child : node.getChildren()) {
+            child.visit(child, queryString);
+        }
+    }
+}
-- 
Gitee


From 6afc2b1085919a8492609024c17d5a091449833b Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Tue, 17 Sep 2024 23:36:18 +0800
Subject: [PATCH 087/113] add function

---
 sqlTranslate/.idea/workspace.xml              |  42 +--
 .../java/Generator/OpenGaussGenerator.java    |  63 ++++-
 .../{ColumnType.java => DataType.java}        |   2 +-
 .../src/main/java/Lexer/OracleLexer.java      |   6 +
 sqlTranslate/src/main/java/Main.java          |  61 +++--
 .../AST/AlterTable/AlterAddColumnNode.java    |   4 +-
 .../AST/AlterTable/AlterModifyColumnNode.java |   4 +-
 .../Parser/AST/CreateTable/ColumnNode.java    |   4 +-
 .../AST/Function/FunctionColumnNode.java      |   6 +-
 .../Parser/AST/Function/FunctionNameNode.java |   2 +-
 .../AST/Function/FunctionRetDefNode.java      |  25 +-
 .../AST/Procedure/ProcedureColumnNode.java    |   5 +-
 .../src/main/java/Parser/OracleParser.java    | 249 +++++++++++++++++-
 13 files changed, 405 insertions(+), 68 deletions(-)
 rename sqlTranslate/src/main/java/Interface/{ColumnType.java => DataType.java} (82%)

diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
index c8f8f17a..3306e346 100644
--- a/sqlTranslate/.idea/workspace.xml
+++ b/sqlTranslate/.idea/workspace.xml
@@ -4,18 +4,20 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add document of function">
-      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Function/FunctionBeginNode.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Function/FunctionBodyNode.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Function/FunctionColumnNode.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Function/FunctionEndNode.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Function/FunctionNameNode.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Function/FunctionNode.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Function/FunctionRetDefNode.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Function/FunctionReturnNode.java" afterDir="false" />
+    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add ast classes of function">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Document/Function in Oracle" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Document/Function in Oracle" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Generator/OpenGaussGenerator.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Generator/OpenGaussGenerator.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Interface/ColumnType.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Interface/DataType.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Lexer/OracleLexer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Lexer/OracleLexer.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Main.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/AlterTable/AlterAddColumnNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/AlterTable/AlterAddColumnNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/AlterTable/AlterModifyColumnNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/AlterTable/AlterModifyColumnNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/CreateTable/ColumnNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/CreateTable/ColumnNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Function/FunctionColumnNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Function/FunctionColumnNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Function/FunctionNameNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Function/FunctionNameNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Function/FunctionRetDefNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Function/FunctionRetDefNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Procedure/ProcedureColumnNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Procedure/ProcedureColumnNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -113,13 +115,6 @@
       <option name="presentableId" value="Default" />
       <updated>1723106789329</updated>
     </task>
-    <task id="LOCAL-00035" summary="revise">
-      <created>1726065430463</created>
-      <option name="number" value="00035" />
-      <option name="presentableId" value="LOCAL-00035" />
-      <option name="project" value="LOCAL" />
-      <updated>1726065430463</updated>
-    </task>
     <task id="LOCAL-00036" summary="revise">
       <created>1726066806993</created>
       <option name="number" value="00036" />
@@ -456,7 +451,14 @@
       <option name="project" value="LOCAL" />
       <updated>1726561299659</updated>
     </task>
-    <option name="localTasksCounter" value="84" />
+    <task id="LOCAL-00084" summary="add ast classes of function">
+      <created>1726583392370</created>
+      <option name="number" value="00084" />
+      <option name="presentableId" value="LOCAL-00084" />
+      <option name="project" value="LOCAL" />
+      <updated>1726583392370</updated>
+    </task>
+    <option name="localTasksCounter" value="85" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
@@ -471,7 +473,6 @@
     </option>
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="add alter table keywords" />
     <MESSAGE value="add alter table parser" />
     <MESSAGE value="add alter" />
     <MESSAGE value="fix some bugs" />
@@ -496,7 +497,8 @@
     <MESSAGE value="add procedure" />
     <MESSAGE value="add document of rollback, commot, execute" />
     <MESSAGE value="add document of function" />
-    <option name="LAST_COMMIT_MESSAGE" value="add document of function" />
+    <MESSAGE value="add ast classes of function" />
+    <option name="LAST_COMMIT_MESSAGE" value="add ast classes of function" />
   </component>
   <component name="XDebuggerManager">
     <watches-manager>
diff --git a/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java b/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java
index a00185ee..764d557f 100644
--- a/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java
+++ b/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java
@@ -1,6 +1,6 @@
 package Generator;
 
-import Interface.ColumnType;
+import Interface.DataType;
 import Lexer.OracleLexer;
 import Lexer.Token;
 import Parser.AST.ASTNode;
@@ -15,6 +15,10 @@ import Parser.AST.Drop.DropNode;
 import Parser.AST.Drop.DropOptionNode;
 import Parser.AST.Exception.ExceptionActionNode;
 import Parser.AST.Exception.ExceptionNode;
+import Parser.AST.Function.FunctionColumnNode;
+import Parser.AST.Function.FunctionEndNode;
+import Parser.AST.Function.FunctionNode;
+import Parser.AST.Function.FunctionRetDefNode;
 import Parser.AST.Insert.InsertNode;
 import Parser.AST.Join.JoinConditionNode;
 import Parser.AST.Join.JoinSourceTabNode;
@@ -82,6 +86,9 @@ public class OpenGaussGenerator {
         else if (node instanceof ProcedureNode) {
             return GenProcedureSQL(node);
         }
+        else if (node instanceof FunctionNode) {
+            return GenFunctionSQL(node);
+        }
         else {
             try {
                 throw new GenerateFailedException("Root node:" + node.getClass() + "(Unsupported node type!)");
@@ -154,7 +161,12 @@ public class OpenGaussGenerator {
 
     private String GenProcedureSQL(ASTNode node) {
         visitPL(node);
-        System.out.println(node.getASTString());
+//        System.out.println(node.getASTString());
+        return node.toQueryString();
+    }
+
+    private String GenFunctionSQL(ASTNode node) {
+        visitFunc(node);
         return node.toQueryString();
     }
 
@@ -271,6 +283,25 @@ public class OpenGaussGenerator {
             visitPL(child);
         }
     }
+
+    private void visitFunc(ASTNode node) {
+        if (node instanceof FunctionRetDefNode) {
+            PLConvert(node);
+        }
+        else if (node instanceof ExceptionNode) {
+            visitException(node);
+        }
+        else if (node instanceof FunctionColumnNode) {
+            ColumnTypeConvert((FunctionColumnNode) node);
+        }
+        else if (node instanceof FunctionEndNode) {
+            PLConvert(node);
+        }
+        for (ASTNode child : node.getChildren()) {
+            visitFunc(child);
+        }
+    }
+
     private void PLConvert(ASTNode node) {
         if (node.checkExistsByRegex("(?i)DBMS_OUTPUT.PUT_LINE\\(.*?\\)")) {
             String printObj = "";
@@ -359,10 +390,36 @@ public class OpenGaussGenerator {
             tokens.add(new Token(Token.TokenType.SYMBOL, ";"));
             node.setTokens(tokens);
         }
+        if (node instanceof FunctionEndNode) {
+            List<Token> tokens = new ArrayList<>();
+            tokens.add(new Token(Token.TokenType.KEYWORD, "END"));
+            tokens.add(new Token(Token.TokenType.SYMBOL, ";"));
+            tokens.add(new Token(Token.TokenType.KEYWORD, "$$"));
+            tokens.add(new Token(Token.TokenType.KEYWORD, "LANGUAGE"));
+            tokens.add(new Token(Token.TokenType.KEYWORD, "plpgsql"));
+            tokens.add(new Token(Token.TokenType.SYMBOL, ";"));
+            node.setTokens(tokens);
+        }
+        if (node instanceof FunctionRetDefNode) {
+            List<Token> tokens = new ArrayList<>();
+            for (Token token: node.getTokens()) {
+                if (token.hasType(Token.TokenType.KEYWORD) && token.getValue().equalsIgnoreCase("RETURN")) {
+                    tokens.add(new Token(Token.TokenType.KEYWORD, "RETURNS"));
+                }
+                else if (token.hasType(Token.TokenType.KEYWORD) && token.getValue().equalsIgnoreCase("IS")) {
+                    tokens.add(new Token(Token.TokenType.KEYWORD, "AS"));
+                    tokens.add(new Token(Token.TokenType.KEYWORD, "$$"));
+                }
+                else {
+                    tokens.add(token);
+                }
+            }
+            node.setTokens(tokens);
+        }
     }
 
 
-    private void ColumnTypeConvert(ColumnType node) {
+    private void ColumnTypeConvert(DataType node) {
         // type convert
         if (node.getType().getValue().equalsIgnoreCase("NUMBER")) {
             node.setType(new Token(Token.TokenType.KEYWORD, "NUMERIC"));
diff --git a/sqlTranslate/src/main/java/Interface/ColumnType.java b/sqlTranslate/src/main/java/Interface/DataType.java
similarity index 82%
rename from sqlTranslate/src/main/java/Interface/ColumnType.java
rename to sqlTranslate/src/main/java/Interface/DataType.java
index 1e82d101..2174d4a8 100644
--- a/sqlTranslate/src/main/java/Interface/ColumnType.java
+++ b/sqlTranslate/src/main/java/Interface/DataType.java
@@ -2,7 +2,7 @@ package Interface;
 
 import Lexer.Token;
 
-public interface ColumnType {
+public interface DataType {
     Token getType();
     void setType(Token type);
     void ResetTokensbyNameTypeConstraint();
diff --git a/sqlTranslate/src/main/java/Lexer/OracleLexer.java b/sqlTranslate/src/main/java/Lexer/OracleLexer.java
index 6f63c960..5f0c7794 100644
--- a/sqlTranslate/src/main/java/Lexer/OracleLexer.java
+++ b/sqlTranslate/src/main/java/Lexer/OracleLexer.java
@@ -37,6 +37,8 @@ public class OracleLexer {
             , "EXCEPTION", "SQLERRM", "ZERO_DIVIDE", "INVALID_NUMBER", "OTHERS"
             // Procedure
             , "PROCEDURE", "IS", "IN", "OUT", "$$", "COMMIT", "ROLLBACK", "EXEC", "EXECUTE"
+            // function
+            , "FUNCTION", "RETURN"
     };
     private static final Pattern TOKEN_PATTERN = Pattern.compile(
             "(NUMBER\\(.*?\\))|" +                     // NUMBER() function
@@ -55,6 +57,7 @@ public class OracleLexer {
                     "(MIN\\(.*?\\))|" +                     // MIN() function
                     "(\\|\\|\\s*'.*?'\\s*\\|\\|)|" +        // || '*' ||
                     "(DBMS_OUTPUT.PUT_LINE\\(.*?\\))|" +                     // DBMS_OUTPUT.PUT_LINE() function
+                    "(LENGTH\\(.*?\\))|" +                     // LENGTH() function
 
                     "(NOT NULL)|" +
                     "(PRIMARY KEY)|" +
@@ -177,6 +180,9 @@ public class OracleLexer {
         } else if (tokenValue.matches("(?i)DBMS_OUTPUT.PUT_LINE\\(.*?\\)")) {
             // RAW() function, CASE_INSENSITIVE
             return new Token(Token.TokenType.KEYWORD, tokenValue);
+        } else if (tokenValue.matches("(?i)LENGTH\\(.*?\\)")) {
+            // RAW() function, CASE_INSENSITIVE
+            return new Token(Token.TokenType.KEYWORD, tokenValue);
         }
 
         else if (isKeyword(tokenValue)) {
diff --git a/sqlTranslate/src/main/java/Main.java b/sqlTranslate/src/main/java/Main.java
index 1f62f6ff..5952be8f 100644
--- a/sqlTranslate/src/main/java/Main.java
+++ b/sqlTranslate/src/main/java/Main.java
@@ -60,33 +60,40 @@ public class Main {
 //                "        DBMS_OUTPUT.PUT_LINE('Caught an exception: Invalid number');\n" +
 //                "    WHEN OTHERS THEN\n" +
 //                "        DBMS_OUTPUT.PUT_LINE('Caught an exception: ' || SQLERRM);";
-        String sql = "CREATE OR REPLACE PROCEDURE update_salary (\n" +
-                "             employee_id IN NUMBER,\n" +
-                "             new_salary IN OUT NUMBER\n" +
-                "         ) IS\n" +
-                "             v_employee employees%ROWTYPE;\n" +
-                "         BEGIN\n" +
-                "             SELECT * INTO v_employee FROM employees WHERE employee_id = employee_id;\n" +
-                "\n" +
-                "             IF new_salary < 3000 THEN\n" +
-                "                 new_salary := new_salary * 1.1;\n" +
-                "             ELSE\n" +
-                "                 new_salary := new_salary * 1.05;\n" +
-                "             END IF;\n" +
-                "\n" +
-                "             UPDATE employees SET salary = new_salary WHERE employee_id = employee_id;\n" +
-                "             COMMIT;\n" +
-                "\n" +
-                "             DBMS_OUTPUT.PUT_LINE('Updated Salary: ' || new_salary);\n" +
-                "         EXCEPTION\n" +
-                "             WHEN NO_DATA_FOUND THEN\n" +
-                "                 DBMS_OUTPUT.PUT_LINE('Employee not found.');\n" +
-                "             WHEN TOO_MANY_ROWS THEN\n" +
-                "                 DBMS_OUTPUT.PUT_LINE('Multiple employees found.');\n" +
-                "             WHEN OTHERS THEN\n" +
-                "                 DBMS_OUTPUT.PUT_LINE('An error occurred: ' || SQLERRM);\n" +
-                "         END update_salary;\n" +
-                "         /";
+//        String sql = "CREATE OR REPLACE PROCEDURE update_salary (\n" +
+//                "             employee_id IN NUMBER,\n" +
+//                "             new_salary IN OUT NUMBER\n" +
+//                "         ) IS\n" +
+//                "             v_employee employees%ROWTYPE;\n" +
+//                "         BEGIN\n" +
+//                "             SELECT * INTO v_employee FROM employees WHERE employee_id = employee_id;\n" +
+//                "\n" +
+//                "             IF new_salary < 3000 THEN\n" +
+//                "                 new_salary := new_salary * 1.1;\n" +
+//                "             ELSE\n" +
+//                "                 new_salary := new_salary * 1.05;\n" +
+//                "             END IF;\n" +
+//                "\n" +
+//                "             UPDATE employees SET salary = new_salary WHERE employee_id = employee_id;\n" +
+//                "             COMMIT;\n" +
+//                "\n" +
+//                "             DBMS_OUTPUT.PUT_LINE('Updated Salary: ' || new_salary);\n" +
+//                "         EXCEPTION\n" +
+//                "             WHEN NO_DATA_FOUND THEN\n" +
+//                "                 DBMS_OUTPUT.PUT_LINE('Employee not found.');\n" +
+//                "             WHEN TOO_MANY_ROWS THEN\n" +
+//                "                 DBMS_OUTPUT.PUT_LINE('Multiple employees found.');\n" +
+//                "             WHEN OTHERS THEN\n" +
+//                "                 DBMS_OUTPUT.PUT_LINE('An error occurred: ' || SQLERRM);\n" +
+//                "         END update_salary;\n" +
+//                "         /";
+        String sql = "CREATE OR REPLACE FUNCTION string_length (\n" +
+                "    input_string VARCHAR2\n" +
+                ") RETURN NUMBER IS\n" +
+                "BEGIN\n" +
+                "    RETURN LENGTH(input_string);\n" +
+                "END;\n" +
+                "/";
         OracleLexer lexer = new OracleLexer(sql);
         lexer.printTokens();
         OracleParser parser = new OracleParser(lexer);
diff --git a/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterAddColumnNode.java b/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterAddColumnNode.java
index 0eb23739..ccd44a30 100644
--- a/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterAddColumnNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterAddColumnNode.java
@@ -1,13 +1,13 @@
 package Parser.AST.AlterTable;
 
-import Interface.ColumnType;
+import Interface.DataType;
 import Lexer.Token;
 import Parser.AST.ASTNode;
 
 import java.util.ArrayList;
 import java.util.List;
 
-public class AlterAddColumnNode extends ASTNode implements ColumnType {
+public class AlterAddColumnNode extends ASTNode implements DataType {
     private Token name;
     private Token type;
     private List<Token> constraint;
diff --git a/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterModifyColumnNode.java b/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterModifyColumnNode.java
index 495b174d..2ff319ba 100644
--- a/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterModifyColumnNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterModifyColumnNode.java
@@ -1,13 +1,13 @@
 package Parser.AST.AlterTable;
 
-import Interface.ColumnType;
+import Interface.DataType;
 import Lexer.Token;
 import Parser.AST.ASTNode;
 
 import java.util.ArrayList;
 import java.util.List;
 
-public class AlterModifyColumnNode extends ASTNode implements ColumnType {
+public class AlterModifyColumnNode extends ASTNode implements DataType {
     private Token name;
     private Token type;
 
diff --git a/sqlTranslate/src/main/java/Parser/AST/CreateTable/ColumnNode.java b/sqlTranslate/src/main/java/Parser/AST/CreateTable/ColumnNode.java
index bd6a1e34..1bd8ad17 100644
--- a/sqlTranslate/src/main/java/Parser/AST/CreateTable/ColumnNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/CreateTable/ColumnNode.java
@@ -1,13 +1,13 @@
 package Parser.AST.CreateTable;
 
-import Interface.ColumnType;
+import Interface.DataType;
 import Lexer.Token;
 import Parser.AST.ASTNode;
 
 import java.util.ArrayList;
 import java.util.List;
 
-public class ColumnNode extends ASTNode implements ColumnType {
+public class ColumnNode extends ASTNode implements DataType {
     private Token name;
     private Token type;
     private List<Token> constraint;
diff --git a/sqlTranslate/src/main/java/Parser/AST/Function/FunctionColumnNode.java b/sqlTranslate/src/main/java/Parser/AST/Function/FunctionColumnNode.java
index b00eaca4..0cefba2b 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Function/FunctionColumnNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/Function/FunctionColumnNode.java
@@ -1,14 +1,13 @@
 package Parser.AST.Function;
 
-import Interface.ColumnType;
+import Interface.DataType;
 import Lexer.Token;
 import Parser.AST.ASTNode;
-import Parser.AST.Procedure.ProcedureColumnNode;
 
 import java.util.ArrayList;
 import java.util.List;
 
-public class FunctionColumnNode extends ASTNode implements ColumnType {
+public class FunctionColumnNode extends ASTNode implements DataType {
     private Token name;
     private Token type;
     private List<Token> constraint;
@@ -16,6 +15,7 @@ public class FunctionColumnNode extends ASTNode implements ColumnType {
     public FunctionColumnNode() {
         super();
         setTokens(new ArrayList<>());
+        setInOut(new ArrayList<>());
     }
 
     public FunctionColumnNode(ASTNode node) {
diff --git a/sqlTranslate/src/main/java/Parser/AST/Function/FunctionNameNode.java b/sqlTranslate/src/main/java/Parser/AST/Function/FunctionNameNode.java
index e7fd6e63..f5defc46 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Function/FunctionNameNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/Function/FunctionNameNode.java
@@ -22,7 +22,7 @@ public class FunctionNameNode extends ASTNode {
 
     @Override
     public void visit(ASTNode node, StringBuilder queryString) {
-        queryString.append(toString() + " ");
+        queryString.append(toString() + " ( ");
         for (ASTNode child : node.getChildren()) {
             child.visit(child, queryString);
         }
diff --git a/sqlTranslate/src/main/java/Parser/AST/Function/FunctionRetDefNode.java b/sqlTranslate/src/main/java/Parser/AST/Function/FunctionRetDefNode.java
index 6d33b6a0..dd0b294a 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Function/FunctionRetDefNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/Function/FunctionRetDefNode.java
@@ -1,12 +1,14 @@
 package Parser.AST.Function;
 
+import Interface.DataType;
 import Lexer.Token;
 import Parser.AST.ASTNode;
 
 import java.util.ArrayList;
 import java.util.List;
 
-public class FunctionRetDefNode extends ASTNode {
+public class FunctionRetDefNode extends ASTNode implements DataType {
+    private Token type;
     public FunctionRetDefNode() {
         super();
         setTokens(new ArrayList<>());
@@ -22,9 +24,28 @@ public class FunctionRetDefNode extends ASTNode {
 
     @Override
     public void visit(ASTNode node, StringBuilder queryString) {
-        queryString.append(toString() + " ");
+        queryString.append(") " + toString() + " ");
         for (ASTNode child : node.getChildren()) {
             child.visit(child, queryString);
         }
     }
+
+    @Override
+    public Token getType() {
+        return type;
+    }
+
+    @Override
+    public void setType(Token type) {
+        this.type = type;
+    }
+
+    @Override
+    public void ResetTokensbyNameTypeConstraint() {
+        List <Token> tokens = new ArrayList<>();
+        tokens.add(new Token(Token.TokenType.KEYWORD, "RETURN"));
+        tokens.add(type);
+        tokens.add(new Token(Token.TokenType.KEYWORD, "IS"));
+        setTokens(tokens);
+    }
 }
diff --git a/sqlTranslate/src/main/java/Parser/AST/Procedure/ProcedureColumnNode.java b/sqlTranslate/src/main/java/Parser/AST/Procedure/ProcedureColumnNode.java
index e158fe8a..38a1b5aa 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Procedure/ProcedureColumnNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/Procedure/ProcedureColumnNode.java
@@ -1,14 +1,13 @@
 package Parser.AST.Procedure;
 
-import Interface.ColumnType;
+import Interface.DataType;
 import Lexer.Token;
 import Parser.AST.ASTNode;
-import Parser.AST.CreateTable.CRTEndNode;
 
 import java.util.ArrayList;
 import java.util.List;
 
-public class ProcedureColumnNode extends ASTNode implements ColumnType  {
+public class ProcedureColumnNode extends ASTNode implements DataType {
     private Token name;
     private Token type;
     private List<Token> constraint;
diff --git a/sqlTranslate/src/main/java/Parser/OracleParser.java b/sqlTranslate/src/main/java/Parser/OracleParser.java
index 4677e798..c71d21ef 100644
--- a/sqlTranslate/src/main/java/Parser/OracleParser.java
+++ b/sqlTranslate/src/main/java/Parser/OracleParser.java
@@ -19,6 +19,7 @@ import Parser.AST.Drop.DropObjNameNode;
 import Parser.AST.Drop.DropNode;
 import Parser.AST.Drop.DropOptionNode;
 import Parser.AST.Exception.*;
+import Parser.AST.Function.*;
 import Parser.AST.IFELSIF.*;
 import Parser.AST.Insert.InsertDataNode;
 import Parser.AST.Insert.InsertEndNode;
@@ -80,6 +81,12 @@ public class OracleParser {
             )
             {
                 return parseProcedure(lexer.getTokens());
+            } else if (
+                    (lexer.getTokens().get(0).getValue().equalsIgnoreCase("CREATE") && lexer.getTokens().get(1).getValue().equalsIgnoreCase("FUNCTION"))
+                            || (lexer.getTokens().get(0).getValue().equalsIgnoreCase("CREATE") && lexer.getTokens().get(1).getValue().equalsIgnoreCase("OR")  && lexer.getTokens().get(2).getValue().equalsIgnoreCase("REPLACE") && lexer.getTokens().get(3).getValue().equalsIgnoreCase("FUNCTION"))
+            )
+            {
+                return parseFunction(lexer.getTokens());
             }
             else {
                 try {
@@ -1859,7 +1866,8 @@ public class OracleParser {
                 childNode = new ProcedureEndNode();
                 for (int j = index; j < parseTokens.size(); j++) {
                     childNode.addToken(parseTokens.get(j));
-                    if (parseTokens.get(j).hasType(Token.TokenType.EOF)) {
+                    if (parseTokens.get(j).hasType(Token.TokenType.SYMBOL) && parseTokens.get(j).getValue().equals(";")) {
+                        i = j;
                         break;
                     }
                 }
@@ -1872,7 +1880,243 @@ public class OracleParser {
                 ASTNode childNode = new ProcedureEndNode();
                 for (int j = i; j < parseTokens.size(); j++) {
                     childNode.addToken(parseTokens.get(j));
-                    if (parseTokens.get(j).hasType(Token.TokenType.EOF)) {
+                    if (parseTokens.get(j).hasType(Token.TokenType.SYMBOL) && parseTokens.get(j).getValue().equals(";")) {
+                        i = j;
+                        break;
+                    }
+                }
+                currentNode.addChild(childNode);
+                currentNode = childNode;
+                break;
+            }
+            else if (parseTokens.get(i).hasType(Token.TokenType.EOF)) {
+                break;
+            }
+            else {
+                try {
+                    throw new ParseFailedException("Failed to parse:" + parseTokens.get(i));
+                }
+                catch (ParseFailedException e) {
+                    e.printStackTrace();
+                }
+            }
+
+        }
+
+        return root;
+    }
+
+    /**
+     * Create FUNCTION
+     * Grammar: CREATE OR REPLACE FUNCTION function_name (
+     *     parameter1 [IN | OUT] datatype1 ,
+     *     parameter2 [IN | OUT] datatype2 ,
+     *     ...
+     * ) RETURN return_datatype IS
+     * BEGIN
+     *     -- function body
+     *     RETURN result;
+     * END;
+     * /
+     * Example: CREATE OR REPLACE FUNCTION string_length (
+     *          input_string VARCHAR2
+     *          ) RETURN NUMBER IS
+     *          BEGIN
+     *          RETURN LENGTH(input_string);
+     *          END;
+     *          /
+     */
+    private ASTNode parseFunction(List<Token> parseTokens) {
+        ASTNode root = new FunctionNode();
+        ASTNode currentNode = root;
+        for (int i = 0; i < parseTokens.size(); i++) {
+            // CREATE [OR REPLACE] FUNCTION
+            if (root.getTokens().isEmpty()) {
+                for (int j = i; j < parseTokens.size(); j++) {
+                    root.addToken(parseTokens.get(j));
+                    if (parseTokens.get(j).hasType(Token.TokenType.KEYWORD) && parseTokens.get(j).getValue().equalsIgnoreCase("FUNCTION")) {
+                        i = j;
+                        break;
+                    }
+                }
+            }
+            // match function name
+            else if (currentNode == root && parseTokens.get(i).hasType(Token.TokenType.IDENTIFIER)) {
+                ASTNode childNode = new FunctionNameNode();
+                childNode.addToken(parseTokens.get(i));
+                currentNode.addChild(childNode);
+                currentNode = childNode;
+                i++;
+            }
+            // match parameters
+            else if (currentNode instanceof FunctionNameNode && parseTokens.get(i).hasType(Token.TokenType.IDENTIFIER)) {
+                for (int ii = i; ii < parseTokens.size(); ii++) {
+                    if (parseTokens.get(ii).hasType(Token.TokenType.KEYWORD) && parseTokens.get(ii).getValue().equalsIgnoreCase("RETURN")) {
+                        i = ii - 1;
+                        break;
+                    }
+                    List<Token> tokens = new ArrayList<>();
+                    FunctionColumnNode child = new FunctionColumnNode();
+                    child.setName(parseTokens.get(ii));
+                    tokens.add(parseTokens.get(ii));
+                    List<Token> constraint = new ArrayList<>();
+                    boolean typeMatch = false;
+                    int typeIdx = -1;
+                    for (int j = ii + 1; j < parseTokens.size(); j++) {
+                        if (!typeMatch && !(parseTokens.get(j).hasType(Token.TokenType.KEYWORD) && (parseTokens.get(j).getValue().equalsIgnoreCase("IN") || parseTokens.get(j).getValue().equalsIgnoreCase("OUT"))))
+                        {
+                            child.setType(parseTokens.get(j));
+                            typeMatch = true;
+                            typeIdx = j;
+                        }
+                        if (parseTokens.get(j).hasType(Token.TokenType.KEYWORD) && (parseTokens.get(j).getValue().equalsIgnoreCase("IN") || parseTokens.get(j).getValue().equalsIgnoreCase("OUT"))) {
+                            child.addInOut(parseTokens.get(j));
+                        }
+                        // Check () or REFERENCES other_table(other_column)
+                        if (parseTokens.get(j).hasType(Token.TokenType.KEYWORD) &&
+                                (parseTokens.get(j).getValue().equalsIgnoreCase("REFERENCES")
+                                        || parseTokens.get(j).getValue().equalsIgnoreCase("CHECK"))) {
+                            tokens.add(parseTokens.get(j));
+                            if (!(parseTokens.get(j).hasType(Token.TokenType.KEYWORD) && (parseTokens.get(j).getValue().equalsIgnoreCase("IN") || parseTokens.get(j).getValue().equalsIgnoreCase("OUT"))))
+                                constraint.add(parseTokens.get(j));
+                            Stack<String> stack = new Stack<>();
+                            for (int k = j + 1; k < parseTokens.size(); k++) {
+                                tokens.add(parseTokens.get(k));
+                                if (!(parseTokens.get(k).hasType(Token.TokenType.KEYWORD) && (parseTokens.get(k).getValue().equalsIgnoreCase("IN") || parseTokens.get(k).getValue().equalsIgnoreCase("OUT"))))
+                                    constraint.add(parseTokens.get(k));
+                                if (parseTokens.get(k).getValue().equals("(")) {
+                                    stack.push("(");
+                                    for (int t = k + 1; t < parseTokens.size(); t++) {
+                                        tokens.add(parseTokens.get(t));
+                                        if (!(parseTokens.get(t).hasType(Token.TokenType.KEYWORD) && (parseTokens.get(t).getValue().equalsIgnoreCase("IN") || parseTokens.get(t).getValue().equalsIgnoreCase("OUT"))))
+                                            constraint.add(parseTokens.get(t));
+                                        if (parseTokens.get(t).getValue().equals("(")) {
+                                            stack.push("(");
+                                        } else if (parseTokens.get(t).getValue().equals(")")) {
+                                            stack.pop();
+                                            if (stack.empty()) {
+                                                ii = t;
+                                                break;
+                                            }
+                                        }
+                                    }
+                                    break;
+                                }
+                            }
+                            break;
+                        }
+                        if ((parseTokens.get(j).hasType(Token.TokenType.SYMBOL) && parseTokens.get(j).getValue().equals(",")) ||
+                                (parseTokens.get(j).hasType(Token.TokenType.SYMBOL) && parseTokens.get(j).getValue().equals(")"))) {
+                            ii = j;
+                            break;
+                        }
+                        tokens.add(parseTokens.get(j));
+                        if (typeMatch && j != typeIdx) {
+                            if (!(parseTokens.get(j).hasType(Token.TokenType.KEYWORD) && (parseTokens.get(j).getValue().equalsIgnoreCase("IN") || parseTokens.get(j).getValue().equalsIgnoreCase("OUT"))))
+                                constraint.add(parseTokens.get(j));
+                        }
+                    }
+                    child.setTokens(tokens);
+                    child.setConstraint(constraint);
+                    currentNode.addChild(child);
+                    currentNode = child;
+                }
+            }
+            // match return definition
+            else if (currentNode instanceof FunctionColumnNode && parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("RETURN")) {
+                FunctionRetDefNode childNode = new FunctionRetDefNode();
+                for (int j = i; j < parseTokens.size(); j++) {
+                    if (parseTokens.get(j).hasType(Token.TokenType.KEYWORD) && parseTokens.get(j).getValue().equalsIgnoreCase("RETURN")) {
+                        childNode.addToken(parseTokens.get(j));
+                    }
+                    else if (parseTokens.get(j).hasType(Token.TokenType.KEYWORD) && parseTokens.get(j).getValue().equals("IS")) {
+                        childNode.addToken(parseTokens.get(j));
+                        i = j;
+                        break;
+                    }
+                    else {
+                        childNode.addToken(parseTokens.get(j));
+                        childNode.setType(parseTokens.get(j));
+                    }
+                }
+                currentNode.addChild(childNode);
+                currentNode = childNode;
+            }
+            // match function begin
+            else if (currentNode instanceof FunctionRetDefNode && parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("BEGIN")) {
+                ASTNode childNode = new FunctionBeginNode();
+                childNode.addToken(parseTokens.get(i));
+                currentNode.addChild(childNode);
+                currentNode = childNode;
+            }
+            // match function body
+            else if (currentNode instanceof FunctionBeginNode) {
+                for (int ii = i; ii < parseTokens.size(); ii++) {
+                    if (parseTokens.get(ii).hasType(Token.TokenType.KEYWORD) && parseTokens.get(ii).getValue().equalsIgnoreCase("END")) {
+                        i = ii - 1;
+                        break;
+                    }
+                    else if (parseTokens.get(ii).hasType(Token.TokenType.KEYWORD) && parseTokens.get(ii).getValue().equalsIgnoreCase("EXCEPTION")) {
+                        i = ii - 1;
+                        break;
+                    }
+                    else if (parseTokens.get(ii).hasType(Token.TokenType.KEYWORD) && parseTokens.get(ii).getValue().equalsIgnoreCase("IF")) {
+                        int index = -1;
+                        for (int j = ii; j < parseTokens.size(); j++) {
+                            if (parseTokens.get(j).hasType(Token.TokenType.KEYWORD) && parseTokens.get(j).getValue().equalsIgnoreCase("END")
+                                    && j + 1 < parseTokens.size() && parseTokens.get(j + 1).hasType(Token.TokenType.KEYWORD) && parseTokens.get(j + 1).getValue().equalsIgnoreCase("IF")
+                                    && j + 2 < parseTokens.size() && parseTokens.get(j + 2).hasType(Token.TokenType.SYMBOL) && parseTokens.get(j + 2).getValue().equals(";") ) {
+                                index = j + 2;
+                                break;
+                            }
+                        }
+                        if (index == -1) {
+                            try {
+                                throw new ParseFailedException("There exists syntax error and no END if block is found!");
+                            } catch (ParseFailedException e) {
+                                e.printStackTrace();
+                            }
+                        }
+                        else {
+                            ASTNode childNode = parseIFELSE(parseTokens.subList(ii, index + 1));
+                            currentNode.addChild(childNode);
+                            currentNode = childNode.getDeepestChild();
+                            ii = index;
+                        }
+                    }
+                    else if (parseTokens.get(ii).hasType(Token.TokenType.KEYWORD) && parseTokens.get(ii).getValue().equalsIgnoreCase("RETURN")) {
+                        ASTNode childNode = new FunctionReturnNode();
+                        for (int j = ii; j < parseTokens.size(); j++) {
+                            childNode.addToken(parseTokens.get(j));
+                            if (parseTokens.get(j).hasType(Token.TokenType.SYMBOL) && parseTokens.get(j).getValue().equals(";")) {
+                                ii = j;
+                                break;
+                            }
+                        }
+                        currentNode.addChild(childNode);
+                        currentNode = childNode;
+                    }
+                    else {
+                        ASTNode childNode = new FunctionBodyNode();
+                        for (int j = ii; j < parseTokens.size(); j++) {
+                            childNode.addToken(parseTokens.get(j));
+                            if (parseTokens.get(j).hasType(Token.TokenType.SYMBOL) && parseTokens.get(j).getValue().equals(";")) {
+                                ii = j;
+                                break;
+                            }
+                        }
+                        currentNode.addChild(childNode);
+                        currentNode = childNode;
+                    }
+                }
+            }
+            // match function end
+            else if (parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("END")) {
+                ASTNode childNode = new FunctionEndNode();
+                for (int j = i; j < parseTokens.size(); j++) {
+                    childNode.addToken(parseTokens.get(j));
+                    if (parseTokens.get(j).hasType(Token.TokenType.SYMBOL) && parseTokens.get(j).getValue().equals(";")) {
+                        i = j;
                         break;
                     }
                 }
@@ -1897,4 +2141,5 @@ public class OracleParser {
         return root;
     }
 
+
 }
-- 
Gitee


From 106f9e2ada7d61ea19fc99d7ba45ad0b4aac5ba1 Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Tue, 17 Sep 2024 23:58:58 +0800
Subject: [PATCH 088/113] add trigger document

---
 sqlTranslate/.idea/workspace.xml              | 36 +++++++------------
 sqlTranslate/src/main/java/Document/Todolist  |  6 ++--
 .../src/main/java/Document/Trigger in Oracle  | 17 +++++++++
 3 files changed, 33 insertions(+), 26 deletions(-)
 create mode 100644 sqlTranslate/src/main/java/Document/Trigger in Oracle

diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
index 3306e346..f7353ec4 100644
--- a/sqlTranslate/.idea/workspace.xml
+++ b/sqlTranslate/.idea/workspace.xml
@@ -4,20 +4,10 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add ast classes of function">
+    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add function">
+      <change afterPath="$PROJECT_DIR$/src/main/java/Document/Trigger in Oracle" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Generator/OpenGaussGenerator.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Generator/OpenGaussGenerator.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Interface/ColumnType.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Interface/DataType.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Lexer/OracleLexer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Lexer/OracleLexer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Main.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/AlterTable/AlterAddColumnNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/AlterTable/AlterAddColumnNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/AlterTable/AlterModifyColumnNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/AlterTable/AlterModifyColumnNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/CreateTable/ColumnNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/CreateTable/ColumnNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Function/FunctionColumnNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Function/FunctionColumnNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Function/FunctionNameNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Function/FunctionNameNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Function/FunctionRetDefNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Function/FunctionRetDefNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Procedure/ProcedureColumnNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Procedure/ProcedureColumnNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Document/Todolist" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Document/Todolist" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -115,13 +105,6 @@
       <option name="presentableId" value="Default" />
       <updated>1723106789329</updated>
     </task>
-    <task id="LOCAL-00036" summary="revise">
-      <created>1726066806993</created>
-      <option name="number" value="00036" />
-      <option name="presentableId" value="LOCAL-00036" />
-      <option name="project" value="LOCAL" />
-      <updated>1726066806993</updated>
-    </task>
     <task id="LOCAL-00037" summary="add join pattern">
       <created>1726068883795</created>
       <option name="number" value="00037" />
@@ -458,7 +441,14 @@
       <option name="project" value="LOCAL" />
       <updated>1726583392370</updated>
     </task>
-    <option name="localTasksCounter" value="85" />
+    <task id="LOCAL-00085" summary="add function">
+      <created>1726587379509</created>
+      <option name="number" value="00085" />
+      <option name="presentableId" value="LOCAL-00085" />
+      <option name="project" value="LOCAL" />
+      <updated>1726587379509</updated>
+    </task>
+    <option name="localTasksCounter" value="86" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
@@ -473,7 +463,6 @@
     </option>
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="add alter table parser" />
     <MESSAGE value="add alter" />
     <MESSAGE value="fix some bugs" />
     <MESSAGE value="add view document" />
@@ -498,7 +487,8 @@
     <MESSAGE value="add document of rollback, commot, execute" />
     <MESSAGE value="add document of function" />
     <MESSAGE value="add ast classes of function" />
-    <option name="LAST_COMMIT_MESSAGE" value="add ast classes of function" />
+    <MESSAGE value="add function" />
+    <option name="LAST_COMMIT_MESSAGE" value="add function" />
   </component>
   <component name="XDebuggerManager">
     <watches-manager>
diff --git a/sqlTranslate/src/main/java/Document/Todolist b/sqlTranslate/src/main/java/Document/Todolist
index d85fae2e..ec2f584c 100644
--- a/sqlTranslate/src/main/java/Document/Todolist
+++ b/sqlTranslate/src/main/java/Document/Todolist
@@ -13,7 +13,7 @@ Operation
  while... loop... end loop 1
  for ... in () loop end loop 1
  continue、exit 1
- return ***
+ return 1
  exception 1
  commit、rollback、execute 1
  alter table 1
@@ -22,6 +22,6 @@ Operation
 Object
  table 1
  view 1
- function ***
+ function 1
  procedure 1
- trigger ****
\ No newline at end of file
+ trigger 1
\ No newline at end of file
diff --git a/sqlTranslate/src/main/java/Document/Trigger in Oracle b/sqlTranslate/src/main/java/Document/Trigger in Oracle
new file mode 100644
index 00000000..4706ae1d
--- /dev/null
+++ b/sqlTranslate/src/main/java/Document/Trigger in Oracle	
@@ -0,0 +1,17 @@
+CREATE OR REPLACE TRIGGER trigger_name
+BEFORE | AFTER | INSTEAD OF -- OpenGauss does not support INSTEAD OF
+{ INSERT | UPDATE | DELETE }
+ON table_name
+[REFERENCING NEW AS new OLD AS old] -- OpenGauss does not support this
+FOR EACH ROW
+WHEN (condition)
+BEGIN
+    -- trigger body
+END;
+
+Example: CREATE OR REPLACE TRIGGER log_insert
+         BEFORE INSERT ON employees
+         FOR EACH ROW
+         BEGIN
+             INSERT INTO audit_log (action, employee_id) VALUES ('INSERT', :NEW.id);
+         END;
\ No newline at end of file
-- 
Gitee


From fe805b972175120dcbb0408596b0d72d9c709d42 Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Wed, 18 Sep 2024 00:21:54 +0800
Subject: [PATCH 089/113] add trigger ast classes

---
 sqlTranslate/.idea/workspace.xml              | 30 ++++++------
 .../src/main/java/Document/Trigger in Oracle  |  2 +-
 .../Parser/AST/Trigger/TriggerBeginNode.java  | 31 ++++++++++++
 .../Parser/AST/Trigger/TriggerBodyNode.java   | 30 ++++++++++++
 .../AST/Trigger/TriggerConditionNode.java     | 47 +++++++++++++++++++
 .../Parser/AST/Trigger/TriggerEndNode.java    | 30 ++++++++++++
 .../AST/Trigger/TriggerForEachRowNode.java    | 30 ++++++++++++
 .../Parser/AST/Trigger/TriggerNameNode.java   | 30 ++++++++++++
 .../java/Parser/AST/Trigger/TriggerNode.java  | 30 ++++++++++++
 .../Parser/AST/Trigger/TriggerObjNode.java    | 29 ++++++++++++
 .../Parser/AST/Trigger/TriggerOptionNode.java | 30 ++++++++++++
 .../Parser/AST/Trigger/TriggerWhenNode.java   | 30 ++++++++++++
 12 files changed, 334 insertions(+), 15 deletions(-)
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/Trigger/TriggerBeginNode.java
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/Trigger/TriggerBodyNode.java
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/Trigger/TriggerConditionNode.java
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/Trigger/TriggerEndNode.java
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/Trigger/TriggerForEachRowNode.java
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/Trigger/TriggerNameNode.java
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/Trigger/TriggerNode.java
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/Trigger/TriggerObjNode.java
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/Trigger/TriggerOptionNode.java
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/Trigger/TriggerWhenNode.java

diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
index f7353ec4..8bc5a712 100644
--- a/sqlTranslate/.idea/workspace.xml
+++ b/sqlTranslate/.idea/workspace.xml
@@ -4,10 +4,12 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add function">
-      <change afterPath="$PROJECT_DIR$/src/main/java/Document/Trigger in Oracle" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Document/Todolist" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Document/Todolist" afterDir="false" />
+    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add trigger document">
+      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Trigger/TriggerConditionNode.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Trigger/TriggerNameNode.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Trigger/TriggerNode.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Trigger/TriggerObjNode.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Trigger/TriggerOptionNode.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -105,13 +107,6 @@
       <option name="presentableId" value="Default" />
       <updated>1723106789329</updated>
     </task>
-    <task id="LOCAL-00037" summary="add join pattern">
-      <created>1726068883795</created>
-      <option name="number" value="00037" />
-      <option name="presentableId" value="LOCAL-00037" />
-      <option name="project" value="LOCAL" />
-      <updated>1726068883795</updated>
-    </task>
     <task id="LOCAL-00038" summary="add join class">
       <created>1726112198383</created>
       <option name="number" value="00038" />
@@ -448,7 +443,14 @@
       <option name="project" value="LOCAL" />
       <updated>1726587379509</updated>
     </task>
-    <option name="localTasksCounter" value="86" />
+    <task id="LOCAL-00086" summary="add trigger document">
+      <created>1726588739459</created>
+      <option name="number" value="00086" />
+      <option name="presentableId" value="LOCAL-00086" />
+      <option name="project" value="LOCAL" />
+      <updated>1726588739459</updated>
+    </task>
+    <option name="localTasksCounter" value="87" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
@@ -463,7 +465,6 @@
     </option>
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="add alter" />
     <MESSAGE value="fix some bugs" />
     <MESSAGE value="add view document" />
     <MESSAGE value="add keywords of view" />
@@ -488,7 +489,8 @@
     <MESSAGE value="add document of function" />
     <MESSAGE value="add ast classes of function" />
     <MESSAGE value="add function" />
-    <option name="LAST_COMMIT_MESSAGE" value="add function" />
+    <MESSAGE value="add trigger document" />
+    <option name="LAST_COMMIT_MESSAGE" value="add trigger document" />
   </component>
   <component name="XDebuggerManager">
     <watches-manager>
diff --git a/sqlTranslate/src/main/java/Document/Trigger in Oracle b/sqlTranslate/src/main/java/Document/Trigger in Oracle
index 4706ae1d..77056feb 100644
--- a/sqlTranslate/src/main/java/Document/Trigger in Oracle	
+++ b/sqlTranslate/src/main/java/Document/Trigger in Oracle	
@@ -4,7 +4,7 @@ BEFORE | AFTER | INSTEAD OF -- OpenGauss does not support INSTEAD OF
 ON table_name
 [REFERENCING NEW AS new OLD AS old] -- OpenGauss does not support this
 FOR EACH ROW
-WHEN (condition)
+[WHEN (condition)]
 BEGIN
     -- trigger body
 END;
diff --git a/sqlTranslate/src/main/java/Parser/AST/Trigger/TriggerBeginNode.java b/sqlTranslate/src/main/java/Parser/AST/Trigger/TriggerBeginNode.java
new file mode 100644
index 00000000..f07ac78e
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/Trigger/TriggerBeginNode.java
@@ -0,0 +1,31 @@
+package Parser.AST.Trigger;
+
+import Lexer.Token;
+import Parser.AST.ASTNode;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class TriggerBeginNode extends ASTNode {
+    public TriggerBeginNode() {
+        super();
+        setTokens(new ArrayList<>());
+    }
+
+    public TriggerBeginNode(ASTNode node) {
+        super(node);
+    }
+
+    public TriggerBeginNode(List<Token> tokens) {
+        super(tokens);
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString) {
+        queryString.append(toString() + " ");
+        for (ASTNode child : getChildren()) {
+            child.visit(child, queryString);
+        }
+    }
+
+}
diff --git a/sqlTranslate/src/main/java/Parser/AST/Trigger/TriggerBodyNode.java b/sqlTranslate/src/main/java/Parser/AST/Trigger/TriggerBodyNode.java
new file mode 100644
index 00000000..c2b548ab
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/Trigger/TriggerBodyNode.java
@@ -0,0 +1,30 @@
+package Parser.AST.Trigger;
+
+import Lexer.Token;
+import Parser.AST.ASTNode;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class TriggerBodyNode extends ASTNode {
+    public TriggerBodyNode() {
+        super();
+        setTokens(new ArrayList<>());
+    }
+
+    public TriggerBodyNode(ASTNode node) {
+        super(node);
+    }
+
+    public TriggerBodyNode(List<Token> tokens) {
+        super(tokens);
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString) {
+        queryString.append(toString() + " ");
+        for (ASTNode child : getChildren()) {
+            child.visit(child, queryString);
+        }
+    }
+}
diff --git a/sqlTranslate/src/main/java/Parser/AST/Trigger/TriggerConditionNode.java b/sqlTranslate/src/main/java/Parser/AST/Trigger/TriggerConditionNode.java
new file mode 100644
index 00000000..da2ef316
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/Trigger/TriggerConditionNode.java
@@ -0,0 +1,47 @@
+package Parser.AST.Trigger;
+
+import Lexer.Token;
+import Parser.AST.ASTNode;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class TriggerConditionNode extends ASTNode {
+    private Token condition;
+    private Token action;
+    public TriggerConditionNode() {
+        super();
+    }
+
+    public TriggerConditionNode(List<Token> tokens) {
+        super(tokens);
+    }
+
+    public TriggerConditionNode(ASTNode node) {
+        super(node);
+    }
+
+    public void setCondition(Token condition) {
+        this.condition = condition;
+    }
+
+    public void setAction(Token action) {
+        this.action = action;
+    }
+
+    public Token getCondition() {
+        return condition;
+    }
+
+    public Token getAction() {
+        return action;
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString) {
+        queryString.append(getCondition().getValue() + getAction().getValue() + " ");
+        for (ASTNode child : getChildren()) {
+            child.visit(child, queryString);
+        }
+    }
+}
diff --git a/sqlTranslate/src/main/java/Parser/AST/Trigger/TriggerEndNode.java b/sqlTranslate/src/main/java/Parser/AST/Trigger/TriggerEndNode.java
new file mode 100644
index 00000000..bdd6608f
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/Trigger/TriggerEndNode.java
@@ -0,0 +1,30 @@
+package Parser.AST.Trigger;
+
+import Lexer.Token;
+import Parser.AST.ASTNode;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class TriggerEndNode extends ASTNode {
+    public TriggerEndNode() {
+        super();
+        setTokens(new ArrayList<>());
+    }
+
+    public TriggerEndNode(ASTNode node) {
+        super(node);
+    }
+
+    public TriggerEndNode(List<Token> tokens) {
+        super(tokens);
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString) {
+        queryString.append(toString());
+        for (ASTNode child : getChildren()) {
+            child.visit(child, queryString);
+        }
+    }
+}
diff --git a/sqlTranslate/src/main/java/Parser/AST/Trigger/TriggerForEachRowNode.java b/sqlTranslate/src/main/java/Parser/AST/Trigger/TriggerForEachRowNode.java
new file mode 100644
index 00000000..521eeca8
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/Trigger/TriggerForEachRowNode.java
@@ -0,0 +1,30 @@
+package Parser.AST.Trigger;
+
+import Lexer.Token;
+import Parser.AST.ASTNode;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class TriggerForEachRowNode extends ASTNode {
+    public TriggerForEachRowNode() {
+        super();
+        setTokens(new ArrayList<>());
+    }
+
+    public TriggerForEachRowNode(ASTNode node) {
+        super(node);
+    }
+
+    public TriggerForEachRowNode(List<Token> tokens) {
+        super(tokens);
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString) {
+        queryString.append(toString() + " ");
+        for (ASTNode child : getChildren()) {
+            child.visit(child, queryString);
+        }
+    }
+}
diff --git a/sqlTranslate/src/main/java/Parser/AST/Trigger/TriggerNameNode.java b/sqlTranslate/src/main/java/Parser/AST/Trigger/TriggerNameNode.java
new file mode 100644
index 00000000..981ea523
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/Trigger/TriggerNameNode.java
@@ -0,0 +1,30 @@
+package Parser.AST.Trigger;
+
+import Lexer.Token;
+import Parser.AST.ASTNode;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class TriggerNameNode extends ASTNode {
+    public TriggerNameNode() {
+        super();
+        setTokens(new ArrayList<>());
+    }
+
+    public TriggerNameNode(ASTNode node) {
+        super(node);
+    }
+
+    public TriggerNameNode(List<Token> tokens) {
+        super(tokens);
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString) {
+        queryString.append(toString() + " ");
+        for (ASTNode child : getChildren()) {
+            child.visit(child, queryString);
+        }
+    }
+}
diff --git a/sqlTranslate/src/main/java/Parser/AST/Trigger/TriggerNode.java b/sqlTranslate/src/main/java/Parser/AST/Trigger/TriggerNode.java
new file mode 100644
index 00000000..e89e584b
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/Trigger/TriggerNode.java
@@ -0,0 +1,30 @@
+package Parser.AST.Trigger;
+
+import Lexer.Token;
+import Parser.AST.ASTNode;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class TriggerNode extends ASTNode {
+    public TriggerNode() {
+        super();
+        setTokens(new ArrayList<>());
+    }
+
+    public TriggerNode(ASTNode node) {
+        super(node);
+    }
+
+    public TriggerNode(List<Token> tokens) {
+        super(tokens);
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString) {
+        queryString.append(toString() + " ");
+        for (ASTNode child : getChildren()) {
+            child.visit(child, queryString);
+        }
+    }
+}
diff --git a/sqlTranslate/src/main/java/Parser/AST/Trigger/TriggerObjNode.java b/sqlTranslate/src/main/java/Parser/AST/Trigger/TriggerObjNode.java
new file mode 100644
index 00000000..118903a0
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/Trigger/TriggerObjNode.java
@@ -0,0 +1,29 @@
+package Parser.AST.Trigger;
+
+import Lexer.Token;
+import Parser.AST.ASTNode;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class TriggerObjNode extends ASTNode {
+    public TriggerObjNode() {
+        super();
+    }
+
+    public TriggerObjNode(List<Token> tokens) {
+        super(tokens);
+    }
+
+    public TriggerObjNode(ASTNode node) {
+        super(node);
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString) {
+        queryString.append(toString() + " ");
+        for (ASTNode child : getChildren()) {
+            child.visit(child, queryString);
+        }
+    }
+}
diff --git a/sqlTranslate/src/main/java/Parser/AST/Trigger/TriggerOptionNode.java b/sqlTranslate/src/main/java/Parser/AST/Trigger/TriggerOptionNode.java
new file mode 100644
index 00000000..ae4e08a5
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/Trigger/TriggerOptionNode.java
@@ -0,0 +1,30 @@
+package Parser.AST.Trigger;
+
+import Lexer.Token;
+import Parser.AST.ASTNode;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class TriggerOptionNode extends ASTNode {
+    public TriggerOptionNode() {
+        super();
+        setTokens(new ArrayList<>());
+    }
+
+    public TriggerOptionNode(ASTNode node) {
+        super(node);
+    }
+
+    public TriggerOptionNode(List<Token> tokens) {
+        super(tokens);
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString) {
+        queryString.append(toString() + " ");
+        for (ASTNode child : getChildren()) {
+            child.visit(child, queryString);
+        }
+    }
+}
diff --git a/sqlTranslate/src/main/java/Parser/AST/Trigger/TriggerWhenNode.java b/sqlTranslate/src/main/java/Parser/AST/Trigger/TriggerWhenNode.java
new file mode 100644
index 00000000..0f2ff457
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/Trigger/TriggerWhenNode.java
@@ -0,0 +1,30 @@
+package Parser.AST.Trigger;
+
+import Lexer.Token;
+import Parser.AST.ASTNode;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class TriggerWhenNode extends ASTNode {
+    public TriggerWhenNode() {
+        super();
+        setTokens(new ArrayList<>());
+    }
+
+    public TriggerWhenNode(ASTNode node) {
+        super(node);
+    }
+
+    public TriggerWhenNode(List<Token> tokens) {
+        super(tokens);
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString) {
+        queryString.append(toString() + " ");
+        for (ASTNode child : getChildren()) {
+            child.visit(child, queryString);
+        }
+    }
+}
-- 
Gitee


From 8a8b13c7933ed7227342e4d164578a14a7450303 Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Wed, 18 Sep 2024 00:53:17 +0800
Subject: [PATCH 090/113] add trigger

---
 sqlTranslate/.idea/workspace.xml              |  30 ++--
 .../src/main/java/Lexer/OracleLexer.java      |   3 +
 .../src/main/java/Parser/OracleParser.java    | 159 ++++++++++++++++++
 3 files changed, 176 insertions(+), 16 deletions(-)

diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
index 8bc5a712..16747514 100644
--- a/sqlTranslate/.idea/workspace.xml
+++ b/sqlTranslate/.idea/workspace.xml
@@ -4,12 +4,10 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add trigger document">
-      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Trigger/TriggerConditionNode.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Trigger/TriggerNameNode.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Trigger/TriggerNode.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Trigger/TriggerObjNode.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Trigger/TriggerOptionNode.java" afterDir="false" />
+    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add trigger ast classes">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Lexer/OracleLexer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Lexer/OracleLexer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -107,13 +105,6 @@
       <option name="presentableId" value="Default" />
       <updated>1723106789329</updated>
     </task>
-    <task id="LOCAL-00038" summary="add join class">
-      <created>1726112198383</created>
-      <option name="number" value="00038" />
-      <option name="presentableId" value="LOCAL-00038" />
-      <option name="project" value="LOCAL" />
-      <updated>1726112198384</updated>
-    </task>
     <task id="LOCAL-00039" summary="add join">
       <created>1726127728384</created>
       <option name="number" value="00039" />
@@ -450,7 +441,14 @@
       <option name="project" value="LOCAL" />
       <updated>1726588739459</updated>
     </task>
-    <option name="localTasksCounter" value="87" />
+    <task id="LOCAL-00087" summary="add trigger ast classes">
+      <created>1726590115566</created>
+      <option name="number" value="00087" />
+      <option name="presentableId" value="LOCAL-00087" />
+      <option name="project" value="LOCAL" />
+      <updated>1726590115566</updated>
+    </task>
+    <option name="localTasksCounter" value="88" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
@@ -465,7 +463,6 @@
     </option>
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="fix some bugs" />
     <MESSAGE value="add view document" />
     <MESSAGE value="add keywords of view" />
     <MESSAGE value="add ast class of view" />
@@ -490,7 +487,8 @@
     <MESSAGE value="add ast classes of function" />
     <MESSAGE value="add function" />
     <MESSAGE value="add trigger document" />
-    <option name="LAST_COMMIT_MESSAGE" value="add trigger document" />
+    <MESSAGE value="add trigger ast classes" />
+    <option name="LAST_COMMIT_MESSAGE" value="add trigger ast classes" />
   </component>
   <component name="XDebuggerManager">
     <watches-manager>
diff --git a/sqlTranslate/src/main/java/Lexer/OracleLexer.java b/sqlTranslate/src/main/java/Lexer/OracleLexer.java
index 5f0c7794..cbd5d1a0 100644
--- a/sqlTranslate/src/main/java/Lexer/OracleLexer.java
+++ b/sqlTranslate/src/main/java/Lexer/OracleLexer.java
@@ -39,6 +39,8 @@ public class OracleLexer {
             , "PROCEDURE", "IS", "IN", "OUT", "$$", "COMMIT", "ROLLBACK", "EXEC", "EXECUTE"
             // function
             , "FUNCTION", "RETURN"
+            // trigger
+            , "TRIGGER", "BEFORE", "AFTER", "INSTEAD OF", "REFERENCING", "NEW", "OLD", "EACH", "ROW"
     };
     private static final Pattern TOKEN_PATTERN = Pattern.compile(
             "(NUMBER\\(.*?\\))|" +                     // NUMBER() function
@@ -79,6 +81,7 @@ public class OracleLexer {
                     "(FULL JOIN)|" +
                     "(FULL OUTER JOIN)|" +
                     "(CROSS JOIN)|" +
+                    "(INSTEAD OF)|" +
                     "(\\|\\|)|" +
                     "(:=)|" +
                     "(\\.\\.)|" +
diff --git a/sqlTranslate/src/main/java/Parser/OracleParser.java b/sqlTranslate/src/main/java/Parser/OracleParser.java
index c71d21ef..b946b9e3 100644
--- a/sqlTranslate/src/main/java/Parser/OracleParser.java
+++ b/sqlTranslate/src/main/java/Parser/OracleParser.java
@@ -29,6 +29,7 @@ import Parser.AST.Join.*;
 import Parser.AST.Loop.*;
 import Parser.AST.Procedure.*;
 import Parser.AST.Select.*;
+import Parser.AST.Trigger.*;
 import Parser.AST.Update.*;
 import Parser.AST.View.ViewCreateNode;
 import Parser.AST.View.ViewEndNode;
@@ -87,6 +88,12 @@ public class OracleParser {
             )
             {
                 return parseFunction(lexer.getTokens());
+            } else if (
+                    (lexer.getTokens().get(0).getValue().equalsIgnoreCase("CREATE") && lexer.getTokens().get(1).getValue().equalsIgnoreCase("TRIGGER"))
+                            || (lexer.getTokens().get(0).getValue().equalsIgnoreCase("CREATE") && lexer.getTokens().get(1).getValue().equalsIgnoreCase("OR")  && lexer.getTokens().get(2).getValue().equalsIgnoreCase("REPLACE") && lexer.getTokens().get(3).getValue().equalsIgnoreCase("TRIGGER"))
+            )
+            {
+                return parseTrigger(lexer.getTokens());
             }
             else {
                 try {
@@ -2141,5 +2148,157 @@ public class OracleParser {
         return root;
     }
 
+    /**
+     * Create TRIGGER
+     * Grammar: CREATE OR REPLACE TRIGGER trigger_name
+     * BEFORE | AFTER | INSTEAD OF -- OpenGauss does not support INSTEAD OF
+     * { INSERT | UPDATE | DELETE }
+     * ON table_name
+     * [REFERENCING NEW AS new OLD AS old] -- OpenGauss does not support this
+     * FOR EACH ROW
+     * [WHEN (condition)]
+     * BEGIN
+     *     -- trigger body
+     * END;
+     * Example: CREATE OR REPLACE TRIGGER log_insert
+     *          BEFORE INSERT ON employees
+     *          FOR EACH ROW
+     *          BEGIN
+     *              INSERT INTO audit_log (action, employee_id) VALUES ('INSERT', :NEW.id);
+     *          END;
+     */
+    private ASTNode parseTrigger(List<Token> parseTokens) {
+        ASTNode root = new TriggerNode();
+        ASTNode currentNode = root;
+        for (int i = 0; i < parseTokens.size(); i++) {
+            // match create trigger
+            if (root.getTokens().isEmpty()) {
+                for (int j = i; j < parseTokens.size(); j++) {
+                    root.addToken(parseTokens.get(j));
+                    if (parseTokens.get(j).hasType(Token.TokenType.KEYWORD) && parseTokens.get(j).getValue().equalsIgnoreCase("TRIGGER")) {
+                        i = j;
+                        break;
+                    }
+                }
+            }
+            // match trigger name
+            else if (currentNode == root && parseTokens.get(i).hasType(Token.TokenType.IDENTIFIER)) {
+                ASTNode childNode = new TriggerNameNode();
+                childNode.addToken(parseTokens.get(i));
+                currentNode.addChild(childNode);
+                currentNode = childNode;
+            }
+            // match trigger condition
+            else if (currentNode instanceof TriggerNameNode && (
+                    parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("BEFORE") ||
+                            parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("AFTER") ||
+                            parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("INSTEAD OF")
+                    )) {
+                if (i + 1 < parseTokens.size() && (
+                        parseTokens.get(i + 1).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i + 1).getValue().equalsIgnoreCase("INSERT") ||
+                                parseTokens.get(i + 1).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i + 1).getValue().equalsIgnoreCase("UPDATE") ||
+                                parseTokens.get(i + 1).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i + 1).getValue().equalsIgnoreCase("DELETE")
+                        )) {
+                    TriggerConditionNode childNode = new TriggerConditionNode();
+                    childNode.setCondition(parseTokens.get(i));
+                    childNode.setAction(parseTokens.get(i + 1));
+                }
+                else {
+                    try {
+                        throw new ParseFailedException("There exists syntax error!");
+                    } catch (ParseFailedException e) {
+                        e.printStackTrace();
+                    }
+                }
+            }
+            // match trigger on table
+            else if (currentNode instanceof TriggerConditionNode && parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("ON")) {
+                if (i + 1 < parseTokens.size() && parseTokens.get(i + 1).hasType(Token.TokenType.IDENTIFIER)) {
+                    ASTNode childNode = new TriggerObjNode();
+                    childNode.addToken(parseTokens.get(i));
+                    childNode.addToken(parseTokens.get(i + 1));
+                    currentNode.addChild(childNode);
+                    currentNode = childNode;
+                    i++;
+                }
+                else {
+                    try {
+                        throw new ParseFailedException("There exists syntax error!");
+                    } catch (ParseFailedException e) {
+                        e.printStackTrace();
+                    }
+                }
+            }
+            // match [REFERENCING NEW AS new OLD AS old]
+            else if (currentNode instanceof TriggerObjNode && parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("REFERENCING")) {
+                ASTNode childNode = new TriggerOptionNode();
+                for (int j = i; j < parseTokens.size(); j++) {
+                    if (parseTokens.get(j).hasType(Token.TokenType.KEYWORD) && parseTokens.get(j).getValue().equalsIgnoreCase("FOR")) {
+                        i = j - 1;
+                        break;
+                    }
+                    childNode.addToken(parseTokens.get(j));
+                }
+                currentNode.addChild(childNode);
+                currentNode = childNode;
+            }
+            // match FOR EACH ROW
+            else if (parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("FOR")) {
+                if ((i + 1 < parseTokens.size() && parseTokens.get(i + 1).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i + 1).getValue().equalsIgnoreCase("EACH"))
+                    && (i + 2 < parseTokens.size() && parseTokens.get(i + 2).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i + 2).getValue().equalsIgnoreCase("ROW"))) {
+                        ASTNode childNode = new TriggerForEachRowNode();
+                        childNode.addToken(parseTokens.get(i));
+                        childNode.addToken(parseTokens.get(i + 1));
+                        childNode.addToken(parseTokens.get(i + 2));
+                        currentNode.addChild(childNode);
+                        currentNode = childNode;
+                    }
+                else {
+                    try {
+                            throw new ParseFailedException("There exists syntax error!");
+                    } catch (ParseFailedException e) {
+                            e.printStackTrace();
+                    }
+                }
+            }
+            // match when
+            else if (currentNode instanceof TriggerForEachRowNode && parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("WHEN")) {
+                ASTNode childNode = new TriggerWhenNode();
+                for(int j = i; j < parseTokens.size(); j++) {
+                    if (parseTokens.get(j).hasType(Token.TokenType.KEYWORD) && parseTokens.get(j).getValue().equalsIgnoreCase("BEGIN")) {
+                        i = j - 1;
+                        break;
+                    }
+                    childNode.addToken(parseTokens.get(j));
+                }
+                currentNode.addChild(childNode);
+                currentNode = childNode;
+            }
+            // match begin
+            else if (parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("BEGIN")) {
+                ASTNode childNode = new TriggerBeginNode();
+                childNode.addToken(parseTokens.get(i));
+                currentNode.addChild(childNode);
+                currentNode = childNode;
+            }
+            // match trigger body
+            else if (currentNode instanceof TriggerBeginNode) {
+                //TODO: parse trigger body
+            }
+            else if (parseTokens.get(i).hasType(Token.TokenType.EOF)) {
+                break;
+            }
+            else {
+                try {
+                    throw new ParseFailedException("Failed to parse:" + parseTokens.get(i));
+                }
+                catch (ParseFailedException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+
+        return root;
+    }
 
 }
-- 
Gitee


From 810e2d76089f8e45454d816c56a58c43e4e8664a Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Wed, 18 Sep 2024 11:01:52 +0800
Subject: [PATCH 091/113] add trigger

---
 sqlTranslate/.idea/workspace.xml              | 26 +++++------
 .../java/Generator/OpenGaussGenerator.java    | 43 +++++++++++++++++++
 sqlTranslate/src/main/java/Main.java          | 20 ++++++---
 .../AST/Trigger/TriggerConditionNode.java     | 10 ++++-
 .../Parser/AST/Trigger/TriggerObjNode.java    |  1 +
 .../src/main/java/Parser/OracleParser.java    | 34 ++++++++++++++-
 6 files changed, 112 insertions(+), 22 deletions(-)

diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
index 16747514..424a9e5c 100644
--- a/sqlTranslate/.idea/workspace.xml
+++ b/sqlTranslate/.idea/workspace.xml
@@ -4,9 +4,11 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add trigger ast classes">
+    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add trigger">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Lexer/OracleLexer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Lexer/OracleLexer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Generator/OpenGaussGenerator.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Generator/OpenGaussGenerator.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Main.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Trigger/TriggerObjNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Trigger/TriggerObjNode.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -105,13 +107,6 @@
       <option name="presentableId" value="Default" />
       <updated>1723106789329</updated>
     </task>
-    <task id="LOCAL-00039" summary="add join">
-      <created>1726127728384</created>
-      <option name="number" value="00039" />
-      <option name="presentableId" value="LOCAL-00039" />
-      <option name="project" value="LOCAL" />
-      <updated>1726127728384</updated>
-    </task>
     <task id="LOCAL-00040" summary="add join convert rule">
       <created>1726129122571</created>
       <option name="number" value="00040" />
@@ -448,7 +443,14 @@
       <option name="project" value="LOCAL" />
       <updated>1726590115566</updated>
     </task>
-    <option name="localTasksCounter" value="88" />
+    <task id="LOCAL-00088" summary="add trigger">
+      <created>1726591998690</created>
+      <option name="number" value="00088" />
+      <option name="presentableId" value="LOCAL-00088" />
+      <option name="project" value="LOCAL" />
+      <updated>1726591998690</updated>
+    </task>
+    <option name="localTasksCounter" value="89" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
@@ -463,7 +465,6 @@
     </option>
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="add view document" />
     <MESSAGE value="add keywords of view" />
     <MESSAGE value="add ast class of view" />
     <MESSAGE value="add view" />
@@ -488,7 +489,8 @@
     <MESSAGE value="add function" />
     <MESSAGE value="add trigger document" />
     <MESSAGE value="add trigger ast classes" />
-    <option name="LAST_COMMIT_MESSAGE" value="add trigger ast classes" />
+    <MESSAGE value="add trigger" />
+    <option name="LAST_COMMIT_MESSAGE" value="add trigger" />
   </component>
   <component name="XDebuggerManager">
     <watches-manager>
diff --git a/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java b/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java
index 764d557f..1812a3d3 100644
--- a/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java
+++ b/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java
@@ -31,6 +31,7 @@ import Parser.AST.Procedure.ProcedureEndNode;
 import Parser.AST.Procedure.ProcedureNode;
 import Parser.AST.Procedure.ProcedureRetDefNode;
 import Parser.AST.Select.SelectNode;
+import Parser.AST.Trigger.*;
 import Parser.AST.Update.UpdateNode;
 import Parser.AST.View.ViewCreateNode;
 
@@ -89,6 +90,9 @@ public class OpenGaussGenerator {
         else if (node instanceof FunctionNode) {
             return GenFunctionSQL(node);
         }
+        else if (node instanceof TriggerNode) {
+            return GenTriggerSQL(node);
+        }
         else {
             try {
                 throw new GenerateFailedException("Root node:" + node.getClass() + "(Unsupported node type!)");
@@ -170,6 +174,11 @@ public class OpenGaussGenerator {
         return node.toQueryString();
     }
 
+    private String GenTriggerSQL(ASTNode node) {
+        visitTrigger(node);
+        return node.toQueryString();
+    }
+
     private void visitCrt(ASTNode node) {
         if (node instanceof ColumnNode) {
             ColumnTypeConvert((ColumnNode) node);
@@ -302,6 +311,21 @@ public class OpenGaussGenerator {
         }
     }
 
+    private void visitTrigger(ASTNode node) {
+        if (node instanceof TriggerBodyNode) {
+            PLConvert(node);
+        }
+        else if (node instanceof TriggerConditionNode) {
+            PLConvert(node);
+        }
+        else if (node instanceof TriggerOptionNode) {
+            PLConvert(node);
+        }
+        for (ASTNode child : node.getChildren()) {
+            visitTrigger(child);
+        }
+    }
+
     private void PLConvert(ASTNode node) {
         if (node.checkExistsByRegex("(?i)DBMS_OUTPUT.PUT_LINE\\(.*?\\)")) {
             String printObj = "";
@@ -416,6 +440,25 @@ public class OpenGaussGenerator {
             }
             node.setTokens(tokens);
         }
+        if (node instanceof TriggerOptionNode) {
+            try {
+                throw new GenerateFailedException("Unsupported type:" + node.toString() + "(OpenGauss doesn't support the keyword -- " + node.toString() + " or have any expression that keeps the same semantic!)");
+            }
+            catch (GenerateFailedException e) {
+                e.printStackTrace();
+            }
+        }
+        if (node instanceof TriggerConditionNode) {
+            if (((TriggerConditionNode) node).getCondition().hasType(Token.TokenType.KEYWORD) &&
+                    ((TriggerConditionNode) node).getCondition().getValue().equalsIgnoreCase("INSTEAD OF")) {
+                try {
+                    throw new GenerateFailedException("Unsupported type:" + node.toString() + "(OpenGauss doesn't support the keyword -- " + node.toString() + " or have any expression that keeps the same semantic!)");
+                }
+                catch (GenerateFailedException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
     }
 
 
diff --git a/sqlTranslate/src/main/java/Main.java b/sqlTranslate/src/main/java/Main.java
index 5952be8f..fa8a3dfa 100644
--- a/sqlTranslate/src/main/java/Main.java
+++ b/sqlTranslate/src/main/java/Main.java
@@ -87,13 +87,19 @@ public class Main {
 //                "                 DBMS_OUTPUT.PUT_LINE('An error occurred: ' || SQLERRM);\n" +
 //                "         END update_salary;\n" +
 //                "         /";
-        String sql = "CREATE OR REPLACE FUNCTION string_length (\n" +
-                "    input_string VARCHAR2\n" +
-                ") RETURN NUMBER IS\n" +
-                "BEGIN\n" +
-                "    RETURN LENGTH(input_string);\n" +
-                "END;\n" +
-                "/";
+//        String sql = "CREATE OR REPLACE FUNCTION string_length (\n" +
+//                "    input_string VARCHAR2\n" +
+//                ") RETURN NUMBER IS\n" +
+//                "BEGIN\n" +
+//                "    RETURN LENGTH(input_string);\n" +
+//                "END;\n" +
+//                "/";
+        String sql = "CREATE OR REPLACE TRIGGER log_insert\n" +
+                "         BEFORE INSERT ON employees\n" +
+                "         FOR EACH ROW\n" +
+                "         BEGIN\n" +
+                "             INSERT INTO audit_log (action, employee_id) VALUES ('INSERT', :NEW.id);\n" +
+                "         END;";
         OracleLexer lexer = new OracleLexer(sql);
         lexer.printTokens();
         OracleParser parser = new OracleParser(lexer);
diff --git a/sqlTranslate/src/main/java/Parser/AST/Trigger/TriggerConditionNode.java b/sqlTranslate/src/main/java/Parser/AST/Trigger/TriggerConditionNode.java
index da2ef316..4d83c66b 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Trigger/TriggerConditionNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/Trigger/TriggerConditionNode.java
@@ -11,6 +11,7 @@ public class TriggerConditionNode extends ASTNode {
     private Token action;
     public TriggerConditionNode() {
         super();
+        setTokens(new ArrayList<>());
     }
 
     public TriggerConditionNode(List<Token> tokens) {
@@ -39,9 +40,16 @@ public class TriggerConditionNode extends ASTNode {
 
     @Override
     public void visit(ASTNode node, StringBuilder queryString) {
-        queryString.append(getCondition().getValue() + getAction().getValue() + " ");
+        queryString.append(getCondition().getValue() + " " + getAction().getValue() + " ");
         for (ASTNode child : getChildren()) {
             child.visit(child, queryString);
         }
     }
+
+    @Override
+    public String toString() {
+        String str = "";
+        str = getCondition().getValue() + " " + getAction().getValue();
+        return str;
+    }
 }
diff --git a/sqlTranslate/src/main/java/Parser/AST/Trigger/TriggerObjNode.java b/sqlTranslate/src/main/java/Parser/AST/Trigger/TriggerObjNode.java
index 118903a0..fdee8395 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Trigger/TriggerObjNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/Trigger/TriggerObjNode.java
@@ -9,6 +9,7 @@ import java.util.List;
 public class TriggerObjNode extends ASTNode {
     public TriggerObjNode() {
         super();
+        setTokens(new ArrayList<>());
     }
 
     public TriggerObjNode(List<Token> tokens) {
diff --git a/sqlTranslate/src/main/java/Parser/OracleParser.java b/sqlTranslate/src/main/java/Parser/OracleParser.java
index b946b9e3..092d0d65 100644
--- a/sqlTranslate/src/main/java/Parser/OracleParser.java
+++ b/sqlTranslate/src/main/java/Parser/OracleParser.java
@@ -2202,6 +2202,9 @@ public class OracleParser {
                     TriggerConditionNode childNode = new TriggerConditionNode();
                     childNode.setCondition(parseTokens.get(i));
                     childNode.setAction(parseTokens.get(i + 1));
+                    i++;
+                    currentNode.addChild(childNode);
+                    currentNode = childNode;
                 }
                 else {
                     try {
@@ -2252,6 +2255,7 @@ public class OracleParser {
                         childNode.addToken(parseTokens.get(i + 2));
                         currentNode.addChild(childNode);
                         currentNode = childNode;
+                        i += 2;
                     }
                 else {
                     try {
@@ -2282,8 +2286,34 @@ public class OracleParser {
                 currentNode = childNode;
             }
             // match trigger body
-            else if (currentNode instanceof TriggerBeginNode) {
-                //TODO: parse trigger body
+            else if ( ((currentNode instanceof TriggerBeginNode) || (currentNode instanceof TriggerBodyNode)) && !(parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("END"))) {
+                ASTNode childNode = new TriggerBodyNode();
+                for (int j = i; j < parseTokens.size(); j++) {
+                    if (parseTokens.get(j).hasType(Token.TokenType.KEYWORD) && parseTokens.get(j).getValue().equalsIgnoreCase("END")) {
+                        i = j - 1;
+                        break;
+                    }
+                    else if (parseTokens.get(j).hasType(Token.TokenType.SYMBOL) && parseTokens.get(j).getValue().equalsIgnoreCase(";")) {
+                        i = j;
+                        childNode.addToken(parseTokens.get(j));
+                        break;
+                    }
+                    childNode.addToken(parseTokens.get(j));
+                }
+                currentNode.addChild(childNode);
+                currentNode = childNode;
+            }
+            else if (parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("END")) {
+                ASTNode childNode = new TriggerEndNode();
+                for (int j = i; j < parseTokens.size(); j++) {
+                    childNode.addToken(parseTokens.get(j));
+                    if (parseTokens.get(j).hasType(Token.TokenType.SYMBOL) && parseTokens.get(j).getValue().equals(";")) {
+                        i = j;
+                        break;
+                    }
+                }
+                currentNode.addChild(childNode);
+                currentNode = childNode;
             }
             else if (parseTokens.get(i).hasType(Token.TokenType.EOF)) {
                 break;
-- 
Gitee


From 2d58893d577872f74293d8a4c65828aa68d45cae Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Wed, 18 Sep 2024 11:14:10 +0800
Subject: [PATCH 092/113] add PL document

---
 sqlTranslate/.idea/workspace.xml              | 22 ++++++++-----------
 .../src/main/java/Document/PL in Oracle       | 17 ++++++++++++++
 2 files changed, 26 insertions(+), 13 deletions(-)
 create mode 100644 sqlTranslate/src/main/java/Document/PL in Oracle

diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
index 424a9e5c..93b3d6fa 100644
--- a/sqlTranslate/.idea/workspace.xml
+++ b/sqlTranslate/.idea/workspace.xml
@@ -5,11 +5,7 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add trigger">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Generator/OpenGaussGenerator.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Generator/OpenGaussGenerator.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Main.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Trigger/TriggerObjNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Trigger/TriggerObjNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/Document/PL in Oracle" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -107,13 +103,6 @@
       <option name="presentableId" value="Default" />
       <updated>1723106789329</updated>
     </task>
-    <task id="LOCAL-00040" summary="add join convert rule">
-      <created>1726129122571</created>
-      <option name="number" value="00040" />
-      <option name="presentableId" value="LOCAL-00040" />
-      <option name="project" value="LOCAL" />
-      <updated>1726129122571</updated>
-    </task>
     <task id="LOCAL-00041" summary="refractor">
       <created>1726143715098</created>
       <option name="number" value="00041" />
@@ -450,7 +439,14 @@
       <option name="project" value="LOCAL" />
       <updated>1726591998690</updated>
     </task>
-    <option name="localTasksCounter" value="89" />
+    <task id="LOCAL-00089" summary="add trigger">
+      <created>1726628514219</created>
+      <option name="number" value="00089" />
+      <option name="presentableId" value="LOCAL-00089" />
+      <option name="project" value="LOCAL" />
+      <updated>1726628514220</updated>
+    </task>
+    <option name="localTasksCounter" value="90" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
diff --git a/sqlTranslate/src/main/java/Document/PL in Oracle b/sqlTranslate/src/main/java/Document/PL in Oracle
new file mode 100644
index 00000000..a30a64d1
--- /dev/null
+++ b/sqlTranslate/src/main/java/Document/PL in Oracle	
@@ -0,0 +1,17 @@
+DECLARE
+   v_var1 v_type;
+   ...
+BEGIN
+   -- PL/SQL
+END;
+
+Example: DECLARE
+            v_name Varchar2(20);
+            v_salary employees.salary%TYPE;
+         BEGIN
+            SELECT name, salary INTO v_name, v_salary FROM employees WHERE employee_id = 100;
+            DBMS_OUTPUT.PUT_LINE('Name: ' || v_name || ', Salary: ' || v_salary);
+         EXCEPTION
+            WHEN NO_DATA_FOUND THEN
+               DBMS_OUTPUT.PUT_LINE('No data found.');
+         END;
\ No newline at end of file
-- 
Gitee


From 146795c22d8852d840819249de59d5a4dea2e489 Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Wed, 18 Sep 2024 11:23:38 +0800
Subject: [PATCH 093/113] add PL ast classes

---
 sqlTranslate/.idea/workspace.xml              | 29 ++++++++++-------
 .../main/java/Parser/AST/PL/PLBeginNode.java  | 31 +++++++++++++++++++
 .../main/java/Parser/AST/PL/PLBodyNode.java   | 31 +++++++++++++++++++
 .../java/Parser/AST/PL/PLDeclareNode.java     | 31 +++++++++++++++++++
 .../main/java/Parser/AST/PL/PLEndNode.java    | 31 +++++++++++++++++++
 .../src/main/java/Parser/AST/PL/PLNode.java   | 31 +++++++++++++++++++
 6 files changed, 172 insertions(+), 12 deletions(-)
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/PL/PLBeginNode.java
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/PL/PLBodyNode.java
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/PL/PLDeclareNode.java
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/PL/PLEndNode.java
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/PL/PLNode.java

diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
index 93b3d6fa..60b636cf 100644
--- a/sqlTranslate/.idea/workspace.xml
+++ b/sqlTranslate/.idea/workspace.xml
@@ -4,8 +4,13 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add trigger">
-      <change afterPath="$PROJECT_DIR$/src/main/java/Document/PL in Oracle" afterDir="false" />
+    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add PL document">
+      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/PL/PLBeginNode.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/PL/PLBodyNode.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/PL/PLDeclareNode.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/PL/PLEndNode.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/PL/PLNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -103,13 +108,6 @@
       <option name="presentableId" value="Default" />
       <updated>1723106789329</updated>
     </task>
-    <task id="LOCAL-00041" summary="refractor">
-      <created>1726143715098</created>
-      <option name="number" value="00041" />
-      <option name="presentableId" value="LOCAL-00041" />
-      <option name="project" value="LOCAL" />
-      <updated>1726143715098</updated>
-    </task>
     <task id="LOCAL-00042" summary="refractor">
       <created>1726143907403</created>
       <option name="number" value="00042" />
@@ -446,7 +444,14 @@
       <option name="project" value="LOCAL" />
       <updated>1726628514220</updated>
     </task>
-    <option name="localTasksCounter" value="90" />
+    <task id="LOCAL-00090" summary="add PL document">
+      <created>1726629251761</created>
+      <option name="number" value="00090" />
+      <option name="presentableId" value="LOCAL-00090" />
+      <option name="project" value="LOCAL" />
+      <updated>1726629251761</updated>
+    </task>
+    <option name="localTasksCounter" value="91" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
@@ -461,7 +466,6 @@
     </option>
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="add keywords of view" />
     <MESSAGE value="add ast class of view" />
     <MESSAGE value="add view" />
     <MESSAGE value="add view generate method" />
@@ -486,7 +490,8 @@
     <MESSAGE value="add trigger document" />
     <MESSAGE value="add trigger ast classes" />
     <MESSAGE value="add trigger" />
-    <option name="LAST_COMMIT_MESSAGE" value="add trigger" />
+    <MESSAGE value="add PL document" />
+    <option name="LAST_COMMIT_MESSAGE" value="add PL document" />
   </component>
   <component name="XDebuggerManager">
     <watches-manager>
diff --git a/sqlTranslate/src/main/java/Parser/AST/PL/PLBeginNode.java b/sqlTranslate/src/main/java/Parser/AST/PL/PLBeginNode.java
new file mode 100644
index 00000000..2f8fa290
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/PL/PLBeginNode.java
@@ -0,0 +1,31 @@
+package Parser.AST.PL;
+
+import Lexer.Token;
+import Parser.AST.ASTNode;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PLBeginNode extends ASTNode {
+    public PLBeginNode() {
+        super();
+        setTokens(new ArrayList<>());
+    }
+
+    public PLBeginNode(ASTNode node) {
+        super(node);
+    }
+
+    public PLBeginNode(List<Token> tokens) {
+        super(tokens);
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString) {
+        queryString.append(toString() + " ");
+        for (ASTNode child : getChildren())
+        {
+            child.visit(child, queryString);
+        }
+    }
+}
diff --git a/sqlTranslate/src/main/java/Parser/AST/PL/PLBodyNode.java b/sqlTranslate/src/main/java/Parser/AST/PL/PLBodyNode.java
new file mode 100644
index 00000000..4bb781f9
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/PL/PLBodyNode.java
@@ -0,0 +1,31 @@
+package Parser.AST.PL;
+
+import Lexer.Token;
+import Parser.AST.ASTNode;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PLBodyNode extends ASTNode {
+    public PLBodyNode() {
+        super();
+        setTokens(new ArrayList<>());
+    }
+
+    public PLBodyNode(ASTNode node) {
+        super(node);
+    }
+
+    public PLBodyNode(List<Token> tokens) {
+        super(tokens);
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString) {
+        queryString.append(toString() + " ");
+        for (ASTNode child : getChildren())
+        {
+            child.visit(child, queryString);
+        }
+    }
+}
diff --git a/sqlTranslate/src/main/java/Parser/AST/PL/PLDeclareNode.java b/sqlTranslate/src/main/java/Parser/AST/PL/PLDeclareNode.java
new file mode 100644
index 00000000..a44ee44e
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/PL/PLDeclareNode.java
@@ -0,0 +1,31 @@
+package Parser.AST.PL;
+
+import Lexer.Token;
+import Parser.AST.ASTNode;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PLDeclareNode extends ASTNode {
+    public PLDeclareNode() {
+        super();
+        setTokens(new ArrayList<>());
+    }
+
+    public PLDeclareNode(ASTNode node) {
+        super(node);
+    }
+
+    public PLDeclareNode(List<Token> tokens) {
+        super(tokens);
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString) {
+        queryString.append(toString() + " ");
+        for (ASTNode child : getChildren())
+        {
+            child.visit(child, queryString);
+        }
+    }
+}
diff --git a/sqlTranslate/src/main/java/Parser/AST/PL/PLEndNode.java b/sqlTranslate/src/main/java/Parser/AST/PL/PLEndNode.java
new file mode 100644
index 00000000..5d6e3d01
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/PL/PLEndNode.java
@@ -0,0 +1,31 @@
+package Parser.AST.PL;
+
+import Lexer.Token;
+import Parser.AST.ASTNode;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PLEndNode extends ASTNode {
+    public PLEndNode() {
+        super();
+        setTokens(new ArrayList<>());
+    }
+
+    public PLEndNode(ASTNode node) {
+        super(node);
+    }
+
+    public PLEndNode(List<Token> tokens) {
+        super(tokens);
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString) {
+        queryString.append(toString());
+        for (ASTNode child : getChildren())
+        {
+            child.visit(child, queryString);
+        }
+    }
+}
diff --git a/sqlTranslate/src/main/java/Parser/AST/PL/PLNode.java b/sqlTranslate/src/main/java/Parser/AST/PL/PLNode.java
new file mode 100644
index 00000000..fa3d6961
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/PL/PLNode.java
@@ -0,0 +1,31 @@
+package Parser.AST.PL;
+
+import Lexer.Token;
+import Parser.AST.ASTNode;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PLNode extends ASTNode {
+    public PLNode() {
+        super();
+        setTokens(new ArrayList<>());
+    }
+
+    public PLNode(ASTNode node) {
+        super(node);
+    }
+
+    public PLNode(List<Token> tokens) {
+        super(tokens);
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString) {
+        queryString.append(toString() + " ");
+        for (ASTNode child : getChildren())
+        {
+            child.visit(child, queryString);
+        }
+    }
+}
-- 
Gitee


From ac03ad7130887048d8199af993855ec7845b76cf Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Wed, 18 Sep 2024 11:50:49 +0800
Subject: [PATCH 094/113] revise

---
 sqlTranslate/.idea/workspace.xml              | 32 ++++-----
 .../java/Generator/OpenGaussGenerator.java    |  1 +
 sqlTranslate/src/main/java/Main.java          | 66 +++++++++----------
 .../java/Parser/AST/PL/PLDeclareNode.java     | 28 +++++++-
 .../AST/Procedure/ProcedureRetDefNode.java    | 28 +++++++-
 .../src/main/java/Parser/OracleParser.java    | 55 +++++++++++++++-
 6 files changed, 158 insertions(+), 52 deletions(-)

diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
index 60b636cf..b3bd99f0 100644
--- a/sqlTranslate/.idea/workspace.xml
+++ b/sqlTranslate/.idea/workspace.xml
@@ -4,13 +4,13 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add PL document">
-      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/PL/PLBeginNode.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/PL/PLBodyNode.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/PL/PLDeclareNode.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/PL/PLEndNode.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/PL/PLNode.java" afterDir="false" />
+    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add PL ast classes">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Generator/OpenGaussGenerator.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Generator/OpenGaussGenerator.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Main.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/PL/PLDeclareNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/PL/PLDeclareNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Procedure/ProcedureRetDefNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Procedure/ProcedureRetDefNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -108,13 +108,6 @@
       <option name="presentableId" value="Default" />
       <updated>1723106789329</updated>
     </task>
-    <task id="LOCAL-00042" summary="refractor">
-      <created>1726143907403</created>
-      <option name="number" value="00042" />
-      <option name="presentableId" value="LOCAL-00042" />
-      <option name="project" value="LOCAL" />
-      <updated>1726143907403</updated>
-    </task>
     <task id="LOCAL-00043" summary="add select convert rules">
       <created>1726148093221</created>
       <option name="number" value="00043" />
@@ -451,7 +444,14 @@
       <option name="project" value="LOCAL" />
       <updated>1726629251761</updated>
     </task>
-    <option name="localTasksCounter" value="91" />
+    <task id="LOCAL-00091" summary="add PL ast classes">
+      <created>1726629819863</created>
+      <option name="number" value="00091" />
+      <option name="presentableId" value="LOCAL-00091" />
+      <option name="project" value="LOCAL" />
+      <updated>1726629819863</updated>
+    </task>
+    <option name="localTasksCounter" value="92" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
@@ -466,7 +466,6 @@
     </option>
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="add ast class of view" />
     <MESSAGE value="add view" />
     <MESSAGE value="add view generate method" />
     <MESSAGE value="add if elseif else endif document" />
@@ -491,7 +490,8 @@
     <MESSAGE value="add trigger ast classes" />
     <MESSAGE value="add trigger" />
     <MESSAGE value="add PL document" />
-    <option name="LAST_COMMIT_MESSAGE" value="add PL document" />
+    <MESSAGE value="add PL ast classes" />
+    <option name="LAST_COMMIT_MESSAGE" value="add PL ast classes" />
   </component>
   <component name="XDebuggerManager">
     <watches-manager>
diff --git a/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java b/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java
index 1812a3d3..bc8b32cc 100644
--- a/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java
+++ b/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java
@@ -277,6 +277,7 @@ public class OpenGaussGenerator {
 
     private void visitPL(ASTNode node) {
         if (node instanceof ProcedureRetDefNode) {
+            ColumnTypeConvert((ProcedureRetDefNode) node);
             PLConvert(node);
         }
         else if (node instanceof ProcedureColumnNode) {
diff --git a/sqlTranslate/src/main/java/Main.java b/sqlTranslate/src/main/java/Main.java
index fa8a3dfa..61d1bb54 100644
--- a/sqlTranslate/src/main/java/Main.java
+++ b/sqlTranslate/src/main/java/Main.java
@@ -60,33 +60,33 @@ public class Main {
 //                "        DBMS_OUTPUT.PUT_LINE('Caught an exception: Invalid number');\n" +
 //                "    WHEN OTHERS THEN\n" +
 //                "        DBMS_OUTPUT.PUT_LINE('Caught an exception: ' || SQLERRM);";
-//        String sql = "CREATE OR REPLACE PROCEDURE update_salary (\n" +
-//                "             employee_id IN NUMBER,\n" +
-//                "             new_salary IN OUT NUMBER\n" +
-//                "         ) IS\n" +
-//                "             v_employee employees%ROWTYPE;\n" +
-//                "         BEGIN\n" +
-//                "             SELECT * INTO v_employee FROM employees WHERE employee_id = employee_id;\n" +
-//                "\n" +
-//                "             IF new_salary < 3000 THEN\n" +
-//                "                 new_salary := new_salary * 1.1;\n" +
-//                "             ELSE\n" +
-//                "                 new_salary := new_salary * 1.05;\n" +
-//                "             END IF;\n" +
-//                "\n" +
-//                "             UPDATE employees SET salary = new_salary WHERE employee_id = employee_id;\n" +
-//                "             COMMIT;\n" +
-//                "\n" +
-//                "             DBMS_OUTPUT.PUT_LINE('Updated Salary: ' || new_salary);\n" +
-//                "         EXCEPTION\n" +
-//                "             WHEN NO_DATA_FOUND THEN\n" +
-//                "                 DBMS_OUTPUT.PUT_LINE('Employee not found.');\n" +
-//                "             WHEN TOO_MANY_ROWS THEN\n" +
-//                "                 DBMS_OUTPUT.PUT_LINE('Multiple employees found.');\n" +
-//                "             WHEN OTHERS THEN\n" +
-//                "                 DBMS_OUTPUT.PUT_LINE('An error occurred: ' || SQLERRM);\n" +
-//                "         END update_salary;\n" +
-//                "         /";
+        String sql = "CREATE OR REPLACE PROCEDURE update_salary (\n" +
+                "             employee_id IN NUMBER,\n" +
+                "             new_salary IN OUT NUMBER\n" +
+                "         ) IS\n" +
+                "             v_employee NUMBER;\n" +
+                "         BEGIN\n" +
+                "             SELECT * INTO v_employee FROM employees WHERE employee_id = employee_id;\n" +
+                "\n" +
+                "             IF new_salary < 3000 THEN\n" +
+                "                 new_salary := new_salary * 1.1;\n" +
+                "             ELSE\n" +
+                "                 new_salary := new_salary * 1.05;\n" +
+                "             END IF;\n" +
+                "\n" +
+                "             UPDATE employees SET salary = new_salary WHERE employee_id = employee_id;\n" +
+                "             COMMIT;\n" +
+                "\n" +
+                "             DBMS_OUTPUT.PUT_LINE('Updated Salary: ' || new_salary);\n" +
+                "         EXCEPTION\n" +
+                "             WHEN NO_DATA_FOUND THEN\n" +
+                "                 DBMS_OUTPUT.PUT_LINE('Employee not found.');\n" +
+                "             WHEN TOO_MANY_ROWS THEN\n" +
+                "                 DBMS_OUTPUT.PUT_LINE('Multiple employees found.');\n" +
+                "             WHEN OTHERS THEN\n" +
+                "                 DBMS_OUTPUT.PUT_LINE('An error occurred: ' || SQLERRM);\n" +
+                "         END update_salary;\n" +
+                "         /";
 //        String sql = "CREATE OR REPLACE FUNCTION string_length (\n" +
 //                "    input_string VARCHAR2\n" +
 //                ") RETURN NUMBER IS\n" +
@@ -94,12 +94,12 @@ public class Main {
 //                "    RETURN LENGTH(input_string);\n" +
 //                "END;\n" +
 //                "/";
-        String sql = "CREATE OR REPLACE TRIGGER log_insert\n" +
-                "         BEFORE INSERT ON employees\n" +
-                "         FOR EACH ROW\n" +
-                "         BEGIN\n" +
-                "             INSERT INTO audit_log (action, employee_id) VALUES ('INSERT', :NEW.id);\n" +
-                "         END;";
+//        String sql = "CREATE OR REPLACE TRIGGER log_insert\n" +
+//                "         BEFORE INSERT ON employees\n" +
+//                "         FOR EACH ROW\n" +
+//                "         BEGIN\n" +
+//                "             INSERT INTO audit_log (action, employee_id) VALUES ('INSERT', :NEW.id);\n" +
+//                "         END;";
         OracleLexer lexer = new OracleLexer(sql);
         lexer.printTokens();
         OracleParser parser = new OracleParser(lexer);
diff --git a/sqlTranslate/src/main/java/Parser/AST/PL/PLDeclareNode.java b/sqlTranslate/src/main/java/Parser/AST/PL/PLDeclareNode.java
index a44ee44e..ce2999b8 100644
--- a/sqlTranslate/src/main/java/Parser/AST/PL/PLDeclareNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/PL/PLDeclareNode.java
@@ -1,12 +1,14 @@
 package Parser.AST.PL;
 
+import Interface.DataType;
 import Lexer.Token;
 import Parser.AST.ASTNode;
 
 import java.util.ArrayList;
 import java.util.List;
 
-public class PLDeclareNode extends ASTNode {
+public class PLDeclareNode extends ASTNode implements DataType {
+    private Token type;
     public PLDeclareNode() {
         super();
         setTokens(new ArrayList<>());
@@ -28,4 +30,28 @@ public class PLDeclareNode extends ASTNode {
             child.visit(child, queryString);
         }
     }
+
+    @Override
+    public Token getType() {
+        return type;
+    }
+
+    @Override
+    public void setType(Token type) {
+        this.type = type;
+    }
+
+    @Override
+    public void ResetTokensbyNameTypeConstraint() {
+        List <Token> tokens = new ArrayList<>();
+        for (Token token: getTokens()) {
+            if (token.hasType(Token.TokenType.KEYWORD)) {
+                tokens.add(getType());
+            }
+            else {
+                tokens.add(token);
+            }
+        }
+        setTokens(tokens);
+    }
 }
diff --git a/sqlTranslate/src/main/java/Parser/AST/Procedure/ProcedureRetDefNode.java b/sqlTranslate/src/main/java/Parser/AST/Procedure/ProcedureRetDefNode.java
index 3f675221..e6915720 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Procedure/ProcedureRetDefNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/Procedure/ProcedureRetDefNode.java
@@ -2,11 +2,13 @@ package Parser.AST.Procedure;
 
 import Lexer.Token;
 import Parser.AST.ASTNode;
+import Interface.DataType;
 
 import java.util.ArrayList;
 import java.util.List;
 
-public class ProcedureRetDefNode extends ASTNode {
+public class ProcedureRetDefNode extends ASTNode implements DataType {
+    private Token type;
     public ProcedureRetDefNode() {
         super();
         setTokens(new ArrayList<>());
@@ -28,4 +30,28 @@ public class ProcedureRetDefNode extends ASTNode {
             child.visit(child, queryString);
         }
     }
+
+    @Override
+    public Token getType() {
+        return type;
+    }
+
+    @Override
+    public void setType(Token type) {
+        this.type = type;
+    }
+
+    @Override
+    public void ResetTokensbyNameTypeConstraint() {
+        List <Token> tokens = new ArrayList<>();
+        for (Token token: getTokens()) {
+            if (token.hasType(Token.TokenType.KEYWORD) && !token.getValue().equalsIgnoreCase("IS")) {
+                tokens.add(getType());
+            }
+            else {
+                tokens.add(token);
+            }
+        }
+        setTokens(tokens);
+    }
 }
diff --git a/sqlTranslate/src/main/java/Parser/OracleParser.java b/sqlTranslate/src/main/java/Parser/OracleParser.java
index 092d0d65..d35c4e7f 100644
--- a/sqlTranslate/src/main/java/Parser/OracleParser.java
+++ b/sqlTranslate/src/main/java/Parser/OracleParser.java
@@ -27,6 +27,8 @@ import Parser.AST.Insert.InsertNode;
 import Parser.AST.Insert.InsertObjNode;
 import Parser.AST.Join.*;
 import Parser.AST.Loop.*;
+import Parser.AST.PL.PLDeclareNode;
+import Parser.AST.PL.PLNode;
 import Parser.AST.Procedure.*;
 import Parser.AST.Select.*;
 import Parser.AST.Trigger.*;
@@ -94,6 +96,8 @@ public class OracleParser {
             )
             {
                 return parseTrigger(lexer.getTokens());
+            } else if (lexer.getTokens().get(0).getValue().equalsIgnoreCase("DECLARE")) {
+                return parsePL(lexer.getTokens());
             }
             else {
                 try {
@@ -1784,12 +1788,15 @@ public class OracleParser {
             }
             // match procedure return definition
             else if (parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("IS")) {
-                ASTNode childNode = new ProcedureRetDefNode();
+                ProcedureRetDefNode childNode = new ProcedureRetDefNode();
                 for (int j = i; j < parseTokens.size(); j++) {
                     if (parseTokens.get(j).hasType(Token.TokenType.KEYWORD) && parseTokens.get(j).getValue().equalsIgnoreCase("BEGIN")) {
                         i = j - 1;
                         break;
                     }
+                    if (parseTokens.get(j).hasType(Token.TokenType.KEYWORD) && !parseTokens.get(j).getValue().equalsIgnoreCase("IS")) {
+                        childNode.setType(parseTokens.get(j));
+                    }
                     childNode.addToken(parseTokens.get(j));
                 }
                 currentNode.addChild(childNode);
@@ -2331,4 +2338,50 @@ public class OracleParser {
         return root;
     }
 
+    /**
+     * PL/SQL
+     * Grammar: DECLARE
+     *    v_var1 v_type;
+     *    ...
+     * BEGIN
+     *    -- PL/SQL
+     * END;
+     * Example: DECLARE
+     *             v_name Varchar2(20);
+     *             v_salary employees.salary%TYPE;
+     *          BEGIN
+     *             SELECT name, salary INTO v_name, v_salary FROM employees WHERE employee_id = 100;
+     *             DBMS_OUTPUT.PUT_LINE('Name: ' || v_name || ', Salary: ' || v_salary);
+     *          EXCEPTION
+     *             WHEN NO_DATA_FOUND THEN
+     *                DBMS_OUTPUT.PUT_LINE('No data found.');
+     *          END;
+     */
+    private ASTNode parsePL(List<Token> parseTokens) {
+        ASTNode root = new PLNode();
+        root.addToken(parseTokens.get(0));
+        ASTNode currentNode = root;
+        for (int i = 1; i < parseTokens.size(); i++) {
+            // match declare
+            if (currentNode == root) {
+                for (int j = i; j < parseTokens.size(); j++) {
+                    if (parseTokens.get(j).hasType(Token.TokenType.KEYWORD) && parseTokens.get(j).getValue().equalsIgnoreCase("BEGIN")) {
+                        i = j - 1;
+                        break;
+                    }
+                    ASTNode childNode = new PLDeclareNode();
+                    for (int k = j; k < parseTokens.size(); k++) {
+                        if (parseTokens.get(k).hasType(Token.TokenType.SYMBOL) && parseTokens.get(k).getValue().equals(";")) {
+                            j = k;
+                            break;
+                        }
+                    }
+                }
+            }
+        }
+
+
+        return root;
+    }
+
 }
-- 
Gitee


From 15ec96c8224212ffedef157893003efdcd70f9b6 Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Wed, 18 Sep 2024 12:28:21 +0800
Subject: [PATCH 095/113] add pl/sql

---
 sqlTranslate/.idea/workspace.xml              | 25 +++----
 .../java/Generator/OpenGaussGenerator.java    | 68 +++++++++++++++----
 .../src/main/java/Lexer/OracleLexer.java      |  2 +-
 sqlTranslate/src/main/java/Lexer/Token.java   |  2 +-
 sqlTranslate/src/main/java/Main.java          | 61 +++++++++--------
 .../java/Parser/AST/PL/PLDeclareNode.java     |  1 +
 .../src/main/java/Parser/OracleParser.java    | 63 ++++++++++++++++-
 7 files changed, 166 insertions(+), 56 deletions(-)

diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
index b3bd99f0..9514e9b4 100644
--- a/sqlTranslate/.idea/workspace.xml
+++ b/sqlTranslate/.idea/workspace.xml
@@ -4,12 +4,13 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add PL ast classes">
+    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="revise">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/Generator/OpenGaussGenerator.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Generator/OpenGaussGenerator.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Lexer/OracleLexer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Lexer/OracleLexer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Lexer/Token.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Lexer/Token.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Main.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/PL/PLDeclareNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/PL/PLDeclareNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Procedure/ProcedureRetDefNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/Procedure/ProcedureRetDefNode.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -108,13 +109,6 @@
       <option name="presentableId" value="Default" />
       <updated>1723106789329</updated>
     </task>
-    <task id="LOCAL-00043" summary="add select convert rules">
-      <created>1726148093221</created>
-      <option name="number" value="00043" />
-      <option name="presentableId" value="LOCAL-00043" />
-      <option name="project" value="LOCAL" />
-      <updated>1726148093221</updated>
-    </task>
     <task id="LOCAL-00044" summary="add update ast class">
       <created>1726149015586</created>
       <option name="number" value="00044" />
@@ -451,7 +445,14 @@
       <option name="project" value="LOCAL" />
       <updated>1726629819863</updated>
     </task>
-    <option name="localTasksCounter" value="92" />
+    <task id="LOCAL-00092" summary="revise">
+      <created>1726631451338</created>
+      <option name="number" value="00092" />
+      <option name="presentableId" value="LOCAL-00092" />
+      <option name="project" value="LOCAL" />
+      <updated>1726631451338</updated>
+    </task>
+    <option name="localTasksCounter" value="93" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
@@ -477,7 +478,6 @@
     <MESSAGE value="add Loop" />
     <MESSAGE value="add Exception document" />
     <MESSAGE value="add exception classes" />
-    <MESSAGE value="revise" />
     <MESSAGE value="add exception" />
     <MESSAGE value="add document of Procedure" />
     <MESSAGE value="add ast classes of procedure" />
@@ -491,7 +491,8 @@
     <MESSAGE value="add trigger" />
     <MESSAGE value="add PL document" />
     <MESSAGE value="add PL ast classes" />
-    <option name="LAST_COMMIT_MESSAGE" value="add PL ast classes" />
+    <MESSAGE value="revise" />
+    <option name="LAST_COMMIT_MESSAGE" value="revise" />
   </component>
   <component name="XDebuggerManager">
     <watches-manager>
diff --git a/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java b/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java
index bc8b32cc..6faf376e 100644
--- a/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java
+++ b/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java
@@ -26,6 +26,10 @@ import Parser.AST.Loop.ForNode;
 import Parser.AST.Loop.LoopBodyNode;
 import Parser.AST.Loop.LoopNode;
 import Parser.AST.Loop.WhileNode;
+import Parser.AST.PL.PLBodyNode;
+import Parser.AST.PL.PLDeclareNode;
+import Parser.AST.PL.PLEndNode;
+import Parser.AST.PL.PLNode;
 import Parser.AST.Procedure.ProcedureColumnNode;
 import Parser.AST.Procedure.ProcedureEndNode;
 import Parser.AST.Procedure.ProcedureNode;
@@ -93,6 +97,9 @@ public class OpenGaussGenerator {
         else if (node instanceof TriggerNode) {
             return GenTriggerSQL(node);
         }
+        else if (node instanceof PLNode) {
+            return GenPLSQL(node);
+        }
         else {
             try {
                 throw new GenerateFailedException("Root node:" + node.getClass() + "(Unsupported node type!)");
@@ -179,9 +186,14 @@ public class OpenGaussGenerator {
         return node.toQueryString();
     }
 
+    private String GenPLSQL(ASTNode node) {
+        visitPLSQL(node);
+        return node.toQueryString();
+    }
+
     private void visitCrt(ASTNode node) {
         if (node instanceof ColumnNode) {
-            ColumnTypeConvert((ColumnNode) node);
+            DataTypeConvert((ColumnNode) node);
         }
         for (ASTNode child : node.getChildren()) {
             visitCrt(child);
@@ -256,10 +268,10 @@ public class OpenGaussGenerator {
 
     private void visitAlter(ASTNode node) {
         if (node instanceof AlterAddColumnNode) {
-            ColumnTypeConvert((AlterAddColumnNode) node);
+            DataTypeConvert((AlterAddColumnNode) node);
         }
         else if (node instanceof AlterModifyColumnNode) {
-            ColumnTypeConvert((AlterModifyColumnNode) node);
+            DataTypeConvert((AlterModifyColumnNode) node);
         }
         for (ASTNode child : node.getChildren()) {
             visitAlter(child);
@@ -277,11 +289,11 @@ public class OpenGaussGenerator {
 
     private void visitPL(ASTNode node) {
         if (node instanceof ProcedureRetDefNode) {
-            ColumnTypeConvert((ProcedureRetDefNode) node);
+            DataTypeConvert((ProcedureRetDefNode) node);
             PLConvert(node);
         }
         else if (node instanceof ProcedureColumnNode) {
-            ColumnTypeConvert((ProcedureColumnNode) node);
+            DataTypeConvert((ProcedureColumnNode) node);
         }
         else if (node instanceof ProcedureEndNode) {
             PLConvert(node);
@@ -302,7 +314,7 @@ public class OpenGaussGenerator {
             visitException(node);
         }
         else if (node instanceof FunctionColumnNode) {
-            ColumnTypeConvert((FunctionColumnNode) node);
+            DataTypeConvert((FunctionColumnNode) node);
         }
         else if (node instanceof FunctionEndNode) {
             PLConvert(node);
@@ -327,6 +339,24 @@ public class OpenGaussGenerator {
         }
     }
 
+    private void visitPLSQL(ASTNode node) {
+        if (node instanceof PLNode) {
+            PLConvert(node);
+        }
+        else if (node instanceof PLDeclareNode) {
+            DataTypeConvert((PLDeclareNode) node);
+        }
+        else if (node instanceof PLEndNode) {
+            PLConvert(node);
+        }
+        else if (node instanceof PLBodyNode) {
+            PLConvert(node);
+        }
+        for (ASTNode child : node.getChildren()) {
+            visitPLSQL(child);
+        }
+    }
+
     private void PLConvert(ASTNode node) {
         if (node.checkExistsByRegex("(?i)DBMS_OUTPUT.PUT_LINE\\(.*?\\)")) {
             String printObj = "";
@@ -460,17 +490,31 @@ public class OpenGaussGenerator {
                 }
             }
         }
+        if (node instanceof PLNode) {
+            List<Token> tokens = new ArrayList<>();
+            tokens.add(new Token(Token.TokenType.KEYWORD, "DO"));
+            tokens.add(new Token(Token.TokenType.KEYWORD, "$$"));
+            tokens.add(new Token(Token.TokenType.KEYWORD, "DECLARE"));
+            node.setTokens(tokens);
+        }
+        if (node instanceof PLEndNode) {
+            List<Token> tokens = new ArrayList<>();
+            tokens.add(new Token(Token.TokenType.KEYWORD, "END"));
+            tokens.add(new Token(Token.TokenType.KEYWORD, "$$"));
+            tokens.add(new Token(Token.TokenType.SYMBOL, ";"));
+            node.setTokens(tokens);
+        }
     }
 
 
-    private void ColumnTypeConvert(DataType node) {
+    private void DataTypeConvert(DataType node) {
         // type convert
         if (node.getType().getValue().equalsIgnoreCase("NUMBER")) {
             node.setType(new Token(Token.TokenType.KEYWORD, "NUMERIC"));
             node.ResetTokensbyNameTypeConstraint();
         }
         if (node.getType().getValue().matches("(?i)NUMBER\\(.*?\\)")) {
-            node.setType(new Token(Token.TokenType.KEYWORD, node.getType().getValue().replace("NUMBER", "DECIMAL")));
+            node.setType(new Token(Token.TokenType.KEYWORD, node.getType().getValue().toUpperCase().replace("NUMBER", "DECIMAL")));
             node.ResetTokensbyNameTypeConstraint();
         }
 
@@ -479,7 +523,7 @@ public class OpenGaussGenerator {
             node.ResetTokensbyNameTypeConstraint();
         }
         if (node.getType().getValue().matches("(?i)VARCHAR2\\(.*?\\)")) {
-            node.setType(new Token(Token.TokenType.KEYWORD, node.getType().getValue().replace("VARCHAR2", "VARCHAR")));
+            node.setType(new Token(Token.TokenType.KEYWORD, node.getType().getValue().toUpperCase().replace("VARCHAR2", "VARCHAR")));
             node.ResetTokensbyNameTypeConstraint();
         }
 
@@ -488,7 +532,7 @@ public class OpenGaussGenerator {
             node.ResetTokensbyNameTypeConstraint();
         }
         if (node.getType().getValue().matches("(?i)RAW\\(.*?\\)")) {
-            node.setType(new Token(Token.TokenType.KEYWORD, node.getType().getValue().replace("RAW", "BYTEA")));
+            node.setType(new Token(Token.TokenType.KEYWORD, node.getType().getValue().toUpperCase().replace("RAW", "BYTEA")));
             node.ResetTokensbyNameTypeConstraint();
         }
 
@@ -502,7 +546,7 @@ public class OpenGaussGenerator {
             node.ResetTokensbyNameTypeConstraint();
         }
         if (node.getType().getValue().matches("(?i)NCHAR\\(.*?\\)")) {
-            node.setType(new Token(Token.TokenType.KEYWORD, node.getType().getValue().replace("NCHAR", "VARCHAR")));
+            node.setType(new Token(Token.TokenType.KEYWORD, node.getType().getValue().toUpperCase().replace("NCHAR", "VARCHAR")));
             node.ResetTokensbyNameTypeConstraint();
         }
 
@@ -511,7 +555,7 @@ public class OpenGaussGenerator {
             node.ResetTokensbyNameTypeConstraint();
         }
         if (node.getType().getValue().matches("(?i)NVARCHAR2\\(.*?\\)")) {
-            node.setType(new Token(Token.TokenType.KEYWORD, node.getType().getValue().replace("NVARCHAR2", "VARCHAR")));
+            node.setType(new Token(Token.TokenType.KEYWORD, node.getType().getValue().toUpperCase().replace("NVARCHAR2", "VARCHAR")));
             node.ResetTokensbyNameTypeConstraint();
         }
 
diff --git a/sqlTranslate/src/main/java/Lexer/OracleLexer.java b/sqlTranslate/src/main/java/Lexer/OracleLexer.java
index cbd5d1a0..bca45934 100644
--- a/sqlTranslate/src/main/java/Lexer/OracleLexer.java
+++ b/sqlTranslate/src/main/java/Lexer/OracleLexer.java
@@ -30,7 +30,7 @@ public class OracleLexer {
             // keywords of view
             , "REPLACE", "VIEW"
             // PL/SQL
-            , ":=", "IF", "ELSIF", "BEGIN", ".."
+            , ":=", "IF", "ELSIF", "BEGIN", "..", "DECLARE"
             // Loop
             , "LOOP", "EXIT", "WHILE", "FOR", "IN", "CONTINUE"
             // Exception
diff --git a/sqlTranslate/src/main/java/Lexer/Token.java b/sqlTranslate/src/main/java/Lexer/Token.java
index 58d1634f..17861610 100644
--- a/sqlTranslate/src/main/java/Lexer/Token.java
+++ b/sqlTranslate/src/main/java/Lexer/Token.java
@@ -4,7 +4,7 @@ import java.util.Objects;
 
 public class Token {
     public enum TokenType {
-        KEYWORD, IDENTIFIER, NUMBER, OPERATOR, STRING, SYMBOL, EOF
+        KEYWORD, IDENTIFIER, NUMBER, OPERATOR, STRING, SYMBOL, NULL, EOF
     }
 
     private TokenType type;
diff --git a/sqlTranslate/src/main/java/Main.java b/sqlTranslate/src/main/java/Main.java
index 61d1bb54..7adb77db 100644
--- a/sqlTranslate/src/main/java/Main.java
+++ b/sqlTranslate/src/main/java/Main.java
@@ -60,33 +60,33 @@ public class Main {
 //                "        DBMS_OUTPUT.PUT_LINE('Caught an exception: Invalid number');\n" +
 //                "    WHEN OTHERS THEN\n" +
 //                "        DBMS_OUTPUT.PUT_LINE('Caught an exception: ' || SQLERRM);";
-        String sql = "CREATE OR REPLACE PROCEDURE update_salary (\n" +
-                "             employee_id IN NUMBER,\n" +
-                "             new_salary IN OUT NUMBER\n" +
-                "         ) IS\n" +
-                "             v_employee NUMBER;\n" +
-                "         BEGIN\n" +
-                "             SELECT * INTO v_employee FROM employees WHERE employee_id = employee_id;\n" +
-                "\n" +
-                "             IF new_salary < 3000 THEN\n" +
-                "                 new_salary := new_salary * 1.1;\n" +
-                "             ELSE\n" +
-                "                 new_salary := new_salary * 1.05;\n" +
-                "             END IF;\n" +
-                "\n" +
-                "             UPDATE employees SET salary = new_salary WHERE employee_id = employee_id;\n" +
-                "             COMMIT;\n" +
-                "\n" +
-                "             DBMS_OUTPUT.PUT_LINE('Updated Salary: ' || new_salary);\n" +
-                "         EXCEPTION\n" +
-                "             WHEN NO_DATA_FOUND THEN\n" +
-                "                 DBMS_OUTPUT.PUT_LINE('Employee not found.');\n" +
-                "             WHEN TOO_MANY_ROWS THEN\n" +
-                "                 DBMS_OUTPUT.PUT_LINE('Multiple employees found.');\n" +
-                "             WHEN OTHERS THEN\n" +
-                "                 DBMS_OUTPUT.PUT_LINE('An error occurred: ' || SQLERRM);\n" +
-                "         END update_salary;\n" +
-                "         /";
+//        String sql = "CREATE OR REPLACE PROCEDURE update_salary (\n" +
+//                "             employee_id IN NUMBER,\n" +
+//                "             new_salary IN OUT NUMBER\n" +
+//                "         ) IS\n" +
+//                "             v_employee NUMBER;\n" +
+//                "         BEGIN\n" +
+//                "             SELECT * INTO v_employee FROM employees WHERE employee_id = employee_id;\n" +
+//                "\n" +
+//                "             IF new_salary < 3000 THEN\n" +
+//                "                 new_salary := new_salary * 1.1;\n" +
+//                "             ELSE\n" +
+//                "                 new_salary := new_salary * 1.05;\n" +
+//                "             END IF;\n" +
+//                "\n" +
+//                "             UPDATE employees SET salary = new_salary WHERE employee_id = employee_id;\n" +
+//                "             COMMIT;\n" +
+//                "\n" +
+//                "             DBMS_OUTPUT.PUT_LINE('Updated Salary: ' || new_salary);\n" +
+//                "         EXCEPTION\n" +
+//                "             WHEN NO_DATA_FOUND THEN\n" +
+//                "                 DBMS_OUTPUT.PUT_LINE('Employee not found.');\n" +
+//                "             WHEN TOO_MANY_ROWS THEN\n" +
+//                "                 DBMS_OUTPUT.PUT_LINE('Multiple employees found.');\n" +
+//                "             WHEN OTHERS THEN\n" +
+//                "                 DBMS_OUTPUT.PUT_LINE('An error occurred: ' || SQLERRM);\n" +
+//                "         END update_salary;\n" +
+//                "         /";
 //        String sql = "CREATE OR REPLACE FUNCTION string_length (\n" +
 //                "    input_string VARCHAR2\n" +
 //                ") RETURN NUMBER IS\n" +
@@ -100,6 +100,13 @@ public class Main {
 //                "         BEGIN\n" +
 //                "             INSERT INTO audit_log (action, employee_id) VALUES ('INSERT', :NEW.id);\n" +
 //                "         END;";
+        String sql = "DECLARE\n" +
+                "            v_name Varchar2(20);\n" +
+                "            v_salary employees.salary%TYPE;\n" +
+                "         BEGIN\n" +
+                "            SELECT name, salary INTO v_name, v_salary FROM employees WHERE employee_id = 100;\n" +
+                "            DBMS_OUTPUT.PUT_LINE('Name: ' || v_name || ', Salary: ' || v_salary);\n" +
+                "         END;";
         OracleLexer lexer = new OracleLexer(sql);
         lexer.printTokens();
         OracleParser parser = new OracleParser(lexer);
diff --git a/sqlTranslate/src/main/java/Parser/AST/PL/PLDeclareNode.java b/sqlTranslate/src/main/java/Parser/AST/PL/PLDeclareNode.java
index ce2999b8..bd137b0f 100644
--- a/sqlTranslate/src/main/java/Parser/AST/PL/PLDeclareNode.java
+++ b/sqlTranslate/src/main/java/Parser/AST/PL/PLDeclareNode.java
@@ -12,6 +12,7 @@ public class PLDeclareNode extends ASTNode implements DataType {
     public PLDeclareNode() {
         super();
         setTokens(new ArrayList<>());
+        setType(new Token(Token.TokenType.NULL, ""));
     }
 
     public PLDeclareNode(ASTNode node) {
diff --git a/sqlTranslate/src/main/java/Parser/OracleParser.java b/sqlTranslate/src/main/java/Parser/OracleParser.java
index d35c4e7f..fefbfce7 100644
--- a/sqlTranslate/src/main/java/Parser/OracleParser.java
+++ b/sqlTranslate/src/main/java/Parser/OracleParser.java
@@ -27,8 +27,7 @@ import Parser.AST.Insert.InsertNode;
 import Parser.AST.Insert.InsertObjNode;
 import Parser.AST.Join.*;
 import Parser.AST.Loop.*;
-import Parser.AST.PL.PLDeclareNode;
-import Parser.AST.PL.PLNode;
+import Parser.AST.PL.*;
 import Parser.AST.Procedure.*;
 import Parser.AST.Select.*;
 import Parser.AST.Trigger.*;
@@ -2369,13 +2368,71 @@ public class OracleParser {
                         i = j - 1;
                         break;
                     }
-                    ASTNode childNode = new PLDeclareNode();
+                    PLDeclareNode childNode = new PLDeclareNode();
                     for (int k = j; k < parseTokens.size(); k++) {
+                        childNode.addToken(parseTokens.get(k));
+                        if (parseTokens.get(k).hasType(Token.TokenType.KEYWORD)) {
+                            childNode.setType(parseTokens.get(k));
+                        }
                         if (parseTokens.get(k).hasType(Token.TokenType.SYMBOL) && parseTokens.get(k).getValue().equals(";")) {
                             j = k;
                             break;
                         }
                     }
+                    currentNode.addChild(childNode);
+                    currentNode = childNode;
+                }
+            }
+            // match begin
+            else if (parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("BEGIN")) {
+                ASTNode childNode = new PLBeginNode();
+                childNode.addToken(parseTokens.get(i));
+                currentNode.addChild(childNode);
+                currentNode = childNode;
+            }
+            // match body
+            else if (
+                    (currentNode instanceof PLBeginNode || currentNode instanceof PLBodyNode) &&
+                    !(parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("END"))
+            ) {
+                ASTNode childNode = new PLBodyNode();
+                for (int j = i; j < parseTokens.size(); j++) {
+                    if (parseTokens.get(j).hasType(Token.TokenType.KEYWORD) && parseTokens.get(j).getValue().equalsIgnoreCase("END")) {
+                        i = j - 1;
+                        break;
+                    }
+                    else if (parseTokens.get(j).hasType(Token.TokenType.SYMBOL) && parseTokens.get(j).getValue().equals(";")) {
+                        i = j;
+                        childNode.addToken(parseTokens.get(j));
+                        break;
+                    }
+                    childNode.addToken(parseTokens.get(j));
+                }
+                currentNode.addChild(childNode);
+                currentNode = childNode;
+            }
+            // match end
+            else if (parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("END")) {
+                ASTNode childNode = new PLEndNode();
+                for (int j = i; j < parseTokens.size(); j++) {
+                    childNode.addToken(parseTokens.get(j));
+                    if (parseTokens.get(j).hasType(Token.TokenType.SYMBOL) && parseTokens.get(j).getValue().equals(";")) {
+                        i = j;
+                        break;
+                    }
+                }
+                currentNode.addChild(childNode);
+                currentNode = childNode;
+            }
+            else if (parseTokens.get(i).hasType(Token.TokenType.EOF)) {
+                break;
+            }
+            else {
+                try {
+                    throw new ParseFailedException("Failed to parse:" + parseTokens.get(i));
+                }
+                catch (ParseFailedException e) {
+                    e.printStackTrace();
                 }
             }
         }
-- 
Gitee


From 6dfaf16ff2c1ae5e46042323b8b2eda52a995fde Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Thu, 19 Sep 2024 14:17:06 +0800
Subject: [PATCH 096/113] revise

---
 sqlTranslate/.idea/workspace.xml              | 155 ++++++++++++++++--
 sqlTranslate/src/main/java/Main.java          |  81 +++++----
 .../Alter table in Oracle                     |   0
 .../Commit,rollback,execute in Oracle         |   0
 .../CreateTable in Oracle                     |   0
 .../{Document => document}/DataType in Oracle |   0
 .../Delete statement in Oracle                |   0
 .../DropTable in Oracle                       |   0
 .../Exception in Oracle                       |   0
 .../{Document => document}/Function in Oracle |   0
 .../IF ELSEIF ELSE in Oracle                  |   0
 .../Insert statement in Oracle                |   0
 .../java/{Document => document}/Loop in PLSQL |   0
 .../java/{Document => document}/PL in Oracle  |   0
 .../Procedure in Oracle                       |   2 +-
 .../Select statement in Oracle                |   0
 .../main/java/{Document => document}/Todolist |   0
 .../{Document => document}/Trigger in Oracle  |   0
 .../Update statement in Oracle                |   0
 .../{Document => document}/View in Oracle     |   0
 .../GenerateFailedException.java              |   2 +-
 .../ParseFailedException.java                 |   2 +-
 .../OpenGaussGenerator.java                   |  80 ++++-----
 .../{Interface => interfaces}/DataType.java   |   4 +-
 .../java/{Lexer => lexer}/OracleLexer.java    |   3 +-
 .../src/main/java/{Lexer => lexer}/Token.java |   2 +-
 .../java/{Parser => parser}/OracleParser.java |  74 ++++-----
 .../{Parser/AST => parser/ast}/ASTNode.java   |   4 +-
 .../ast/alterTable}/AlterAddColumnNode.java   |   8 +-
 .../alterTable}/AlterAddConstraintNode.java   |   6 +-
 .../ast/alterTable}/AlterDropColumnNode.java  |   6 +-
 .../alterTable}/AlterDropConstraintNode.java  |   6 +-
 .../ast/alterTable}/AlterEndNode.java         |   6 +-
 .../alterTable}/AlterModifyColumnNode.java    |   8 +-
 .../ast/alterTable}/AlterNode.java            |   6 +-
 .../ast/alterTable}/AlterObjNode.java         |   6 +-
 .../alterTable}/AlterRenameColumnNode.java    |   6 +-
 .../ast/alterTable}/AlterRenameTableNode.java |   6 +-
 .../ast/caseWhen}/CaseConditionNode.java      |   6 +-
 .../ast/caseWhen}/CaseElseNode.java           |   6 +-
 .../ast/caseWhen}/CaseEndNode.java            |   6 +-
 .../ast/caseWhen}/CaseThenNode.java           |   6 +-
 .../ast/createTable}/CRTEndNode.java          |   6 +-
 .../ast/createTable}/ColumnNode.java          |   8 +-
 .../ast/createTable}/CreateTabNode.java       |   6 +-
 .../ast/createTable}/TableConstraintNode.java |   6 +-
 .../ast/createTable}/TableNode.java           |   6 +-
 .../ast/createTable}/TableTypeNode.java       |   6 +-
 .../ast/delete}/DeleteConditionNode.java      |   6 +-
 .../ast/delete}/DeleteEndNode.java            |   6 +-
 .../ast/delete}/DeleteNode.java               |   6 +-
 .../ast/delete}/DeleteObjNode.java            |   6 +-
 .../Drop => parser/ast/drop}/DropEndNode.java |   6 +-
 .../Drop => parser/ast/drop}/DropNode.java    |   6 +-
 .../ast/drop}/DropObjNameNode.java            |   6 +-
 .../ast/drop}/DropOptionNode.java             |   6 +-
 .../ast/exception}/CustomExceptionNode.java   |   6 +-
 .../ast/exception}/ExceptionActionNode.java   |   6 +-
 .../ast/exception}/ExceptionEndNode.java      |   6 +-
 .../ast/exception}/ExceptionNode.java         |   6 +-
 .../ast/exception}/Invalid_numberNode.java    |   6 +-
 .../ast/exception}/OtherExceptionNode.java    |   6 +-
 .../ast/exception}/Zero_divideNode.java       |   6 +-
 .../ast/function}/FunctionBeginNode.java      |   6 +-
 .../ast/function}/FunctionBodyNode.java       |   6 +-
 .../ast/function}/FunctionColumnNode.java     |   8 +-
 .../ast/function}/FunctionEndNode.java        |   6 +-
 .../ast/function}/FunctionNameNode.java       |   6 +-
 .../ast/function}/FunctionNode.java           |   6 +-
 .../ast/function}/FunctionRetDefNode.java     |   8 +-
 .../ast/function}/FunctionReturnNode.java     |   6 +-
 .../ast/iFELSIF}/ELSENode.java                |   6 +-
 .../ast/iFELSIF}/ELSIFActionNode.java         |   6 +-
 .../ast/iFELSIF}/ELSIFConditionNode.java      |   6 +-
 .../ast/iFELSIF}/EndIFNode.java               |   6 +-
 .../ast/iFELSIF}/IFActionNode.java            |   6 +-
 .../ast/iFELSIF}/IFConditionNode.java         |   6 +-
 .../ast/insert}/InsertDataNode.java           |   6 +-
 .../ast/insert}/InsertEndNode.java            |   6 +-
 .../ast/insert}/InsertNode.java               |   6 +-
 .../ast/insert}/InsertObjNode.java            |   6 +-
 .../ast/join}/JoinConditionNode.java          |   6 +-
 .../Join => parser/ast/join}/JoinEndNode.java |   6 +-
 .../ast/join}/JoinSourceTabNode.java          |   6 +-
 .../ast/join}/JoinTargetTabNode.java          |   6 +-
 .../ast/join}/JoinTypeNode.java               |   6 +-
 .../AST/Loop => parser/ast/loop}/ForNode.java |   6 +-
 .../ast/loop}/LoopBodyNode.java               |   6 +-
 .../Loop => parser/ast/loop}/LoopEndNode.java |   6 +-
 .../ast/loop}/LoopExitNode.java               |   6 +-
 .../Loop => parser/ast/loop}/LoopNode.java    |   6 +-
 .../Loop => parser/ast/loop}/WhileNode.java   |   6 +-
 .../AST/PL => parser/ast/pl}/PLBeginNode.java |   6 +-
 .../AST/PL => parser/ast/pl}/PLBodyNode.java  |   6 +-
 .../PL => parser/ast/pl}/PLDeclareNode.java   |   8 +-
 .../AST/PL => parser/ast/pl}/PLEndNode.java   |   6 +-
 .../AST/PL => parser/ast/pl}/PLNode.java      |   6 +-
 .../ast/procedure}/ProcedureBeginNode.java    |   6 +-
 .../ast/procedure}/ProcedureColumnNode.java   |   8 +-
 .../ast/procedure}/ProcedureEndNode.java      |   6 +-
 .../ast/procedure}/ProcedureNode.java         |   6 +-
 .../ast/procedure}/ProcedureObjNode.java      |   6 +-
 .../procedure}/ProcedurePLStatementNode.java  |   6 +-
 .../ast/procedure}/ProcedureRetDefNode.java   |   8 +-
 .../ast/select}/SelectContentNode.java        |   6 +-
 .../ast/select}/SelectEndNode.java            |   6 +-
 .../ast/select}/SelectNode.java               |   6 +-
 .../ast/select}/SelectObjNode.java            |   6 +-
 .../ast/select}/SelectOptionNode.java         |   6 +-
 .../ast/select}/SelectUnionNode.java          |   6 +-
 .../ast/select}/SelectWhereClauseNode.java    |   6 +-
 .../ast/trigger}/TriggerBeginNode.java        |   6 +-
 .../ast/trigger}/TriggerBodyNode.java         |   6 +-
 .../ast/trigger}/TriggerConditionNode.java    |   6 +-
 .../ast/trigger}/TriggerEndNode.java          |   6 +-
 .../ast/trigger}/TriggerForEachRowNode.java   |   6 +-
 .../ast/trigger}/TriggerNameNode.java         |   6 +-
 .../ast/trigger}/TriggerNode.java             |   6 +-
 .../ast/trigger}/TriggerObjNode.java          |   6 +-
 .../ast/trigger}/TriggerOptionNode.java       |   6 +-
 .../ast/trigger}/TriggerWhenNode.java         |   6 +-
 .../ast/update}/UpdateEndNode.java            |   6 +-
 .../ast/update}/UpdateNode.java               |   6 +-
 .../ast/update}/UpdateObjNode.java            |   6 +-
 .../ast/update}/UpdateSetNode.java            |   6 +-
 .../ast/update}/UpdateWhereNode.java          |   6 +-
 .../ast/view}/ViewCreateNode.java             |   6 +-
 .../View => parser/ast/view}/ViewEndNode.java |   6 +-
 .../ast/view}/ViewNameNode.java               |   6 +-
 .../ast/view}/ViewTargetNode.java             |   6 +-
 130 files changed, 577 insertions(+), 460 deletions(-)
 rename sqlTranslate/src/main/java/{Document => document}/Alter table in Oracle (100%)
 rename sqlTranslate/src/main/java/{Document => document}/Commit,rollback,execute in Oracle (100%)
 rename sqlTranslate/src/main/java/{Document => document}/CreateTable in Oracle (100%)
 rename sqlTranslate/src/main/java/{Document => document}/DataType in Oracle (100%)
 rename sqlTranslate/src/main/java/{Document => document}/Delete statement in Oracle (100%)
 rename sqlTranslate/src/main/java/{Document => document}/DropTable in Oracle (100%)
 rename sqlTranslate/src/main/java/{Document => document}/Exception in Oracle (100%)
 rename sqlTranslate/src/main/java/{Document => document}/Function in Oracle (100%)
 rename sqlTranslate/src/main/java/{Document => document}/IF ELSEIF ELSE in Oracle (100%)
 rename sqlTranslate/src/main/java/{Document => document}/Insert statement in Oracle (100%)
 rename sqlTranslate/src/main/java/{Document => document}/Loop in PLSQL (100%)
 rename sqlTranslate/src/main/java/{Document => document}/PL in Oracle (100%)
 rename sqlTranslate/src/main/java/{Document => document}/Procedure in Oracle (97%)
 rename sqlTranslate/src/main/java/{Document => document}/Select statement in Oracle (100%)
 rename sqlTranslate/src/main/java/{Document => document}/Todolist (100%)
 rename sqlTranslate/src/main/java/{Document => document}/Trigger in Oracle (100%)
 rename sqlTranslate/src/main/java/{Document => document}/Update statement in Oracle (100%)
 rename sqlTranslate/src/main/java/{Document => document}/View in Oracle (100%)
 rename sqlTranslate/src/main/java/{Exception => exception}/GenerateFailedException.java (88%)
 rename sqlTranslate/src/main/java/{Exception => exception}/ParseFailedException.java (88%)
 rename sqlTranslate/src/main/java/{Generator => generator}/OpenGaussGenerator.java (93%)
 rename sqlTranslate/src/main/java/{Interface => interfaces}/DataType.java (76%)
 rename sqlTranslate/src/main/java/{Lexer => lexer}/OracleLexer.java (99%)
 rename sqlTranslate/src/main/java/{Lexer => lexer}/Token.java (98%)
 rename sqlTranslate/src/main/java/{Parser => parser}/OracleParser.java (98%)
 rename sqlTranslate/src/main/java/{Parser/AST => parser/ast}/ASTNode.java (99%)
 rename sqlTranslate/src/main/java/{Parser/AST/AlterTable => parser/ast/alterTable}/AlterAddColumnNode.java (93%)
 rename sqlTranslate/src/main/java/{Parser/AST/AlterTable => parser/ast/alterTable}/AlterAddConstraintNode.java (85%)
 rename sqlTranslate/src/main/java/{Parser/AST/AlterTable => parser/ast/alterTable}/AlterDropColumnNode.java (85%)
 rename sqlTranslate/src/main/java/{Parser/AST/AlterTable => parser/ast/alterTable}/AlterDropConstraintNode.java (86%)
 rename sqlTranslate/src/main/java/{Parser/AST/AlterTable => parser/ast/alterTable}/AlterEndNode.java (85%)
 rename sqlTranslate/src/main/java/{Parser/AST/AlterTable => parser/ast/alterTable}/AlterModifyColumnNode.java (91%)
 rename sqlTranslate/src/main/java/{Parser/AST/AlterTable => parser/ast/alterTable}/AlterNode.java (84%)
 rename sqlTranslate/src/main/java/{Parser/AST/AlterTable => parser/ast/alterTable}/AlterObjNode.java (85%)
 rename sqlTranslate/src/main/java/{Parser/AST/AlterTable => parser/ast/alterTable}/AlterRenameColumnNode.java (85%)
 rename sqlTranslate/src/main/java/{Parser/AST/AlterTable => parser/ast/alterTable}/AlterRenameTableNode.java (85%)
 rename sqlTranslate/src/main/java/{Parser/AST/CaseWhen => parser/ast/caseWhen}/CaseConditionNode.java (86%)
 rename sqlTranslate/src/main/java/{Parser/AST/CaseWhen => parser/ast/caseWhen}/CaseElseNode.java (85%)
 rename sqlTranslate/src/main/java/{Parser/AST/CaseWhen => parser/ast/caseWhen}/CaseEndNode.java (85%)
 rename sqlTranslate/src/main/java/{Parser/AST/CaseWhen => parser/ast/caseWhen}/CaseThenNode.java (85%)
 rename sqlTranslate/src/main/java/{Parser/AST/CreateTable => parser/ast/createTable}/CRTEndNode.java (84%)
 rename sqlTranslate/src/main/java/{Parser/AST/CreateTable => parser/ast/createTable}/ColumnNode.java (93%)
 rename sqlTranslate/src/main/java/{Parser/AST/CreateTable => parser/ast/createTable}/CreateTabNode.java (86%)
 rename sqlTranslate/src/main/java/{Parser/AST/CreateTable => parser/ast/createTable}/TableConstraintNode.java (89%)
 rename sqlTranslate/src/main/java/{Parser/AST/CreateTable => parser/ast/createTable}/TableNode.java (84%)
 rename sqlTranslate/src/main/java/{Parser/AST/CreateTable => parser/ast/createTable}/TableTypeNode.java (85%)
 rename sqlTranslate/src/main/java/{Parser/AST/Delete => parser/ast/delete}/DeleteConditionNode.java (86%)
 rename sqlTranslate/src/main/java/{Parser/AST/Delete => parser/ast/delete}/DeleteEndNode.java (85%)
 rename sqlTranslate/src/main/java/{Parser/AST/Delete => parser/ast/delete}/DeleteNode.java (85%)
 rename sqlTranslate/src/main/java/{Parser/AST/Delete => parser/ast/delete}/DeleteObjNode.java (85%)
 rename sqlTranslate/src/main/java/{Parser/AST/Drop => parser/ast/drop}/DropEndNode.java (85%)
 rename sqlTranslate/src/main/java/{Parser/AST/Drop => parser/ast/drop}/DropNode.java (86%)
 rename sqlTranslate/src/main/java/{Parser/AST/Drop => parser/ast/drop}/DropObjNameNode.java (86%)
 rename sqlTranslate/src/main/java/{Parser/AST/Drop => parser/ast/drop}/DropOptionNode.java (86%)
 rename sqlTranslate/src/main/java/{Parser/AST/Exception => parser/ast/exception}/CustomExceptionNode.java (88%)
 rename sqlTranslate/src/main/java/{Parser/AST/Exception => parser/ast/exception}/ExceptionActionNode.java (88%)
 rename sqlTranslate/src/main/java/{Parser/AST/Exception => parser/ast/exception}/ExceptionEndNode.java (88%)
 rename sqlTranslate/src/main/java/{Parser/AST/Exception => parser/ast/exception}/ExceptionNode.java (88%)
 rename sqlTranslate/src/main/java/{Parser/AST/Exception => parser/ast/exception}/Invalid_numberNode.java (88%)
 rename sqlTranslate/src/main/java/{Parser/AST/Exception => parser/ast/exception}/OtherExceptionNode.java (88%)
 rename sqlTranslate/src/main/java/{Parser/AST/Exception => parser/ast/exception}/Zero_divideNode.java (88%)
 rename sqlTranslate/src/main/java/{Parser/AST/Function => parser/ast/function}/FunctionBeginNode.java (88%)
 rename sqlTranslate/src/main/java/{Parser/AST/Function => parser/ast/function}/FunctionBodyNode.java (88%)
 rename sqlTranslate/src/main/java/{Parser/AST/Function => parser/ast/function}/FunctionColumnNode.java (95%)
 rename sqlTranslate/src/main/java/{Parser/AST/Function => parser/ast/function}/FunctionEndNode.java (88%)
 rename sqlTranslate/src/main/java/{Parser/AST/Function => parser/ast/function}/FunctionNameNode.java (88%)
 rename sqlTranslate/src/main/java/{Parser/AST/Function => parser/ast/function}/FunctionNode.java (88%)
 rename sqlTranslate/src/main/java/{Parser/AST/Function => parser/ast/function}/FunctionRetDefNode.java (91%)
 rename sqlTranslate/src/main/java/{Parser/AST/Function => parser/ast/function}/FunctionReturnNode.java (88%)
 rename sqlTranslate/src/main/java/{Parser/AST/IFELSIF => parser/ast/iFELSIF}/ELSENode.java (88%)
 rename sqlTranslate/src/main/java/{Parser/AST/IFELSIF => parser/ast/iFELSIF}/ELSIFActionNode.java (88%)
 rename sqlTranslate/src/main/java/{Parser/AST/IFELSIF => parser/ast/iFELSIF}/ELSIFConditionNode.java (88%)
 rename sqlTranslate/src/main/java/{Parser/AST/IFELSIF => parser/ast/iFELSIF}/EndIFNode.java (88%)
 rename sqlTranslate/src/main/java/{Parser/AST/IFELSIF => parser/ast/iFELSIF}/IFActionNode.java (88%)
 rename sqlTranslate/src/main/java/{Parser/AST/IFELSIF => parser/ast/iFELSIF}/IFConditionNode.java (88%)
 rename sqlTranslate/src/main/java/{Parser/AST/Insert => parser/ast/insert}/InsertDataNode.java (85%)
 rename sqlTranslate/src/main/java/{Parser/AST/Insert => parser/ast/insert}/InsertEndNode.java (85%)
 rename sqlTranslate/src/main/java/{Parser/AST/Insert => parser/ast/insert}/InsertNode.java (86%)
 rename sqlTranslate/src/main/java/{Parser/AST/Insert => parser/ast/insert}/InsertObjNode.java (85%)
 rename sqlTranslate/src/main/java/{Parser/AST/Join => parser/ast/join}/JoinConditionNode.java (91%)
 rename sqlTranslate/src/main/java/{Parser/AST/Join => parser/ast/join}/JoinEndNode.java (87%)
 rename sqlTranslate/src/main/java/{Parser/AST/Join => parser/ast/join}/JoinSourceTabNode.java (86%)
 rename sqlTranslate/src/main/java/{Parser/AST/Join => parser/ast/join}/JoinTargetTabNode.java (86%)
 rename sqlTranslate/src/main/java/{Parser/AST/Join => parser/ast/join}/JoinTypeNode.java (86%)
 rename sqlTranslate/src/main/java/{Parser/AST/Loop => parser/ast/loop}/ForNode.java (88%)
 rename sqlTranslate/src/main/java/{Parser/AST/Loop => parser/ast/loop}/LoopBodyNode.java (88%)
 rename sqlTranslate/src/main/java/{Parser/AST/Loop => parser/ast/loop}/LoopEndNode.java (88%)
 rename sqlTranslate/src/main/java/{Parser/AST/Loop => parser/ast/loop}/LoopExitNode.java (88%)
 rename sqlTranslate/src/main/java/{Parser/AST/Loop => parser/ast/loop}/LoopNode.java (88%)
 rename sqlTranslate/src/main/java/{Parser/AST/Loop => parser/ast/loop}/WhileNode.java (88%)
 rename sqlTranslate/src/main/java/{Parser/AST/PL => parser/ast/pl}/PLBeginNode.java (89%)
 rename sqlTranslate/src/main/java/{Parser/AST/PL => parser/ast/pl}/PLBodyNode.java (88%)
 rename sqlTranslate/src/main/java/{Parser/AST/PL => parser/ast/pl}/PLDeclareNode.java (92%)
 rename sqlTranslate/src/main/java/{Parser/AST/PL => parser/ast/pl}/PLEndNode.java (88%)
 rename sqlTranslate/src/main/java/{Parser/AST/PL => parser/ast/pl}/PLNode.java (88%)
 rename sqlTranslate/src/main/java/{Parser/AST/Procedure => parser/ast/procedure}/ProcedureBeginNode.java (88%)
 rename sqlTranslate/src/main/java/{Parser/AST/Procedure => parser/ast/procedure}/ProcedureColumnNode.java (95%)
 rename sqlTranslate/src/main/java/{Parser/AST/Procedure => parser/ast/procedure}/ProcedureEndNode.java (88%)
 rename sqlTranslate/src/main/java/{Parser/AST/Procedure => parser/ast/procedure}/ProcedureNode.java (88%)
 rename sqlTranslate/src/main/java/{Parser/AST/Procedure => parser/ast/procedure}/ProcedureObjNode.java (88%)
 rename sqlTranslate/src/main/java/{Parser/AST/Procedure => parser/ast/procedure}/ProcedurePLStatementNode.java (88%)
 rename sqlTranslate/src/main/java/{Parser/AST/Procedure => parser/ast/procedure}/ProcedureRetDefNode.java (92%)
 rename sqlTranslate/src/main/java/{Parser/AST/Select => parser/ast/select}/SelectContentNode.java (91%)
 rename sqlTranslate/src/main/java/{Parser/AST/Select => parser/ast/select}/SelectEndNode.java (86%)
 rename sqlTranslate/src/main/java/{Parser/AST/Select => parser/ast/select}/SelectNode.java (86%)
 rename sqlTranslate/src/main/java/{Parser/AST/Select => parser/ast/select}/SelectObjNode.java (86%)
 rename sqlTranslate/src/main/java/{Parser/AST/Select => parser/ast/select}/SelectOptionNode.java (86%)
 rename sqlTranslate/src/main/java/{Parser/AST/Select => parser/ast/select}/SelectUnionNode.java (86%)
 rename sqlTranslate/src/main/java/{Parser/AST/Select => parser/ast/select}/SelectWhereClauseNode.java (86%)
 rename sqlTranslate/src/main/java/{Parser/AST/Trigger => parser/ast/trigger}/TriggerBeginNode.java (88%)
 rename sqlTranslate/src/main/java/{Parser/AST/Trigger => parser/ast/trigger}/TriggerBodyNode.java (88%)
 rename sqlTranslate/src/main/java/{Parser/AST/Trigger => parser/ast/trigger}/TriggerConditionNode.java (93%)
 rename sqlTranslate/src/main/java/{Parser/AST/Trigger => parser/ast/trigger}/TriggerEndNode.java (88%)
 rename sqlTranslate/src/main/java/{Parser/AST/Trigger => parser/ast/trigger}/TriggerForEachRowNode.java (88%)
 rename sqlTranslate/src/main/java/{Parser/AST/Trigger => parser/ast/trigger}/TriggerNameNode.java (88%)
 rename sqlTranslate/src/main/java/{Parser/AST/Trigger => parser/ast/trigger}/TriggerNode.java (88%)
 rename sqlTranslate/src/main/java/{Parser/AST/Trigger => parser/ast/trigger}/TriggerObjNode.java (88%)
 rename sqlTranslate/src/main/java/{Parser/AST/Trigger => parser/ast/trigger}/TriggerOptionNode.java (88%)
 rename sqlTranslate/src/main/java/{Parser/AST/Trigger => parser/ast/trigger}/TriggerWhenNode.java (88%)
 rename sqlTranslate/src/main/java/{Parser/AST/Update => parser/ast/update}/UpdateEndNode.java (85%)
 rename sqlTranslate/src/main/java/{Parser/AST/Update => parser/ast/update}/UpdateNode.java (85%)
 rename sqlTranslate/src/main/java/{Parser/AST/Update => parser/ast/update}/UpdateObjNode.java (85%)
 rename sqlTranslate/src/main/java/{Parser/AST/Update => parser/ast/update}/UpdateSetNode.java (85%)
 rename sqlTranslate/src/main/java/{Parser/AST/Update => parser/ast/update}/UpdateWhereNode.java (86%)
 rename sqlTranslate/src/main/java/{Parser/AST/View => parser/ast/view}/ViewCreateNode.java (87%)
 rename sqlTranslate/src/main/java/{Parser/AST/View => parser/ast/view}/ViewEndNode.java (87%)
 rename sqlTranslate/src/main/java/{Parser/AST/View => parser/ast/view}/ViewNameNode.java (86%)
 rename sqlTranslate/src/main/java/{Parser/AST/View => parser/ast/view}/ViewTargetNode.java (86%)

diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
index 9514e9b4..df2b8b33 100644
--- a/sqlTranslate/.idea/workspace.xml
+++ b/sqlTranslate/.idea/workspace.xml
@@ -4,14 +4,137 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="revise">
+    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add pl/sql">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Generator/OpenGaussGenerator.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Generator/OpenGaussGenerator.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Lexer/OracleLexer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Lexer/OracleLexer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Lexer/Token.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Lexer/Token.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Document/Alter table in Oracle" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/document/Alter table in Oracle" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Document/Commit,rollback,execute in Oracle" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/document/Commit,rollback,execute in Oracle" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Document/CreateTable in Oracle" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/document/CreateTable in Oracle" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Document/DataType in Oracle" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/document/DataType in Oracle" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Document/Delete statement in Oracle" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/document/Delete statement in Oracle" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Document/DropTable in Oracle" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/document/DropTable in Oracle" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Document/Exception in Oracle" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/document/Exception in Oracle" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Document/Function in Oracle" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/document/Function in Oracle" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Document/IF ELSEIF ELSE in Oracle" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/document/IF ELSEIF ELSE in Oracle" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Document/Insert statement in Oracle" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/document/Insert statement in Oracle" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Document/Loop in PLSQL" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/document/Loop in PLSQL" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Document/PL in Oracle" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/document/PL in Oracle" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Document/Procedure in Oracle" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/document/Procedure in Oracle" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Document/Select statement in Oracle" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/document/Select statement in Oracle" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Document/Todolist" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/document/Todolist" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Document/Trigger in Oracle" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/document/Trigger in Oracle" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Document/Update statement in Oracle" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/document/Update statement in Oracle" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Document/View in Oracle" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/document/View in Oracle" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Exception/GenerateFailedException.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/exception/GenerateFailedException.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Exception/ParseFailedException.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/exception/ParseFailedException.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Generator/OpenGaussGenerator.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/generator/OpenGaussGenerator.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Interface/DataType.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/interfaces/DataType.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Lexer/OracleLexer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/lexer/OracleLexer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Lexer/Token.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/lexer/Token.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Main.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/PL/PLDeclareNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/AST/PL/PLDeclareNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/ASTNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/ASTNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/AlterTable/AlterAddColumnNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/alterTable/AlterAddColumnNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/AlterTable/AlterAddConstraintNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/alterTable/AlterAddConstraintNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/AlterTable/AlterDropColumnNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/alterTable/AlterDropColumnNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/AlterTable/AlterDropConstraintNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/alterTable/AlterDropConstraintNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/AlterTable/AlterEndNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/alterTable/AlterEndNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/AlterTable/AlterModifyColumnNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/alterTable/AlterModifyColumnNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/AlterTable/AlterNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/alterTable/AlterNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/AlterTable/AlterObjNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/alterTable/AlterObjNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/AlterTable/AlterRenameColumnNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/alterTable/AlterRenameColumnNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/AlterTable/AlterRenameTableNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/alterTable/AlterRenameTableNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/CaseWhen/CaseConditionNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/caseWhen/CaseConditionNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/CaseWhen/CaseElseNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/caseWhen/CaseElseNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/CaseWhen/CaseEndNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/caseWhen/CaseEndNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/CaseWhen/CaseThenNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/caseWhen/CaseThenNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/CreateTable/CRTEndNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/createTable/CRTEndNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/CreateTable/ColumnNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/createTable/ColumnNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/CreateTable/CreateTabNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/createTable/CreateTabNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/CreateTable/TableConstraintNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/createTable/TableConstraintNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/CreateTable/TableNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/createTable/TableNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/CreateTable/TableTypeNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/createTable/TableTypeNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Delete/DeleteConditionNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/delete/DeleteConditionNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Delete/DeleteEndNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/delete/DeleteEndNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Delete/DeleteNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/delete/DeleteNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Delete/DeleteObjNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/delete/DeleteObjNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Drop/DropEndNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/drop/DropEndNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Drop/DropNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/drop/DropNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Drop/DropObjNameNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/drop/DropObjNameNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Drop/DropOptionNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/drop/DropOptionNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Exception/CustomExceptionNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/exception/CustomExceptionNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Exception/ExceptionActionNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/exception/ExceptionActionNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Exception/ExceptionEndNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/exception/ExceptionEndNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Exception/ExceptionNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/exception/ExceptionNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Exception/Invalid_numberNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/exception/Invalid_numberNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Exception/OtherExceptionNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/exception/OtherExceptionNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Exception/Zero_divideNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/exception/Zero_divideNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Function/FunctionBeginNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/function/FunctionBeginNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Function/FunctionBodyNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/function/FunctionBodyNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Function/FunctionColumnNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/function/FunctionColumnNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Function/FunctionEndNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/function/FunctionEndNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Function/FunctionNameNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/function/FunctionNameNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Function/FunctionNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/function/FunctionNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Function/FunctionRetDefNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/function/FunctionRetDefNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Function/FunctionReturnNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/function/FunctionReturnNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/IFELSIF/ELSENode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/iFELSIF/ELSENode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/IFELSIF/ELSIFActionNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/iFELSIF/ELSIFActionNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/IFELSIF/ELSIFConditionNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/iFELSIF/ELSIFConditionNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/IFELSIF/EndIFNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/iFELSIF/EndIFNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/IFELSIF/IFActionNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/iFELSIF/IFActionNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/IFELSIF/IFConditionNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/iFELSIF/IFConditionNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Insert/InsertDataNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/insert/InsertDataNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Insert/InsertEndNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/insert/InsertEndNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Insert/InsertNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/insert/InsertNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Insert/InsertObjNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/insert/InsertObjNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Join/JoinConditionNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/join/JoinConditionNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Join/JoinEndNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/join/JoinEndNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Join/JoinSourceTabNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/join/JoinSourceTabNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Join/JoinTargetTabNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/join/JoinTargetTabNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Join/JoinTypeNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/join/JoinTypeNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Loop/ForNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/loop/ForNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Loop/LoopBodyNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/loop/LoopBodyNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Loop/LoopEndNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/loop/LoopEndNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Loop/LoopExitNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/loop/LoopExitNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Loop/LoopNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/loop/LoopNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Loop/WhileNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/loop/WhileNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/PL/PLBeginNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/pl/PLBeginNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/PL/PLBodyNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/pl/PLBodyNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/PL/PLDeclareNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/pl/PLDeclareNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/PL/PLEndNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/pl/PLEndNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/PL/PLNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/pl/PLNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Procedure/ProcedureBeginNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/procedure/ProcedureBeginNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Procedure/ProcedureColumnNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/procedure/ProcedureColumnNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Procedure/ProcedureEndNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/procedure/ProcedureEndNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Procedure/ProcedureNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/procedure/ProcedureNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Procedure/ProcedureObjNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/procedure/ProcedureObjNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Procedure/ProcedurePLStatementNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/procedure/ProcedurePLStatementNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Procedure/ProcedureRetDefNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/procedure/ProcedureRetDefNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Select/SelectContentNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/select/SelectContentNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Select/SelectEndNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/select/SelectEndNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Select/SelectNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/select/SelectNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Select/SelectObjNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/select/SelectObjNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Select/SelectOptionNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/select/SelectOptionNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Select/SelectUnionNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/select/SelectUnionNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Select/SelectWhereClauseNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/select/SelectWhereClauseNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Trigger/TriggerBeginNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/trigger/TriggerBeginNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Trigger/TriggerBodyNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/trigger/TriggerBodyNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Trigger/TriggerConditionNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/trigger/TriggerConditionNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Trigger/TriggerEndNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/trigger/TriggerEndNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Trigger/TriggerForEachRowNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/trigger/TriggerForEachRowNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Trigger/TriggerNameNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/trigger/TriggerNameNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Trigger/TriggerNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/trigger/TriggerNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Trigger/TriggerObjNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/trigger/TriggerObjNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Trigger/TriggerOptionNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/trigger/TriggerOptionNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Trigger/TriggerWhenNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/trigger/TriggerWhenNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Update/UpdateEndNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/update/UpdateEndNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Update/UpdateNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/update/UpdateNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Update/UpdateObjNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/update/UpdateObjNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Update/UpdateSetNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/update/UpdateSetNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Update/UpdateWhereNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/update/UpdateWhereNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/View/ViewCreateNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/view/ViewCreateNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/View/ViewEndNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/view/ViewEndNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/View/ViewNameNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/view/ViewNameNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/View/ViewTargetNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/view/ViewTargetNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/OracleParser.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -109,13 +232,6 @@
       <option name="presentableId" value="Default" />
       <updated>1723106789329</updated>
     </task>
-    <task id="LOCAL-00044" summary="add update ast class">
-      <created>1726149015586</created>
-      <option name="number" value="00044" />
-      <option name="presentableId" value="LOCAL-00044" />
-      <option name="project" value="LOCAL" />
-      <updated>1726149015586</updated>
-    </task>
     <task id="LOCAL-00045" summary="add update convert rules">
       <created>1726151534112</created>
       <option name="number" value="00045" />
@@ -452,7 +568,14 @@
       <option name="project" value="LOCAL" />
       <updated>1726631451338</updated>
     </task>
-    <option name="localTasksCounter" value="93" />
+    <task id="LOCAL-00093" summary="add pl/sql">
+      <created>1726633703475</created>
+      <option name="number" value="00093" />
+      <option name="presentableId" value="LOCAL-00093" />
+      <option name="project" value="LOCAL" />
+      <updated>1726633703475</updated>
+    </task>
+    <option name="localTasksCounter" value="94" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
@@ -467,7 +590,6 @@
     </option>
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="add view" />
     <MESSAGE value="add view generate method" />
     <MESSAGE value="add if elseif else endif document" />
     <MESSAGE value="add if elseif else endif ast classes" />
@@ -492,7 +614,8 @@
     <MESSAGE value="add PL document" />
     <MESSAGE value="add PL ast classes" />
     <MESSAGE value="revise" />
-    <option name="LAST_COMMIT_MESSAGE" value="revise" />
+    <MESSAGE value="add pl/sql" />
+    <option name="LAST_COMMIT_MESSAGE" value="add pl/sql" />
   </component>
   <component name="XDebuggerManager">
     <watches-manager>
diff --git a/sqlTranslate/src/main/java/Main.java b/sqlTranslate/src/main/java/Main.java
index 7adb77db..b17eed35 100644
--- a/sqlTranslate/src/main/java/Main.java
+++ b/sqlTranslate/src/main/java/Main.java
@@ -1,11 +1,8 @@
 
-import Generator.OpenGaussGenerator;
-import Lexer.OracleLexer;
-import Parser.AST.ASTNode;
-import Parser.OracleParser;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
+import generator.OpenGaussGenerator;
+import lexer.OracleLexer;
+import parser.ast.ASTNode;
+import parser.OracleParser;
 
 
 public class Main {
@@ -60,53 +57,51 @@ public class Main {
 //                "        DBMS_OUTPUT.PUT_LINE('Caught an exception: Invalid number');\n" +
 //                "    WHEN OTHERS THEN\n" +
 //                "        DBMS_OUTPUT.PUT_LINE('Caught an exception: ' || SQLERRM);";
-//        String sql = "CREATE OR REPLACE PROCEDURE update_salary (\n" +
-//                "             employee_id IN NUMBER,\n" +
-//                "             new_salary IN OUT NUMBER\n" +
-//                "         ) IS\n" +
-//                "             v_employee NUMBER;\n" +
-//                "         BEGIN\n" +
-//                "             SELECT * INTO v_employee FROM employees WHERE employee_id = employee_id;\n" +
-//                "\n" +
-//                "             IF new_salary < 3000 THEN\n" +
-//                "                 new_salary := new_salary * 1.1;\n" +
-//                "             ELSE\n" +
-//                "                 new_salary := new_salary * 1.05;\n" +
-//                "             END IF;\n" +
-//                "\n" +
-//                "             UPDATE employees SET salary = new_salary WHERE employee_id = employee_id;\n" +
-//                "             COMMIT;\n" +
-//                "\n" +
-//                "             DBMS_OUTPUT.PUT_LINE('Updated Salary: ' || new_salary);\n" +
-//                "         EXCEPTION\n" +
-//                "             WHEN NO_DATA_FOUND THEN\n" +
-//                "                 DBMS_OUTPUT.PUT_LINE('Employee not found.');\n" +
-//                "             WHEN TOO_MANY_ROWS THEN\n" +
-//                "                 DBMS_OUTPUT.PUT_LINE('Multiple employees found.');\n" +
-//                "             WHEN OTHERS THEN\n" +
-//                "                 DBMS_OUTPUT.PUT_LINE('An error occurred: ' || SQLERRM);\n" +
-//                "         END update_salary;\n" +
-//                "         /";
+        String sql = "CREATE OR REPLACE PROCEDURE update_salary (\n" +
+                "             employee_id IN NUMBER,\n" +
+                "             new_salary IN OUT NUMBER\n" +
+                "         ) IS\n" +
+                "             v_employee NUMBER;\n" +
+                "         BEGIN\n" +
+                "             SELECT * INTO v_employee FROM employees WHERE employee_id = employee_id;\n" +
+                "\n" +
+                "             IF new_salary < 3000 THEN\n" +
+                "                 new_salary := new_salary * 1.1;\n" +
+                "             ELSE\n" +
+                "                 new_salary := new_salary * 1.05;\n" +
+                "             END IF;\n" +
+                "\n" +
+                "             UPDATE employees SET salary = new_salary WHERE employee_id = employee_id;\n" +
+                "             COMMIT;\n" +
+                "\n" +
+                "             DBMS_OUTPUT.PUT_LINE('Updated Salary: ' || new_salary);\n" +
+                "         EXCEPTION\n" +
+                "             WHEN NO_DATA_FOUND THEN\n" +
+                "                 DBMS_OUTPUT.PUT_LINE('Employee not found.');\n" +
+                "             WHEN TOO_MANY_ROWS THEN\n" +
+                "                 DBMS_OUTPUT.PUT_LINE('Multiple employees found.');\n" +
+                "             WHEN OTHERS THEN\n" +
+                "                 DBMS_OUTPUT.PUT_LINE('An error occurred: ' || SQLERRM);\n" +
+                "         END update_salary;\n";
 //        String sql = "CREATE OR REPLACE FUNCTION string_length (\n" +
 //                "    input_string VARCHAR2\n" +
 //                ") RETURN NUMBER IS\n" +
 //                "BEGIN\n" +
 //                "    RETURN LENGTH(input_string);\n" +
-//                "END;\n" +
-//                "/";
+//                "END;\n";
 //        String sql = "CREATE OR REPLACE TRIGGER log_insert\n" +
 //                "         BEFORE INSERT ON employees\n" +
 //                "         FOR EACH ROW\n" +
 //                "         BEGIN\n" +
 //                "             INSERT INTO audit_log (action, employee_id) VALUES ('INSERT', :NEW.id);\n" +
 //                "         END;";
-        String sql = "DECLARE\n" +
-                "            v_name Varchar2(20);\n" +
-                "            v_salary employees.salary%TYPE;\n" +
-                "         BEGIN\n" +
-                "            SELECT name, salary INTO v_name, v_salary FROM employees WHERE employee_id = 100;\n" +
-                "            DBMS_OUTPUT.PUT_LINE('Name: ' || v_name || ', Salary: ' || v_salary);\n" +
-                "         END;";
+//        String sql = "DECLARE\n" +
+//                "            v_name Varchar2(20);\n" +
+//                "            v_salary employees.salary%TYPE;\n" +
+//                "         BEGIN\n" +
+//                "            SELECT name, salary INTO v_name, v_salary FROM employees WHERE employee_id = 100;\n" +
+//                "            DBMS_OUTPUT.PUT_LINE('Name: ' || v_name || ', Salary: ' || v_salary);\n" +
+//                "         END;";
         OracleLexer lexer = new OracleLexer(sql);
         lexer.printTokens();
         OracleParser parser = new OracleParser(lexer);
diff --git a/sqlTranslate/src/main/java/Document/Alter table in Oracle b/sqlTranslate/src/main/java/document/Alter table in Oracle
similarity index 100%
rename from sqlTranslate/src/main/java/Document/Alter table in Oracle
rename to sqlTranslate/src/main/java/document/Alter table in Oracle
diff --git a/sqlTranslate/src/main/java/Document/Commit,rollback,execute in Oracle b/sqlTranslate/src/main/java/document/Commit,rollback,execute in Oracle
similarity index 100%
rename from sqlTranslate/src/main/java/Document/Commit,rollback,execute in Oracle
rename to sqlTranslate/src/main/java/document/Commit,rollback,execute in Oracle
diff --git a/sqlTranslate/src/main/java/Document/CreateTable in Oracle b/sqlTranslate/src/main/java/document/CreateTable in Oracle
similarity index 100%
rename from sqlTranslate/src/main/java/Document/CreateTable in Oracle
rename to sqlTranslate/src/main/java/document/CreateTable in Oracle
diff --git a/sqlTranslate/src/main/java/Document/DataType in Oracle b/sqlTranslate/src/main/java/document/DataType in Oracle
similarity index 100%
rename from sqlTranslate/src/main/java/Document/DataType in Oracle
rename to sqlTranslate/src/main/java/document/DataType in Oracle
diff --git a/sqlTranslate/src/main/java/Document/Delete statement in Oracle b/sqlTranslate/src/main/java/document/Delete statement in Oracle
similarity index 100%
rename from sqlTranslate/src/main/java/Document/Delete statement in Oracle
rename to sqlTranslate/src/main/java/document/Delete statement in Oracle
diff --git a/sqlTranslate/src/main/java/Document/DropTable in Oracle b/sqlTranslate/src/main/java/document/DropTable in Oracle
similarity index 100%
rename from sqlTranslate/src/main/java/Document/DropTable in Oracle
rename to sqlTranslate/src/main/java/document/DropTable in Oracle
diff --git a/sqlTranslate/src/main/java/Document/Exception in Oracle b/sqlTranslate/src/main/java/document/Exception in Oracle
similarity index 100%
rename from sqlTranslate/src/main/java/Document/Exception in Oracle
rename to sqlTranslate/src/main/java/document/Exception in Oracle
diff --git a/sqlTranslate/src/main/java/Document/Function in Oracle b/sqlTranslate/src/main/java/document/Function in Oracle
similarity index 100%
rename from sqlTranslate/src/main/java/Document/Function in Oracle
rename to sqlTranslate/src/main/java/document/Function in Oracle
diff --git a/sqlTranslate/src/main/java/Document/IF ELSEIF ELSE in Oracle b/sqlTranslate/src/main/java/document/IF ELSEIF ELSE in Oracle
similarity index 100%
rename from sqlTranslate/src/main/java/Document/IF ELSEIF ELSE in Oracle
rename to sqlTranslate/src/main/java/document/IF ELSEIF ELSE in Oracle
diff --git a/sqlTranslate/src/main/java/Document/Insert statement in Oracle b/sqlTranslate/src/main/java/document/Insert statement in Oracle
similarity index 100%
rename from sqlTranslate/src/main/java/Document/Insert statement in Oracle
rename to sqlTranslate/src/main/java/document/Insert statement in Oracle
diff --git a/sqlTranslate/src/main/java/Document/Loop in PLSQL b/sqlTranslate/src/main/java/document/Loop in PLSQL
similarity index 100%
rename from sqlTranslate/src/main/java/Document/Loop in PLSQL
rename to sqlTranslate/src/main/java/document/Loop in PLSQL
diff --git a/sqlTranslate/src/main/java/Document/PL in Oracle b/sqlTranslate/src/main/java/document/PL in Oracle
similarity index 100%
rename from sqlTranslate/src/main/java/Document/PL in Oracle
rename to sqlTranslate/src/main/java/document/PL in Oracle
diff --git a/sqlTranslate/src/main/java/Document/Procedure in Oracle b/sqlTranslate/src/main/java/document/Procedure in Oracle
similarity index 97%
rename from sqlTranslate/src/main/java/Document/Procedure in Oracle
rename to sqlTranslate/src/main/java/document/Procedure in Oracle
index dc73b7ea..df4408b5 100644
--- a/sqlTranslate/src/main/java/Document/Procedure in Oracle	
+++ b/sqlTranslate/src/main/java/document/Procedure in Oracle	
@@ -3,7 +3,7 @@ IS [LOCAL DECLARATIONS]
 BEGIN
     -- PL/SQL statements
 [EXCEPTION]
-    -- Exception handling
+    -- exception handling
 END [procedure_name]; -- [procedure_name] should be removed in OpenGauss
 
 Example: CREATE OR REPLACE PROCEDURE update_salary (
diff --git a/sqlTranslate/src/main/java/Document/Select statement in Oracle b/sqlTranslate/src/main/java/document/Select statement in Oracle
similarity index 100%
rename from sqlTranslate/src/main/java/Document/Select statement in Oracle
rename to sqlTranslate/src/main/java/document/Select statement in Oracle
diff --git a/sqlTranslate/src/main/java/Document/Todolist b/sqlTranslate/src/main/java/document/Todolist
similarity index 100%
rename from sqlTranslate/src/main/java/Document/Todolist
rename to sqlTranslate/src/main/java/document/Todolist
diff --git a/sqlTranslate/src/main/java/Document/Trigger in Oracle b/sqlTranslate/src/main/java/document/Trigger in Oracle
similarity index 100%
rename from sqlTranslate/src/main/java/Document/Trigger in Oracle
rename to sqlTranslate/src/main/java/document/Trigger in Oracle
diff --git a/sqlTranslate/src/main/java/Document/Update statement in Oracle b/sqlTranslate/src/main/java/document/Update statement in Oracle
similarity index 100%
rename from sqlTranslate/src/main/java/Document/Update statement in Oracle
rename to sqlTranslate/src/main/java/document/Update statement in Oracle
diff --git a/sqlTranslate/src/main/java/Document/View in Oracle b/sqlTranslate/src/main/java/document/View in Oracle
similarity index 100%
rename from sqlTranslate/src/main/java/Document/View in Oracle
rename to sqlTranslate/src/main/java/document/View in Oracle
diff --git a/sqlTranslate/src/main/java/Exception/GenerateFailedException.java b/sqlTranslate/src/main/java/exception/GenerateFailedException.java
similarity index 88%
rename from sqlTranslate/src/main/java/Exception/GenerateFailedException.java
rename to sqlTranslate/src/main/java/exception/GenerateFailedException.java
index 181b987c..49d54c1b 100644
--- a/sqlTranslate/src/main/java/Exception/GenerateFailedException.java
+++ b/sqlTranslate/src/main/java/exception/GenerateFailedException.java
@@ -1,4 +1,4 @@
-package Exception;
+package exception;
 
 public class GenerateFailedException extends RuntimeException{
     public GenerateFailedException(String message)
diff --git a/sqlTranslate/src/main/java/Exception/ParseFailedException.java b/sqlTranslate/src/main/java/exception/ParseFailedException.java
similarity index 88%
rename from sqlTranslate/src/main/java/Exception/ParseFailedException.java
rename to sqlTranslate/src/main/java/exception/ParseFailedException.java
index 7d9458f5..547e9a29 100644
--- a/sqlTranslate/src/main/java/Exception/ParseFailedException.java
+++ b/sqlTranslate/src/main/java/exception/ParseFailedException.java
@@ -1,4 +1,4 @@
-package Exception;
+package exception;
 
 public class ParseFailedException extends RuntimeException{
     public ParseFailedException(String message)
diff --git a/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java b/sqlTranslate/src/main/java/generator/OpenGaussGenerator.java
similarity index 93%
rename from sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java
rename to sqlTranslate/src/main/java/generator/OpenGaussGenerator.java
index 6faf376e..0396f08e 100644
--- a/sqlTranslate/src/main/java/Generator/OpenGaussGenerator.java
+++ b/sqlTranslate/src/main/java/generator/OpenGaussGenerator.java
@@ -1,43 +1,43 @@
-package Generator;
-
-import Interface.DataType;
-import Lexer.OracleLexer;
-import Lexer.Token;
-import Parser.AST.ASTNode;
-import Parser.AST.AlterTable.AlterAddColumnNode;
-import Parser.AST.AlterTable.AlterModifyColumnNode;
-import Parser.AST.AlterTable.AlterNode;
-import Parser.AST.CreateTable.ColumnNode;
-import Parser.AST.CreateTable.CreateTabNode;
-import Exception.GenerateFailedException;
-import Parser.AST.Delete.DeleteNode;
-import Parser.AST.Drop.DropNode;
-import Parser.AST.Drop.DropOptionNode;
-import Parser.AST.Exception.ExceptionActionNode;
-import Parser.AST.Exception.ExceptionNode;
-import Parser.AST.Function.FunctionColumnNode;
-import Parser.AST.Function.FunctionEndNode;
-import Parser.AST.Function.FunctionNode;
-import Parser.AST.Function.FunctionRetDefNode;
-import Parser.AST.Insert.InsertNode;
-import Parser.AST.Join.JoinConditionNode;
-import Parser.AST.Join.JoinSourceTabNode;
-import Parser.AST.Loop.ForNode;
-import Parser.AST.Loop.LoopBodyNode;
-import Parser.AST.Loop.LoopNode;
-import Parser.AST.Loop.WhileNode;
-import Parser.AST.PL.PLBodyNode;
-import Parser.AST.PL.PLDeclareNode;
-import Parser.AST.PL.PLEndNode;
-import Parser.AST.PL.PLNode;
-import Parser.AST.Procedure.ProcedureColumnNode;
-import Parser.AST.Procedure.ProcedureEndNode;
-import Parser.AST.Procedure.ProcedureNode;
-import Parser.AST.Procedure.ProcedureRetDefNode;
-import Parser.AST.Select.SelectNode;
-import Parser.AST.Trigger.*;
-import Parser.AST.Update.UpdateNode;
-import Parser.AST.View.ViewCreateNode;
+package generator;
+
+import interfaces.DataType;
+import lexer.OracleLexer;
+import lexer.Token;
+import parser.ast.ASTNode;
+import parser.ast.alterTable.AlterAddColumnNode;
+import parser.ast.alterTable.AlterModifyColumnNode;
+import parser.ast.alterTable.AlterNode;
+import parser.ast.createTable.ColumnNode;
+import parser.ast.createTable.CreateTabNode;
+import exception.GenerateFailedException;
+import parser.ast.delete.DeleteNode;
+import parser.ast.drop.DropNode;
+import parser.ast.drop.DropOptionNode;
+import parser.ast.exception.ExceptionActionNode;
+import parser.ast.exception.ExceptionNode;
+import parser.ast.function.FunctionColumnNode;
+import parser.ast.function.FunctionEndNode;
+import parser.ast.function.FunctionNode;
+import parser.ast.function.FunctionRetDefNode;
+import parser.ast.insert.InsertNode;
+import parser.ast.join.JoinConditionNode;
+import parser.ast.join.JoinSourceTabNode;
+import parser.ast.loop.ForNode;
+import parser.ast.loop.LoopBodyNode;
+import parser.ast.loop.LoopNode;
+import parser.ast.loop.WhileNode;
+import parser.ast.pl.PLBodyNode;
+import parser.ast.pl.PLDeclareNode;
+import parser.ast.pl.PLEndNode;
+import parser.ast.pl.PLNode;
+import parser.ast.procedure.ProcedureColumnNode;
+import parser.ast.procedure.ProcedureEndNode;
+import parser.ast.procedure.ProcedureNode;
+import parser.ast.procedure.ProcedureRetDefNode;
+import parser.ast.select.SelectNode;
+import parser.ast.trigger.*;
+import parser.ast.update.UpdateNode;
+import parser.ast.view.ViewCreateNode;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/sqlTranslate/src/main/java/Interface/DataType.java b/sqlTranslate/src/main/java/interfaces/DataType.java
similarity index 76%
rename from sqlTranslate/src/main/java/Interface/DataType.java
rename to sqlTranslate/src/main/java/interfaces/DataType.java
index 2174d4a8..32abfcef 100644
--- a/sqlTranslate/src/main/java/Interface/DataType.java
+++ b/sqlTranslate/src/main/java/interfaces/DataType.java
@@ -1,6 +1,6 @@
-package Interface;
+package interfaces;
 
-import Lexer.Token;
+import lexer.Token;
 
 public interface DataType {
     Token getType();
diff --git a/sqlTranslate/src/main/java/Lexer/OracleLexer.java b/sqlTranslate/src/main/java/lexer/OracleLexer.java
similarity index 99%
rename from sqlTranslate/src/main/java/Lexer/OracleLexer.java
rename to sqlTranslate/src/main/java/lexer/OracleLexer.java
index bca45934..21d0e017 100644
--- a/sqlTranslate/src/main/java/Lexer/OracleLexer.java
+++ b/sqlTranslate/src/main/java/lexer/OracleLexer.java
@@ -1,7 +1,6 @@
-package Lexer;
+package lexer;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
diff --git a/sqlTranslate/src/main/java/Lexer/Token.java b/sqlTranslate/src/main/java/lexer/Token.java
similarity index 98%
rename from sqlTranslate/src/main/java/Lexer/Token.java
rename to sqlTranslate/src/main/java/lexer/Token.java
index 17861610..b44ea7ec 100644
--- a/sqlTranslate/src/main/java/Lexer/Token.java
+++ b/sqlTranslate/src/main/java/lexer/Token.java
@@ -1,4 +1,4 @@
-package Lexer;
+package lexer;
 
 import java.util.Objects;
 
diff --git a/sqlTranslate/src/main/java/Parser/OracleParser.java b/sqlTranslate/src/main/java/parser/OracleParser.java
similarity index 98%
rename from sqlTranslate/src/main/java/Parser/OracleParser.java
rename to sqlTranslate/src/main/java/parser/OracleParser.java
index fefbfce7..9c6bf93b 100644
--- a/sqlTranslate/src/main/java/Parser/OracleParser.java
+++ b/sqlTranslate/src/main/java/parser/OracleParser.java
@@ -1,41 +1,41 @@
-package Parser;
+package parser;
 
-import Lexer.OracleLexer;
-import Lexer.Token;
-import Parser.AST.ASTNode;
-import Exception.ParseFailedException;
-import Parser.AST.AlterTable.*;
-import Parser.AST.CaseWhen.CaseConditionNode;
-import Parser.AST.CaseWhen.CaseElseNode;
-import Parser.AST.CaseWhen.CaseEndNode;
-import Parser.AST.CaseWhen.CaseThenNode;
-import Parser.AST.CreateTable.*;
-import Parser.AST.Delete.DeleteConditionNode;
-import Parser.AST.Delete.DeleteEndNode;
-import Parser.AST.Delete.DeleteNode;
-import Parser.AST.Delete.DeleteObjNode;
-import Parser.AST.Drop.DropEndNode;
-import Parser.AST.Drop.DropObjNameNode;
-import Parser.AST.Drop.DropNode;
-import Parser.AST.Drop.DropOptionNode;
-import Parser.AST.Exception.*;
-import Parser.AST.Function.*;
-import Parser.AST.IFELSIF.*;
-import Parser.AST.Insert.InsertDataNode;
-import Parser.AST.Insert.InsertEndNode;
-import Parser.AST.Insert.InsertNode;
-import Parser.AST.Insert.InsertObjNode;
-import Parser.AST.Join.*;
-import Parser.AST.Loop.*;
-import Parser.AST.PL.*;
-import Parser.AST.Procedure.*;
-import Parser.AST.Select.*;
-import Parser.AST.Trigger.*;
-import Parser.AST.Update.*;
-import Parser.AST.View.ViewCreateNode;
-import Parser.AST.View.ViewEndNode;
-import Parser.AST.View.ViewNameNode;
-import Parser.AST.View.ViewTargetNode;
+import lexer.OracleLexer;
+import lexer.Token;
+import parser.ast.ASTNode;
+import exception.ParseFailedException;
+import parser.ast.alterTable.*;
+import parser.ast.caseWhen.CaseConditionNode;
+import parser.ast.caseWhen.CaseElseNode;
+import parser.ast.caseWhen.CaseEndNode;
+import parser.ast.caseWhen.CaseThenNode;
+import parser.ast.createTable.*;
+import parser.ast.delete.DeleteConditionNode;
+import parser.ast.delete.DeleteEndNode;
+import parser.ast.delete.DeleteNode;
+import parser.ast.delete.DeleteObjNode;
+import parser.ast.drop.DropEndNode;
+import parser.ast.drop.DropObjNameNode;
+import parser.ast.drop.DropNode;
+import parser.ast.drop.DropOptionNode;
+import parser.ast.exception.*;
+import parser.ast.function.*;
+import parser.ast.iFELSIF.*;
+import parser.ast.insert.InsertDataNode;
+import parser.ast.insert.InsertEndNode;
+import parser.ast.insert.InsertNode;
+import parser.ast.insert.InsertObjNode;
+import parser.ast.join.*;
+import parser.ast.loop.*;
+import parser.ast.pl.*;
+import parser.ast.procedure.*;
+import parser.ast.select.*;
+import parser.ast.trigger.*;
+import parser.ast.update.*;
+import parser.ast.view.ViewCreateNode;
+import parser.ast.view.ViewEndNode;
+import parser.ast.view.ViewNameNode;
+import parser.ast.view.ViewTargetNode;
 
 import java.util.Stack;
 
diff --git a/sqlTranslate/src/main/java/Parser/AST/ASTNode.java b/sqlTranslate/src/main/java/parser/ast/ASTNode.java
similarity index 99%
rename from sqlTranslate/src/main/java/Parser/AST/ASTNode.java
rename to sqlTranslate/src/main/java/parser/ast/ASTNode.java
index 431fab54..f927fe47 100644
--- a/sqlTranslate/src/main/java/Parser/AST/ASTNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/ASTNode.java
@@ -1,6 +1,6 @@
-package Parser.AST;
+package parser.ast;
 
-import Lexer.Token;
+import lexer.Token;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterAddColumnNode.java b/sqlTranslate/src/main/java/parser/ast/alterTable/AlterAddColumnNode.java
similarity index 93%
rename from sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterAddColumnNode.java
rename to sqlTranslate/src/main/java/parser/ast/alterTable/AlterAddColumnNode.java
index ccd44a30..9cea1dca 100644
--- a/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterAddColumnNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/alterTable/AlterAddColumnNode.java
@@ -1,8 +1,8 @@
-package Parser.AST.AlterTable;
+package parser.ast.alterTable;
 
-import Interface.DataType;
-import Lexer.Token;
-import Parser.AST.ASTNode;
+import interfaces.DataType;
+import lexer.Token;
+import parser.ast.ASTNode;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterAddConstraintNode.java b/sqlTranslate/src/main/java/parser/ast/alterTable/AlterAddConstraintNode.java
similarity index 85%
rename from sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterAddConstraintNode.java
rename to sqlTranslate/src/main/java/parser/ast/alterTable/AlterAddConstraintNode.java
index bb4adf9d..3e068191 100644
--- a/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterAddConstraintNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/alterTable/AlterAddConstraintNode.java
@@ -1,7 +1,7 @@
-package Parser.AST.AlterTable;
+package parser.ast.alterTable;
 
-import Lexer.Token;
-import Parser.AST.ASTNode;
+import lexer.Token;
+import parser.ast.ASTNode;
 
 import java.util.List;
 
diff --git a/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterDropColumnNode.java b/sqlTranslate/src/main/java/parser/ast/alterTable/AlterDropColumnNode.java
similarity index 85%
rename from sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterDropColumnNode.java
rename to sqlTranslate/src/main/java/parser/ast/alterTable/AlterDropColumnNode.java
index 712ebcc1..dd3020f5 100644
--- a/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterDropColumnNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/alterTable/AlterDropColumnNode.java
@@ -1,7 +1,7 @@
-package Parser.AST.AlterTable;
+package parser.ast.alterTable;
 
-import Lexer.Token;
-import Parser.AST.ASTNode;
+import lexer.Token;
+import parser.ast.ASTNode;
 
 import java.util.List;
 
diff --git a/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterDropConstraintNode.java b/sqlTranslate/src/main/java/parser/ast/alterTable/AlterDropConstraintNode.java
similarity index 86%
rename from sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterDropConstraintNode.java
rename to sqlTranslate/src/main/java/parser/ast/alterTable/AlterDropConstraintNode.java
index 88cdffce..d5cbb768 100644
--- a/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterDropConstraintNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/alterTable/AlterDropConstraintNode.java
@@ -1,7 +1,7 @@
-package Parser.AST.AlterTable;
+package parser.ast.alterTable;
 
-import Lexer.Token;
-import Parser.AST.ASTNode;
+import lexer.Token;
+import parser.ast.ASTNode;
 
 import java.util.List;
 
diff --git a/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterEndNode.java b/sqlTranslate/src/main/java/parser/ast/alterTable/AlterEndNode.java
similarity index 85%
rename from sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterEndNode.java
rename to sqlTranslate/src/main/java/parser/ast/alterTable/AlterEndNode.java
index 447f7c08..02ee010e 100644
--- a/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterEndNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/alterTable/AlterEndNode.java
@@ -1,7 +1,7 @@
-package Parser.AST.AlterTable;
+package parser.ast.alterTable;
 
-import Lexer.Token;
-import Parser.AST.ASTNode;
+import lexer.Token;
+import parser.ast.ASTNode;
 
 import java.util.List;
 
diff --git a/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterModifyColumnNode.java b/sqlTranslate/src/main/java/parser/ast/alterTable/AlterModifyColumnNode.java
similarity index 91%
rename from sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterModifyColumnNode.java
rename to sqlTranslate/src/main/java/parser/ast/alterTable/AlterModifyColumnNode.java
index 2ff319ba..9c321bf4 100644
--- a/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterModifyColumnNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/alterTable/AlterModifyColumnNode.java
@@ -1,8 +1,8 @@
-package Parser.AST.AlterTable;
+package parser.ast.alterTable;
 
-import Interface.DataType;
-import Lexer.Token;
-import Parser.AST.ASTNode;
+import interfaces.DataType;
+import lexer.Token;
+import parser.ast.ASTNode;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterNode.java b/sqlTranslate/src/main/java/parser/ast/alterTable/AlterNode.java
similarity index 84%
rename from sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterNode.java
rename to sqlTranslate/src/main/java/parser/ast/alterTable/AlterNode.java
index 1a770407..192e178c 100644
--- a/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/alterTable/AlterNode.java
@@ -1,7 +1,7 @@
-package Parser.AST.AlterTable;
+package parser.ast.alterTable;
 
-import Lexer.Token;
-import Parser.AST.ASTNode;
+import lexer.Token;
+import parser.ast.ASTNode;
 
 import java.util.List;
 
diff --git a/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterObjNode.java b/sqlTranslate/src/main/java/parser/ast/alterTable/AlterObjNode.java
similarity index 85%
rename from sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterObjNode.java
rename to sqlTranslate/src/main/java/parser/ast/alterTable/AlterObjNode.java
index 5149a0b0..a9d5169f 100644
--- a/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterObjNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/alterTable/AlterObjNode.java
@@ -1,7 +1,7 @@
-package Parser.AST.AlterTable;
+package parser.ast.alterTable;
 
-import Lexer.Token;
-import Parser.AST.ASTNode;
+import lexer.Token;
+import parser.ast.ASTNode;
 
 import java.util.List;
 
diff --git a/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterRenameColumnNode.java b/sqlTranslate/src/main/java/parser/ast/alterTable/AlterRenameColumnNode.java
similarity index 85%
rename from sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterRenameColumnNode.java
rename to sqlTranslate/src/main/java/parser/ast/alterTable/AlterRenameColumnNode.java
index 32a11f4c..27e6b9af 100644
--- a/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterRenameColumnNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/alterTable/AlterRenameColumnNode.java
@@ -1,7 +1,7 @@
-package Parser.AST.AlterTable;
+package parser.ast.alterTable;
 
-import Lexer.Token;
-import Parser.AST.ASTNode;
+import lexer.Token;
+import parser.ast.ASTNode;
 
 import java.util.List;
 
diff --git a/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterRenameTableNode.java b/sqlTranslate/src/main/java/parser/ast/alterTable/AlterRenameTableNode.java
similarity index 85%
rename from sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterRenameTableNode.java
rename to sqlTranslate/src/main/java/parser/ast/alterTable/AlterRenameTableNode.java
index 85a5c652..24242aec 100644
--- a/sqlTranslate/src/main/java/Parser/AST/AlterTable/AlterRenameTableNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/alterTable/AlterRenameTableNode.java
@@ -1,7 +1,7 @@
-package Parser.AST.AlterTable;
+package parser.ast.alterTable;
 
-import Lexer.Token;
-import Parser.AST.ASTNode;
+import lexer.Token;
+import parser.ast.ASTNode;
 
 import java.util.List;
 
diff --git a/sqlTranslate/src/main/java/Parser/AST/CaseWhen/CaseConditionNode.java b/sqlTranslate/src/main/java/parser/ast/caseWhen/CaseConditionNode.java
similarity index 86%
rename from sqlTranslate/src/main/java/Parser/AST/CaseWhen/CaseConditionNode.java
rename to sqlTranslate/src/main/java/parser/ast/caseWhen/CaseConditionNode.java
index ae1e5cbb..1ef2e66c 100644
--- a/sqlTranslate/src/main/java/Parser/AST/CaseWhen/CaseConditionNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/caseWhen/CaseConditionNode.java
@@ -1,7 +1,7 @@
-package Parser.AST.CaseWhen;
+package parser.ast.caseWhen;
 
-import Lexer.Token;
-import Parser.AST.ASTNode;
+import lexer.Token;
+import parser.ast.ASTNode;
 
 import java.util.List;
 
diff --git a/sqlTranslate/src/main/java/Parser/AST/CaseWhen/CaseElseNode.java b/sqlTranslate/src/main/java/parser/ast/caseWhen/CaseElseNode.java
similarity index 85%
rename from sqlTranslate/src/main/java/Parser/AST/CaseWhen/CaseElseNode.java
rename to sqlTranslate/src/main/java/parser/ast/caseWhen/CaseElseNode.java
index bed97fc8..26930498 100644
--- a/sqlTranslate/src/main/java/Parser/AST/CaseWhen/CaseElseNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/caseWhen/CaseElseNode.java
@@ -1,7 +1,7 @@
-package Parser.AST.CaseWhen;
+package parser.ast.caseWhen;
 
-import Lexer.Token;
-import Parser.AST.ASTNode;
+import lexer.Token;
+import parser.ast.ASTNode;
 
 import java.util.List;
 
diff --git a/sqlTranslate/src/main/java/Parser/AST/CaseWhen/CaseEndNode.java b/sqlTranslate/src/main/java/parser/ast/caseWhen/CaseEndNode.java
similarity index 85%
rename from sqlTranslate/src/main/java/Parser/AST/CaseWhen/CaseEndNode.java
rename to sqlTranslate/src/main/java/parser/ast/caseWhen/CaseEndNode.java
index 927cc51b..cb1ec2f5 100644
--- a/sqlTranslate/src/main/java/Parser/AST/CaseWhen/CaseEndNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/caseWhen/CaseEndNode.java
@@ -1,7 +1,7 @@
-package Parser.AST.CaseWhen;
+package parser.ast.caseWhen;
 
-import Lexer.Token;
-import Parser.AST.ASTNode;
+import lexer.Token;
+import parser.ast.ASTNode;
 
 import java.util.List;
 
diff --git a/sqlTranslate/src/main/java/Parser/AST/CaseWhen/CaseThenNode.java b/sqlTranslate/src/main/java/parser/ast/caseWhen/CaseThenNode.java
similarity index 85%
rename from sqlTranslate/src/main/java/Parser/AST/CaseWhen/CaseThenNode.java
rename to sqlTranslate/src/main/java/parser/ast/caseWhen/CaseThenNode.java
index 1e09241e..3690cf64 100644
--- a/sqlTranslate/src/main/java/Parser/AST/CaseWhen/CaseThenNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/caseWhen/CaseThenNode.java
@@ -1,7 +1,7 @@
-package Parser.AST.CaseWhen;
+package parser.ast.caseWhen;
 
-import Lexer.Token;
-import Parser.AST.ASTNode;
+import lexer.Token;
+import parser.ast.ASTNode;
 
 import java.util.List;
 
diff --git a/sqlTranslate/src/main/java/Parser/AST/CreateTable/CRTEndNode.java b/sqlTranslate/src/main/java/parser/ast/createTable/CRTEndNode.java
similarity index 84%
rename from sqlTranslate/src/main/java/Parser/AST/CreateTable/CRTEndNode.java
rename to sqlTranslate/src/main/java/parser/ast/createTable/CRTEndNode.java
index 01db870e..4822fe10 100644
--- a/sqlTranslate/src/main/java/Parser/AST/CreateTable/CRTEndNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/createTable/CRTEndNode.java
@@ -1,6 +1,6 @@
-package Parser.AST.CreateTable;
-import Lexer.Token;
-import Parser.AST.ASTNode;
+package parser.ast.createTable;
+import lexer.Token;
+import parser.ast.ASTNode;
 
 import java.util.List;
 
diff --git a/sqlTranslate/src/main/java/Parser/AST/CreateTable/ColumnNode.java b/sqlTranslate/src/main/java/parser/ast/createTable/ColumnNode.java
similarity index 93%
rename from sqlTranslate/src/main/java/Parser/AST/CreateTable/ColumnNode.java
rename to sqlTranslate/src/main/java/parser/ast/createTable/ColumnNode.java
index 1bd8ad17..3a49b6ce 100644
--- a/sqlTranslate/src/main/java/Parser/AST/CreateTable/ColumnNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/createTable/ColumnNode.java
@@ -1,8 +1,8 @@
-package Parser.AST.CreateTable;
+package parser.ast.createTable;
 
-import Interface.DataType;
-import Lexer.Token;
-import Parser.AST.ASTNode;
+import interfaces.DataType;
+import lexer.Token;
+import parser.ast.ASTNode;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/sqlTranslate/src/main/java/Parser/AST/CreateTable/CreateTabNode.java b/sqlTranslate/src/main/java/parser/ast/createTable/CreateTabNode.java
similarity index 86%
rename from sqlTranslate/src/main/java/Parser/AST/CreateTable/CreateTabNode.java
rename to sqlTranslate/src/main/java/parser/ast/createTable/CreateTabNode.java
index afc7feb0..796dae72 100644
--- a/sqlTranslate/src/main/java/Parser/AST/CreateTable/CreateTabNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/createTable/CreateTabNode.java
@@ -1,7 +1,7 @@
-package Parser.AST.CreateTable;
+package parser.ast.createTable;
 
-import Lexer.Token;
-import Parser.AST.ASTNode;
+import lexer.Token;
+import parser.ast.ASTNode;
 import java.util.List;
 
 public class CreateTabNode extends ASTNode {
diff --git a/sqlTranslate/src/main/java/Parser/AST/CreateTable/TableConstraintNode.java b/sqlTranslate/src/main/java/parser/ast/createTable/TableConstraintNode.java
similarity index 89%
rename from sqlTranslate/src/main/java/Parser/AST/CreateTable/TableConstraintNode.java
rename to sqlTranslate/src/main/java/parser/ast/createTable/TableConstraintNode.java
index 7c370de0..b077c050 100644
--- a/sqlTranslate/src/main/java/Parser/AST/CreateTable/TableConstraintNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/createTable/TableConstraintNode.java
@@ -1,7 +1,7 @@
-package Parser.AST.CreateTable;
+package parser.ast.createTable;
 
-import Lexer.Token;
-import Parser.AST.ASTNode;
+import lexer.Token;
+import parser.ast.ASTNode;
 
 import java.util.List;
 
diff --git a/sqlTranslate/src/main/java/Parser/AST/CreateTable/TableNode.java b/sqlTranslate/src/main/java/parser/ast/createTable/TableNode.java
similarity index 84%
rename from sqlTranslate/src/main/java/Parser/AST/CreateTable/TableNode.java
rename to sqlTranslate/src/main/java/parser/ast/createTable/TableNode.java
index 9f1cd6d3..a6c6644c 100644
--- a/sqlTranslate/src/main/java/Parser/AST/CreateTable/TableNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/createTable/TableNode.java
@@ -1,7 +1,7 @@
-package Parser.AST.CreateTable;
+package parser.ast.createTable;
 
-import Lexer.Token;
-import Parser.AST.ASTNode;
+import lexer.Token;
+import parser.ast.ASTNode;
 
 import java.util.List;
 
diff --git a/sqlTranslate/src/main/java/Parser/AST/CreateTable/TableTypeNode.java b/sqlTranslate/src/main/java/parser/ast/createTable/TableTypeNode.java
similarity index 85%
rename from sqlTranslate/src/main/java/Parser/AST/CreateTable/TableTypeNode.java
rename to sqlTranslate/src/main/java/parser/ast/createTable/TableTypeNode.java
index 73de827f..5188539f 100644
--- a/sqlTranslate/src/main/java/Parser/AST/CreateTable/TableTypeNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/createTable/TableTypeNode.java
@@ -1,7 +1,7 @@
-package Parser.AST.CreateTable;
+package parser.ast.createTable;
 
-import Lexer.Token;
-import Parser.AST.ASTNode;
+import lexer.Token;
+import parser.ast.ASTNode;
 
 import java.util.List;
 
diff --git a/sqlTranslate/src/main/java/Parser/AST/Delete/DeleteConditionNode.java b/sqlTranslate/src/main/java/parser/ast/delete/DeleteConditionNode.java
similarity index 86%
rename from sqlTranslate/src/main/java/Parser/AST/Delete/DeleteConditionNode.java
rename to sqlTranslate/src/main/java/parser/ast/delete/DeleteConditionNode.java
index 1d8dae88..34bb43f6 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Delete/DeleteConditionNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/delete/DeleteConditionNode.java
@@ -1,7 +1,7 @@
-package Parser.AST.Delete;
+package parser.ast.delete;
 
-import Lexer.Token;
-import Parser.AST.ASTNode;
+import lexer.Token;
+import parser.ast.ASTNode;
 
 import java.util.List;
 
diff --git a/sqlTranslate/src/main/java/Parser/AST/Delete/DeleteEndNode.java b/sqlTranslate/src/main/java/parser/ast/delete/DeleteEndNode.java
similarity index 85%
rename from sqlTranslate/src/main/java/Parser/AST/Delete/DeleteEndNode.java
rename to sqlTranslate/src/main/java/parser/ast/delete/DeleteEndNode.java
index 0b21940c..e128f115 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Delete/DeleteEndNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/delete/DeleteEndNode.java
@@ -1,7 +1,7 @@
-package Parser.AST.Delete;
+package parser.ast.delete;
 
-import Lexer.Token;
-import Parser.AST.ASTNode;
+import lexer.Token;
+import parser.ast.ASTNode;
 
 import java.util.List;
 
diff --git a/sqlTranslate/src/main/java/Parser/AST/Delete/DeleteNode.java b/sqlTranslate/src/main/java/parser/ast/delete/DeleteNode.java
similarity index 85%
rename from sqlTranslate/src/main/java/Parser/AST/Delete/DeleteNode.java
rename to sqlTranslate/src/main/java/parser/ast/delete/DeleteNode.java
index a9496e6a..499b343d 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Delete/DeleteNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/delete/DeleteNode.java
@@ -1,7 +1,7 @@
-package Parser.AST.Delete;
+package parser.ast.delete;
 
-import Lexer.Token;
-import Parser.AST.ASTNode;
+import lexer.Token;
+import parser.ast.ASTNode;
 
 import java.util.List;
 
diff --git a/sqlTranslate/src/main/java/Parser/AST/Delete/DeleteObjNode.java b/sqlTranslate/src/main/java/parser/ast/delete/DeleteObjNode.java
similarity index 85%
rename from sqlTranslate/src/main/java/Parser/AST/Delete/DeleteObjNode.java
rename to sqlTranslate/src/main/java/parser/ast/delete/DeleteObjNode.java
index e8fbd54b..8e29c302 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Delete/DeleteObjNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/delete/DeleteObjNode.java
@@ -1,7 +1,7 @@
-package Parser.AST.Delete;
+package parser.ast.delete;
 
-import Lexer.Token;
-import Parser.AST.ASTNode;
+import lexer.Token;
+import parser.ast.ASTNode;
 
 import java.util.List;
 
diff --git a/sqlTranslate/src/main/java/Parser/AST/Drop/DropEndNode.java b/sqlTranslate/src/main/java/parser/ast/drop/DropEndNode.java
similarity index 85%
rename from sqlTranslate/src/main/java/Parser/AST/Drop/DropEndNode.java
rename to sqlTranslate/src/main/java/parser/ast/drop/DropEndNode.java
index 25e40b27..690896f7 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Drop/DropEndNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/drop/DropEndNode.java
@@ -1,7 +1,7 @@
-package Parser.AST.Drop;
+package parser.ast.drop;
 
-import Lexer.Token;
-import Parser.AST.ASTNode;
+import lexer.Token;
+import parser.ast.ASTNode;
 import java.util.List;
 
 public class DropEndNode extends ASTNode {
diff --git a/sqlTranslate/src/main/java/Parser/AST/Drop/DropNode.java b/sqlTranslate/src/main/java/parser/ast/drop/DropNode.java
similarity index 86%
rename from sqlTranslate/src/main/java/Parser/AST/Drop/DropNode.java
rename to sqlTranslate/src/main/java/parser/ast/drop/DropNode.java
index 6ed93096..f6cf18ec 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Drop/DropNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/drop/DropNode.java
@@ -1,7 +1,7 @@
-package Parser.AST.Drop;
+package parser.ast.drop;
 
-import Lexer.Token;
-import Parser.AST.ASTNode;
+import lexer.Token;
+import parser.ast.ASTNode;
 import java.util.List;
 
 public class DropNode extends ASTNode {
diff --git a/sqlTranslate/src/main/java/Parser/AST/Drop/DropObjNameNode.java b/sqlTranslate/src/main/java/parser/ast/drop/DropObjNameNode.java
similarity index 86%
rename from sqlTranslate/src/main/java/Parser/AST/Drop/DropObjNameNode.java
rename to sqlTranslate/src/main/java/parser/ast/drop/DropObjNameNode.java
index 3fb4e88a..09ac982c 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Drop/DropObjNameNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/drop/DropObjNameNode.java
@@ -1,7 +1,7 @@
-package Parser.AST.Drop;
+package parser.ast.drop;
 
-import Lexer.Token;
-import Parser.AST.ASTNode;
+import lexer.Token;
+import parser.ast.ASTNode;
 import java.util.List;
 
 public class DropObjNameNode extends ASTNode {
diff --git a/sqlTranslate/src/main/java/Parser/AST/Drop/DropOptionNode.java b/sqlTranslate/src/main/java/parser/ast/drop/DropOptionNode.java
similarity index 86%
rename from sqlTranslate/src/main/java/Parser/AST/Drop/DropOptionNode.java
rename to sqlTranslate/src/main/java/parser/ast/drop/DropOptionNode.java
index 30d0ed42..67ba5224 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Drop/DropOptionNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/drop/DropOptionNode.java
@@ -1,7 +1,7 @@
-package Parser.AST.Drop;
+package parser.ast.drop;
 
-import Lexer.Token;
-import Parser.AST.ASTNode;
+import lexer.Token;
+import parser.ast.ASTNode;
 
 import java.util.List;
 
diff --git a/sqlTranslate/src/main/java/Parser/AST/Exception/CustomExceptionNode.java b/sqlTranslate/src/main/java/parser/ast/exception/CustomExceptionNode.java
similarity index 88%
rename from sqlTranslate/src/main/java/Parser/AST/Exception/CustomExceptionNode.java
rename to sqlTranslate/src/main/java/parser/ast/exception/CustomExceptionNode.java
index 4ac33083..4207a4cd 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Exception/CustomExceptionNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/exception/CustomExceptionNode.java
@@ -1,7 +1,7 @@
-package Parser.AST.Exception;
+package parser.ast.exception;
 
-import Lexer.Token;
-import Parser.AST.ASTNode;
+import lexer.Token;
+import parser.ast.ASTNode;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/sqlTranslate/src/main/java/Parser/AST/Exception/ExceptionActionNode.java b/sqlTranslate/src/main/java/parser/ast/exception/ExceptionActionNode.java
similarity index 88%
rename from sqlTranslate/src/main/java/Parser/AST/Exception/ExceptionActionNode.java
rename to sqlTranslate/src/main/java/parser/ast/exception/ExceptionActionNode.java
index 9665acd4..0b2d206d 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Exception/ExceptionActionNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/exception/ExceptionActionNode.java
@@ -1,7 +1,7 @@
-package Parser.AST.Exception;
+package parser.ast.exception;
 
-import Lexer.Token;
-import Parser.AST.ASTNode;
+import lexer.Token;
+import parser.ast.ASTNode;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/sqlTranslate/src/main/java/Parser/AST/Exception/ExceptionEndNode.java b/sqlTranslate/src/main/java/parser/ast/exception/ExceptionEndNode.java
similarity index 88%
rename from sqlTranslate/src/main/java/Parser/AST/Exception/ExceptionEndNode.java
rename to sqlTranslate/src/main/java/parser/ast/exception/ExceptionEndNode.java
index 42c3dd4b..fca56c9f 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Exception/ExceptionEndNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/exception/ExceptionEndNode.java
@@ -1,7 +1,7 @@
-package Parser.AST.Exception;
+package parser.ast.exception;
 
-import Lexer.Token;
-import Parser.AST.ASTNode;
+import lexer.Token;
+import parser.ast.ASTNode;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/sqlTranslate/src/main/java/Parser/AST/Exception/ExceptionNode.java b/sqlTranslate/src/main/java/parser/ast/exception/ExceptionNode.java
similarity index 88%
rename from sqlTranslate/src/main/java/Parser/AST/Exception/ExceptionNode.java
rename to sqlTranslate/src/main/java/parser/ast/exception/ExceptionNode.java
index 100833be..9c83f1d2 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Exception/ExceptionNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/exception/ExceptionNode.java
@@ -1,7 +1,7 @@
-package Parser.AST.Exception;
+package parser.ast.exception;
 
-import Lexer.Token;
-import Parser.AST.ASTNode;
+import lexer.Token;
+import parser.ast.ASTNode;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/sqlTranslate/src/main/java/Parser/AST/Exception/Invalid_numberNode.java b/sqlTranslate/src/main/java/parser/ast/exception/Invalid_numberNode.java
similarity index 88%
rename from sqlTranslate/src/main/java/Parser/AST/Exception/Invalid_numberNode.java
rename to sqlTranslate/src/main/java/parser/ast/exception/Invalid_numberNode.java
index 0a404522..cbecad46 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Exception/Invalid_numberNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/exception/Invalid_numberNode.java
@@ -1,7 +1,7 @@
-package Parser.AST.Exception;
+package parser.ast.exception;
 
-import Lexer.Token;
-import Parser.AST.ASTNode;
+import lexer.Token;
+import parser.ast.ASTNode;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/sqlTranslate/src/main/java/Parser/AST/Exception/OtherExceptionNode.java b/sqlTranslate/src/main/java/parser/ast/exception/OtherExceptionNode.java
similarity index 88%
rename from sqlTranslate/src/main/java/Parser/AST/Exception/OtherExceptionNode.java
rename to sqlTranslate/src/main/java/parser/ast/exception/OtherExceptionNode.java
index 4dbd5596..df585216 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Exception/OtherExceptionNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/exception/OtherExceptionNode.java
@@ -1,7 +1,7 @@
-package Parser.AST.Exception;
+package parser.ast.exception;
 
-import Lexer.Token;
-import Parser.AST.ASTNode;
+import lexer.Token;
+import parser.ast.ASTNode;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/sqlTranslate/src/main/java/Parser/AST/Exception/Zero_divideNode.java b/sqlTranslate/src/main/java/parser/ast/exception/Zero_divideNode.java
similarity index 88%
rename from sqlTranslate/src/main/java/Parser/AST/Exception/Zero_divideNode.java
rename to sqlTranslate/src/main/java/parser/ast/exception/Zero_divideNode.java
index 0b79158d..54d635a1 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Exception/Zero_divideNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/exception/Zero_divideNode.java
@@ -1,7 +1,7 @@
-package Parser.AST.Exception;
+package parser.ast.exception;
 
-import Lexer.Token;
-import Parser.AST.ASTNode;
+import lexer.Token;
+import parser.ast.ASTNode;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/sqlTranslate/src/main/java/Parser/AST/Function/FunctionBeginNode.java b/sqlTranslate/src/main/java/parser/ast/function/FunctionBeginNode.java
similarity index 88%
rename from sqlTranslate/src/main/java/Parser/AST/Function/FunctionBeginNode.java
rename to sqlTranslate/src/main/java/parser/ast/function/FunctionBeginNode.java
index 4d6e4076..77a564c7 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Function/FunctionBeginNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/function/FunctionBeginNode.java
@@ -1,7 +1,7 @@
-package Parser.AST.Function;
+package parser.ast.function;
 
-import Lexer.Token;
-import Parser.AST.ASTNode;
+import lexer.Token;
+import parser.ast.ASTNode;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/sqlTranslate/src/main/java/Parser/AST/Function/FunctionBodyNode.java b/sqlTranslate/src/main/java/parser/ast/function/FunctionBodyNode.java
similarity index 88%
rename from sqlTranslate/src/main/java/Parser/AST/Function/FunctionBodyNode.java
rename to sqlTranslate/src/main/java/parser/ast/function/FunctionBodyNode.java
index 3796a182..a813da85 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Function/FunctionBodyNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/function/FunctionBodyNode.java
@@ -1,7 +1,7 @@
-package Parser.AST.Function;
+package parser.ast.function;
 
-import Lexer.Token;
-import Parser.AST.ASTNode;
+import lexer.Token;
+import parser.ast.ASTNode;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/sqlTranslate/src/main/java/Parser/AST/Function/FunctionColumnNode.java b/sqlTranslate/src/main/java/parser/ast/function/FunctionColumnNode.java
similarity index 95%
rename from sqlTranslate/src/main/java/Parser/AST/Function/FunctionColumnNode.java
rename to sqlTranslate/src/main/java/parser/ast/function/FunctionColumnNode.java
index 0cefba2b..c5090015 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Function/FunctionColumnNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/function/FunctionColumnNode.java
@@ -1,8 +1,8 @@
-package Parser.AST.Function;
+package parser.ast.function;
 
-import Interface.DataType;
-import Lexer.Token;
-import Parser.AST.ASTNode;
+import interfaces.DataType;
+import lexer.Token;
+import parser.ast.ASTNode;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/sqlTranslate/src/main/java/Parser/AST/Function/FunctionEndNode.java b/sqlTranslate/src/main/java/parser/ast/function/FunctionEndNode.java
similarity index 88%
rename from sqlTranslate/src/main/java/Parser/AST/Function/FunctionEndNode.java
rename to sqlTranslate/src/main/java/parser/ast/function/FunctionEndNode.java
index ef36e4da..bf9f9c65 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Function/FunctionEndNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/function/FunctionEndNode.java
@@ -1,7 +1,7 @@
-package Parser.AST.Function;
+package parser.ast.function;
 
-import Lexer.Token;
-import Parser.AST.ASTNode;
+import lexer.Token;
+import parser.ast.ASTNode;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/sqlTranslate/src/main/java/Parser/AST/Function/FunctionNameNode.java b/sqlTranslate/src/main/java/parser/ast/function/FunctionNameNode.java
similarity index 88%
rename from sqlTranslate/src/main/java/Parser/AST/Function/FunctionNameNode.java
rename to sqlTranslate/src/main/java/parser/ast/function/FunctionNameNode.java
index f5defc46..b8548ee5 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Function/FunctionNameNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/function/FunctionNameNode.java
@@ -1,7 +1,7 @@
-package Parser.AST.Function;
+package parser.ast.function;
 
-import Lexer.Token;
-import Parser.AST.ASTNode;
+import lexer.Token;
+import parser.ast.ASTNode;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/sqlTranslate/src/main/java/Parser/AST/Function/FunctionNode.java b/sqlTranslate/src/main/java/parser/ast/function/FunctionNode.java
similarity index 88%
rename from sqlTranslate/src/main/java/Parser/AST/Function/FunctionNode.java
rename to sqlTranslate/src/main/java/parser/ast/function/FunctionNode.java
index f1564ed1..6e2de6e6 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Function/FunctionNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/function/FunctionNode.java
@@ -1,7 +1,7 @@
-package Parser.AST.Function;
+package parser.ast.function;
 
-import Lexer.Token;
-import Parser.AST.ASTNode;
+import lexer.Token;
+import parser.ast.ASTNode;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/sqlTranslate/src/main/java/Parser/AST/Function/FunctionRetDefNode.java b/sqlTranslate/src/main/java/parser/ast/function/FunctionRetDefNode.java
similarity index 91%
rename from sqlTranslate/src/main/java/Parser/AST/Function/FunctionRetDefNode.java
rename to sqlTranslate/src/main/java/parser/ast/function/FunctionRetDefNode.java
index dd0b294a..73723d2b 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Function/FunctionRetDefNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/function/FunctionRetDefNode.java
@@ -1,8 +1,8 @@
-package Parser.AST.Function;
+package parser.ast.function;
 
-import Interface.DataType;
-import Lexer.Token;
-import Parser.AST.ASTNode;
+import interfaces.DataType;
+import lexer.Token;
+import parser.ast.ASTNode;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/sqlTranslate/src/main/java/Parser/AST/Function/FunctionReturnNode.java b/sqlTranslate/src/main/java/parser/ast/function/FunctionReturnNode.java
similarity index 88%
rename from sqlTranslate/src/main/java/Parser/AST/Function/FunctionReturnNode.java
rename to sqlTranslate/src/main/java/parser/ast/function/FunctionReturnNode.java
index bd29139c..7f56ba5c 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Function/FunctionReturnNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/function/FunctionReturnNode.java
@@ -1,7 +1,7 @@
-package Parser.AST.Function;
+package parser.ast.function;
 
-import Lexer.Token;
-import Parser.AST.ASTNode;
+import lexer.Token;
+import parser.ast.ASTNode;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/sqlTranslate/src/main/java/Parser/AST/IFELSIF/ELSENode.java b/sqlTranslate/src/main/java/parser/ast/iFELSIF/ELSENode.java
similarity index 88%
rename from sqlTranslate/src/main/java/Parser/AST/IFELSIF/ELSENode.java
rename to sqlTranslate/src/main/java/parser/ast/iFELSIF/ELSENode.java
index d14c3d61..92e97068 100644
--- a/sqlTranslate/src/main/java/Parser/AST/IFELSIF/ELSENode.java
+++ b/sqlTranslate/src/main/java/parser/ast/iFELSIF/ELSENode.java
@@ -1,7 +1,7 @@
-package Parser.AST.IFELSIF;
+package parser.ast.iFELSIF;
 
-import Lexer.Token;
-import Parser.AST.ASTNode;
+import lexer.Token;
+import parser.ast.ASTNode;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/sqlTranslate/src/main/java/Parser/AST/IFELSIF/ELSIFActionNode.java b/sqlTranslate/src/main/java/parser/ast/iFELSIF/ELSIFActionNode.java
similarity index 88%
rename from sqlTranslate/src/main/java/Parser/AST/IFELSIF/ELSIFActionNode.java
rename to sqlTranslate/src/main/java/parser/ast/iFELSIF/ELSIFActionNode.java
index 2d88be55..006ecba5 100644
--- a/sqlTranslate/src/main/java/Parser/AST/IFELSIF/ELSIFActionNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/iFELSIF/ELSIFActionNode.java
@@ -1,7 +1,7 @@
-package Parser.AST.IFELSIF;
+package parser.ast.iFELSIF;
 
-import Lexer.Token;
-import Parser.AST.ASTNode;
+import lexer.Token;
+import parser.ast.ASTNode;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/sqlTranslate/src/main/java/Parser/AST/IFELSIF/ELSIFConditionNode.java b/sqlTranslate/src/main/java/parser/ast/iFELSIF/ELSIFConditionNode.java
similarity index 88%
rename from sqlTranslate/src/main/java/Parser/AST/IFELSIF/ELSIFConditionNode.java
rename to sqlTranslate/src/main/java/parser/ast/iFELSIF/ELSIFConditionNode.java
index d0a2a1c1..0eb26dba 100644
--- a/sqlTranslate/src/main/java/Parser/AST/IFELSIF/ELSIFConditionNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/iFELSIF/ELSIFConditionNode.java
@@ -1,7 +1,7 @@
-package Parser.AST.IFELSIF;
+package parser.ast.iFELSIF;
 
-import Lexer.Token;
-import Parser.AST.ASTNode;
+import lexer.Token;
+import parser.ast.ASTNode;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/sqlTranslate/src/main/java/Parser/AST/IFELSIF/EndIFNode.java b/sqlTranslate/src/main/java/parser/ast/iFELSIF/EndIFNode.java
similarity index 88%
rename from sqlTranslate/src/main/java/Parser/AST/IFELSIF/EndIFNode.java
rename to sqlTranslate/src/main/java/parser/ast/iFELSIF/EndIFNode.java
index bb39895d..ee19eec1 100644
--- a/sqlTranslate/src/main/java/Parser/AST/IFELSIF/EndIFNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/iFELSIF/EndIFNode.java
@@ -1,7 +1,7 @@
-package Parser.AST.IFELSIF;
+package parser.ast.iFELSIF;
 
-import Lexer.Token;
-import Parser.AST.ASTNode;
+import lexer.Token;
+import parser.ast.ASTNode;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/sqlTranslate/src/main/java/Parser/AST/IFELSIF/IFActionNode.java b/sqlTranslate/src/main/java/parser/ast/iFELSIF/IFActionNode.java
similarity index 88%
rename from sqlTranslate/src/main/java/Parser/AST/IFELSIF/IFActionNode.java
rename to sqlTranslate/src/main/java/parser/ast/iFELSIF/IFActionNode.java
index e6ca67d1..ffa3e5d2 100644
--- a/sqlTranslate/src/main/java/Parser/AST/IFELSIF/IFActionNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/iFELSIF/IFActionNode.java
@@ -1,7 +1,7 @@
-package Parser.AST.IFELSIF;
+package parser.ast.iFELSIF;
 
-import Lexer.Token;
-import Parser.AST.ASTNode;
+import lexer.Token;
+import parser.ast.ASTNode;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/sqlTranslate/src/main/java/Parser/AST/IFELSIF/IFConditionNode.java b/sqlTranslate/src/main/java/parser/ast/iFELSIF/IFConditionNode.java
similarity index 88%
rename from sqlTranslate/src/main/java/Parser/AST/IFELSIF/IFConditionNode.java
rename to sqlTranslate/src/main/java/parser/ast/iFELSIF/IFConditionNode.java
index 12b392ca..2d9a2a34 100644
--- a/sqlTranslate/src/main/java/Parser/AST/IFELSIF/IFConditionNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/iFELSIF/IFConditionNode.java
@@ -1,7 +1,7 @@
-package Parser.AST.IFELSIF;
+package parser.ast.iFELSIF;
 
-import Lexer.Token;
-import Parser.AST.ASTNode;
+import lexer.Token;
+import parser.ast.ASTNode;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/sqlTranslate/src/main/java/Parser/AST/Insert/InsertDataNode.java b/sqlTranslate/src/main/java/parser/ast/insert/InsertDataNode.java
similarity index 85%
rename from sqlTranslate/src/main/java/Parser/AST/Insert/InsertDataNode.java
rename to sqlTranslate/src/main/java/parser/ast/insert/InsertDataNode.java
index 79bfef1a..f7b41919 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Insert/InsertDataNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/insert/InsertDataNode.java
@@ -1,7 +1,7 @@
-package Parser.AST.Insert;
+package parser.ast.insert;
 
-import Lexer.Token;
-import Parser.AST.ASTNode;
+import lexer.Token;
+import parser.ast.ASTNode;
 import java.util.List;
 
 public class InsertDataNode extends ASTNode {
diff --git a/sqlTranslate/src/main/java/Parser/AST/Insert/InsertEndNode.java b/sqlTranslate/src/main/java/parser/ast/insert/InsertEndNode.java
similarity index 85%
rename from sqlTranslate/src/main/java/Parser/AST/Insert/InsertEndNode.java
rename to sqlTranslate/src/main/java/parser/ast/insert/InsertEndNode.java
index 855800d8..df72f2ac 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Insert/InsertEndNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/insert/InsertEndNode.java
@@ -1,7 +1,7 @@
-package Parser.AST.Insert;
+package parser.ast.insert;
 
-import Lexer.Token;
-import Parser.AST.ASTNode;
+import lexer.Token;
+import parser.ast.ASTNode;
 import java.util.List;
 
 public class InsertEndNode extends ASTNode {
diff --git a/sqlTranslate/src/main/java/Parser/AST/Insert/InsertNode.java b/sqlTranslate/src/main/java/parser/ast/insert/InsertNode.java
similarity index 86%
rename from sqlTranslate/src/main/java/Parser/AST/Insert/InsertNode.java
rename to sqlTranslate/src/main/java/parser/ast/insert/InsertNode.java
index fec1b697..cc73161b 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Insert/InsertNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/insert/InsertNode.java
@@ -1,7 +1,7 @@
-package Parser.AST.Insert;
+package parser.ast.insert;
 
-import Lexer.Token;
-import Parser.AST.ASTNode;
+import lexer.Token;
+import parser.ast.ASTNode;
 import java.util.List;
 
 public class InsertNode extends ASTNode {
diff --git a/sqlTranslate/src/main/java/Parser/AST/Insert/InsertObjNode.java b/sqlTranslate/src/main/java/parser/ast/insert/InsertObjNode.java
similarity index 85%
rename from sqlTranslate/src/main/java/Parser/AST/Insert/InsertObjNode.java
rename to sqlTranslate/src/main/java/parser/ast/insert/InsertObjNode.java
index da42b78b..b9bde4d3 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Insert/InsertObjNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/insert/InsertObjNode.java
@@ -1,7 +1,7 @@
-package Parser.AST.Insert;
+package parser.ast.insert;
 
-import Lexer.Token;
-import Parser.AST.ASTNode;
+import lexer.Token;
+import parser.ast.ASTNode;
 import java.util.List;
 
 public class InsertObjNode extends ASTNode{
diff --git a/sqlTranslate/src/main/java/Parser/AST/Join/JoinConditionNode.java b/sqlTranslate/src/main/java/parser/ast/join/JoinConditionNode.java
similarity index 91%
rename from sqlTranslate/src/main/java/Parser/AST/Join/JoinConditionNode.java
rename to sqlTranslate/src/main/java/parser/ast/join/JoinConditionNode.java
index 413dff0e..7bad80ac 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Join/JoinConditionNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/join/JoinConditionNode.java
@@ -1,7 +1,7 @@
-package Parser.AST.Join;
+package parser.ast.join;
 
-import Lexer.Token;
-import Parser.AST.ASTNode;
+import lexer.Token;
+import parser.ast.ASTNode;
 import java.util.List;
 
 public class JoinConditionNode extends ASTNode {
diff --git a/sqlTranslate/src/main/java/Parser/AST/Join/JoinEndNode.java b/sqlTranslate/src/main/java/parser/ast/join/JoinEndNode.java
similarity index 87%
rename from sqlTranslate/src/main/java/Parser/AST/Join/JoinEndNode.java
rename to sqlTranslate/src/main/java/parser/ast/join/JoinEndNode.java
index 96e252c6..ce0de853 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Join/JoinEndNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/join/JoinEndNode.java
@@ -1,7 +1,7 @@
-package Parser.AST.Join;
+package parser.ast.join;
 
-import Lexer.Token;
-import Parser.AST.ASTNode;
+import lexer.Token;
+import parser.ast.ASTNode;
 import java.util.List;
 
 public class JoinEndNode extends ASTNode {
diff --git a/sqlTranslate/src/main/java/Parser/AST/Join/JoinSourceTabNode.java b/sqlTranslate/src/main/java/parser/ast/join/JoinSourceTabNode.java
similarity index 86%
rename from sqlTranslate/src/main/java/Parser/AST/Join/JoinSourceTabNode.java
rename to sqlTranslate/src/main/java/parser/ast/join/JoinSourceTabNode.java
index 1a07b676..6ae208db 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Join/JoinSourceTabNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/join/JoinSourceTabNode.java
@@ -1,7 +1,7 @@
-package Parser.AST.Join;
+package parser.ast.join;
 
-import Lexer.Token;
-import Parser.AST.ASTNode;
+import lexer.Token;
+import parser.ast.ASTNode;
 import java.util.List;
 
 public class JoinSourceTabNode extends ASTNode {
diff --git a/sqlTranslate/src/main/java/Parser/AST/Join/JoinTargetTabNode.java b/sqlTranslate/src/main/java/parser/ast/join/JoinTargetTabNode.java
similarity index 86%
rename from sqlTranslate/src/main/java/Parser/AST/Join/JoinTargetTabNode.java
rename to sqlTranslate/src/main/java/parser/ast/join/JoinTargetTabNode.java
index e4becba2..434e4532 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Join/JoinTargetTabNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/join/JoinTargetTabNode.java
@@ -1,7 +1,7 @@
-package Parser.AST.Join;
+package parser.ast.join;
 
-import Lexer.Token;
-import Parser.AST.ASTNode;
+import lexer.Token;
+import parser.ast.ASTNode;
 import java.util.List;
 
 public class JoinTargetTabNode extends ASTNode {
diff --git a/sqlTranslate/src/main/java/Parser/AST/Join/JoinTypeNode.java b/sqlTranslate/src/main/java/parser/ast/join/JoinTypeNode.java
similarity index 86%
rename from sqlTranslate/src/main/java/Parser/AST/Join/JoinTypeNode.java
rename to sqlTranslate/src/main/java/parser/ast/join/JoinTypeNode.java
index 9d559069..712716b8 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Join/JoinTypeNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/join/JoinTypeNode.java
@@ -1,7 +1,7 @@
-package Parser.AST.Join;
+package parser.ast.join;
 
-import Lexer.Token;
-import Parser.AST.ASTNode;
+import lexer.Token;
+import parser.ast.ASTNode;
 import java.util.List;
 
 public class JoinTypeNode extends ASTNode {
diff --git a/sqlTranslate/src/main/java/Parser/AST/Loop/ForNode.java b/sqlTranslate/src/main/java/parser/ast/loop/ForNode.java
similarity index 88%
rename from sqlTranslate/src/main/java/Parser/AST/Loop/ForNode.java
rename to sqlTranslate/src/main/java/parser/ast/loop/ForNode.java
index 357e1725..1fb73848 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Loop/ForNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/loop/ForNode.java
@@ -1,7 +1,7 @@
-package Parser.AST.Loop;
+package parser.ast.loop;
 
-import Lexer.Token;
-import Parser.AST.ASTNode;
+import lexer.Token;
+import parser.ast.ASTNode;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/sqlTranslate/src/main/java/Parser/AST/Loop/LoopBodyNode.java b/sqlTranslate/src/main/java/parser/ast/loop/LoopBodyNode.java
similarity index 88%
rename from sqlTranslate/src/main/java/Parser/AST/Loop/LoopBodyNode.java
rename to sqlTranslate/src/main/java/parser/ast/loop/LoopBodyNode.java
index 28655c4d..d2a0a43c 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Loop/LoopBodyNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/loop/LoopBodyNode.java
@@ -1,7 +1,7 @@
-package Parser.AST.Loop;
+package parser.ast.loop;
 
-import Lexer.Token;
-import Parser.AST.ASTNode;
+import lexer.Token;
+import parser.ast.ASTNode;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/sqlTranslate/src/main/java/Parser/AST/Loop/LoopEndNode.java b/sqlTranslate/src/main/java/parser/ast/loop/LoopEndNode.java
similarity index 88%
rename from sqlTranslate/src/main/java/Parser/AST/Loop/LoopEndNode.java
rename to sqlTranslate/src/main/java/parser/ast/loop/LoopEndNode.java
index abcd3a56..6a0676aa 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Loop/LoopEndNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/loop/LoopEndNode.java
@@ -1,7 +1,7 @@
-package Parser.AST.Loop;
+package parser.ast.loop;
 
-import Lexer.Token;
-import Parser.AST.ASTNode;
+import lexer.Token;
+import parser.ast.ASTNode;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/sqlTranslate/src/main/java/Parser/AST/Loop/LoopExitNode.java b/sqlTranslate/src/main/java/parser/ast/loop/LoopExitNode.java
similarity index 88%
rename from sqlTranslate/src/main/java/Parser/AST/Loop/LoopExitNode.java
rename to sqlTranslate/src/main/java/parser/ast/loop/LoopExitNode.java
index 3311826a..77ee1c91 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Loop/LoopExitNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/loop/LoopExitNode.java
@@ -1,7 +1,7 @@
-package Parser.AST.Loop;
+package parser.ast.loop;
 
-import Lexer.Token;
-import Parser.AST.ASTNode;
+import lexer.Token;
+import parser.ast.ASTNode;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/sqlTranslate/src/main/java/Parser/AST/Loop/LoopNode.java b/sqlTranslate/src/main/java/parser/ast/loop/LoopNode.java
similarity index 88%
rename from sqlTranslate/src/main/java/Parser/AST/Loop/LoopNode.java
rename to sqlTranslate/src/main/java/parser/ast/loop/LoopNode.java
index bd44a6b4..b0bb2c27 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Loop/LoopNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/loop/LoopNode.java
@@ -1,7 +1,7 @@
-package Parser.AST.Loop;
+package parser.ast.loop;
 
-import Lexer.Token;
-import Parser.AST.ASTNode;
+import lexer.Token;
+import parser.ast.ASTNode;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/sqlTranslate/src/main/java/Parser/AST/Loop/WhileNode.java b/sqlTranslate/src/main/java/parser/ast/loop/WhileNode.java
similarity index 88%
rename from sqlTranslate/src/main/java/Parser/AST/Loop/WhileNode.java
rename to sqlTranslate/src/main/java/parser/ast/loop/WhileNode.java
index 31bfdc0b..d354cb17 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Loop/WhileNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/loop/WhileNode.java
@@ -1,7 +1,7 @@
-package Parser.AST.Loop;
+package parser.ast.loop;
 
-import Lexer.Token;
-import Parser.AST.ASTNode;
+import lexer.Token;
+import parser.ast.ASTNode;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/sqlTranslate/src/main/java/Parser/AST/PL/PLBeginNode.java b/sqlTranslate/src/main/java/parser/ast/pl/PLBeginNode.java
similarity index 89%
rename from sqlTranslate/src/main/java/Parser/AST/PL/PLBeginNode.java
rename to sqlTranslate/src/main/java/parser/ast/pl/PLBeginNode.java
index 2f8fa290..b91a1969 100644
--- a/sqlTranslate/src/main/java/Parser/AST/PL/PLBeginNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/pl/PLBeginNode.java
@@ -1,7 +1,7 @@
-package Parser.AST.PL;
+package parser.ast.pl;
 
-import Lexer.Token;
-import Parser.AST.ASTNode;
+import lexer.Token;
+import parser.ast.ASTNode;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/sqlTranslate/src/main/java/Parser/AST/PL/PLBodyNode.java b/sqlTranslate/src/main/java/parser/ast/pl/PLBodyNode.java
similarity index 88%
rename from sqlTranslate/src/main/java/Parser/AST/PL/PLBodyNode.java
rename to sqlTranslate/src/main/java/parser/ast/pl/PLBodyNode.java
index 4bb781f9..3c6e3d8d 100644
--- a/sqlTranslate/src/main/java/Parser/AST/PL/PLBodyNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/pl/PLBodyNode.java
@@ -1,7 +1,7 @@
-package Parser.AST.PL;
+package parser.ast.pl;
 
-import Lexer.Token;
-import Parser.AST.ASTNode;
+import lexer.Token;
+import parser.ast.ASTNode;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/sqlTranslate/src/main/java/Parser/AST/PL/PLDeclareNode.java b/sqlTranslate/src/main/java/parser/ast/pl/PLDeclareNode.java
similarity index 92%
rename from sqlTranslate/src/main/java/Parser/AST/PL/PLDeclareNode.java
rename to sqlTranslate/src/main/java/parser/ast/pl/PLDeclareNode.java
index bd137b0f..4ec9f3ed 100644
--- a/sqlTranslate/src/main/java/Parser/AST/PL/PLDeclareNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/pl/PLDeclareNode.java
@@ -1,8 +1,8 @@
-package Parser.AST.PL;
+package parser.ast.pl;
 
-import Interface.DataType;
-import Lexer.Token;
-import Parser.AST.ASTNode;
+import interfaces.DataType;
+import lexer.Token;
+import parser.ast.ASTNode;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/sqlTranslate/src/main/java/Parser/AST/PL/PLEndNode.java b/sqlTranslate/src/main/java/parser/ast/pl/PLEndNode.java
similarity index 88%
rename from sqlTranslate/src/main/java/Parser/AST/PL/PLEndNode.java
rename to sqlTranslate/src/main/java/parser/ast/pl/PLEndNode.java
index 5d6e3d01..5e1e2d4c 100644
--- a/sqlTranslate/src/main/java/Parser/AST/PL/PLEndNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/pl/PLEndNode.java
@@ -1,7 +1,7 @@
-package Parser.AST.PL;
+package parser.ast.pl;
 
-import Lexer.Token;
-import Parser.AST.ASTNode;
+import lexer.Token;
+import parser.ast.ASTNode;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/sqlTranslate/src/main/java/Parser/AST/PL/PLNode.java b/sqlTranslate/src/main/java/parser/ast/pl/PLNode.java
similarity index 88%
rename from sqlTranslate/src/main/java/Parser/AST/PL/PLNode.java
rename to sqlTranslate/src/main/java/parser/ast/pl/PLNode.java
index fa3d6961..61c04083 100644
--- a/sqlTranslate/src/main/java/Parser/AST/PL/PLNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/pl/PLNode.java
@@ -1,7 +1,7 @@
-package Parser.AST.PL;
+package parser.ast.pl;
 
-import Lexer.Token;
-import Parser.AST.ASTNode;
+import lexer.Token;
+import parser.ast.ASTNode;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/sqlTranslate/src/main/java/Parser/AST/Procedure/ProcedureBeginNode.java b/sqlTranslate/src/main/java/parser/ast/procedure/ProcedureBeginNode.java
similarity index 88%
rename from sqlTranslate/src/main/java/Parser/AST/Procedure/ProcedureBeginNode.java
rename to sqlTranslate/src/main/java/parser/ast/procedure/ProcedureBeginNode.java
index 481e9712..ca144470 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Procedure/ProcedureBeginNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/procedure/ProcedureBeginNode.java
@@ -1,7 +1,7 @@
-package Parser.AST.Procedure;
+package parser.ast.procedure;
 
-import Lexer.Token;
-import Parser.AST.ASTNode;
+import lexer.Token;
+import parser.ast.ASTNode;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/sqlTranslate/src/main/java/Parser/AST/Procedure/ProcedureColumnNode.java b/sqlTranslate/src/main/java/parser/ast/procedure/ProcedureColumnNode.java
similarity index 95%
rename from sqlTranslate/src/main/java/Parser/AST/Procedure/ProcedureColumnNode.java
rename to sqlTranslate/src/main/java/parser/ast/procedure/ProcedureColumnNode.java
index 38a1b5aa..4325d55a 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Procedure/ProcedureColumnNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/procedure/ProcedureColumnNode.java
@@ -1,8 +1,8 @@
-package Parser.AST.Procedure;
+package parser.ast.procedure;
 
-import Interface.DataType;
-import Lexer.Token;
-import Parser.AST.ASTNode;
+import interfaces.DataType;
+import lexer.Token;
+import parser.ast.ASTNode;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/sqlTranslate/src/main/java/Parser/AST/Procedure/ProcedureEndNode.java b/sqlTranslate/src/main/java/parser/ast/procedure/ProcedureEndNode.java
similarity index 88%
rename from sqlTranslate/src/main/java/Parser/AST/Procedure/ProcedureEndNode.java
rename to sqlTranslate/src/main/java/parser/ast/procedure/ProcedureEndNode.java
index 7ebd9d93..44b0b480 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Procedure/ProcedureEndNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/procedure/ProcedureEndNode.java
@@ -1,7 +1,7 @@
-package Parser.AST.Procedure;
+package parser.ast.procedure;
 
-import Lexer.Token;
-import Parser.AST.ASTNode;
+import lexer.Token;
+import parser.ast.ASTNode;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/sqlTranslate/src/main/java/Parser/AST/Procedure/ProcedureNode.java b/sqlTranslate/src/main/java/parser/ast/procedure/ProcedureNode.java
similarity index 88%
rename from sqlTranslate/src/main/java/Parser/AST/Procedure/ProcedureNode.java
rename to sqlTranslate/src/main/java/parser/ast/procedure/ProcedureNode.java
index 9fc3afe0..d7c127e5 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Procedure/ProcedureNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/procedure/ProcedureNode.java
@@ -1,7 +1,7 @@
-package Parser.AST.Procedure;
+package parser.ast.procedure;
 
-import Lexer.Token;
-import Parser.AST.ASTNode;
+import lexer.Token;
+import parser.ast.ASTNode;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/sqlTranslate/src/main/java/Parser/AST/Procedure/ProcedureObjNode.java b/sqlTranslate/src/main/java/parser/ast/procedure/ProcedureObjNode.java
similarity index 88%
rename from sqlTranslate/src/main/java/Parser/AST/Procedure/ProcedureObjNode.java
rename to sqlTranslate/src/main/java/parser/ast/procedure/ProcedureObjNode.java
index eca2e3f4..7f434c2b 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Procedure/ProcedureObjNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/procedure/ProcedureObjNode.java
@@ -1,7 +1,7 @@
-package Parser.AST.Procedure;
+package parser.ast.procedure;
 
-import Lexer.Token;
-import Parser.AST.ASTNode;
+import lexer.Token;
+import parser.ast.ASTNode;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/sqlTranslate/src/main/java/Parser/AST/Procedure/ProcedurePLStatementNode.java b/sqlTranslate/src/main/java/parser/ast/procedure/ProcedurePLStatementNode.java
similarity index 88%
rename from sqlTranslate/src/main/java/Parser/AST/Procedure/ProcedurePLStatementNode.java
rename to sqlTranslate/src/main/java/parser/ast/procedure/ProcedurePLStatementNode.java
index 66a89a58..468052a5 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Procedure/ProcedurePLStatementNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/procedure/ProcedurePLStatementNode.java
@@ -1,7 +1,7 @@
-package Parser.AST.Procedure;
+package parser.ast.procedure;
 
-import Lexer.Token;
-import Parser.AST.ASTNode;
+import lexer.Token;
+import parser.ast.ASTNode;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/sqlTranslate/src/main/java/Parser/AST/Procedure/ProcedureRetDefNode.java b/sqlTranslate/src/main/java/parser/ast/procedure/ProcedureRetDefNode.java
similarity index 92%
rename from sqlTranslate/src/main/java/Parser/AST/Procedure/ProcedureRetDefNode.java
rename to sqlTranslate/src/main/java/parser/ast/procedure/ProcedureRetDefNode.java
index e6915720..7d063145 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Procedure/ProcedureRetDefNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/procedure/ProcedureRetDefNode.java
@@ -1,8 +1,8 @@
-package Parser.AST.Procedure;
+package parser.ast.procedure;
 
-import Lexer.Token;
-import Parser.AST.ASTNode;
-import Interface.DataType;
+import lexer.Token;
+import parser.ast.ASTNode;
+import interfaces.DataType;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/sqlTranslate/src/main/java/Parser/AST/Select/SelectContentNode.java b/sqlTranslate/src/main/java/parser/ast/select/SelectContentNode.java
similarity index 91%
rename from sqlTranslate/src/main/java/Parser/AST/Select/SelectContentNode.java
rename to sqlTranslate/src/main/java/parser/ast/select/SelectContentNode.java
index d8183835..ee93ddca 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Select/SelectContentNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/select/SelectContentNode.java
@@ -1,7 +1,7 @@
-package Parser.AST.Select;
+package parser.ast.select;
 
-import Lexer.Token;
-import Parser.AST.ASTNode;
+import lexer.Token;
+import parser.ast.ASTNode;
 
 import java.util.List;
 
diff --git a/sqlTranslate/src/main/java/Parser/AST/Select/SelectEndNode.java b/sqlTranslate/src/main/java/parser/ast/select/SelectEndNode.java
similarity index 86%
rename from sqlTranslate/src/main/java/Parser/AST/Select/SelectEndNode.java
rename to sqlTranslate/src/main/java/parser/ast/select/SelectEndNode.java
index 3db2798f..514f965a 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Select/SelectEndNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/select/SelectEndNode.java
@@ -1,7 +1,7 @@
-package Parser.AST.Select;
+package parser.ast.select;
 
-import Lexer.Token;
-import Parser.AST.ASTNode;
+import lexer.Token;
+import parser.ast.ASTNode;
 
 import java.util.List;
 
diff --git a/sqlTranslate/src/main/java/Parser/AST/Select/SelectNode.java b/sqlTranslate/src/main/java/parser/ast/select/SelectNode.java
similarity index 86%
rename from sqlTranslate/src/main/java/Parser/AST/Select/SelectNode.java
rename to sqlTranslate/src/main/java/parser/ast/select/SelectNode.java
index a56ade48..d3d4d1cd 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Select/SelectNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/select/SelectNode.java
@@ -1,7 +1,7 @@
-package Parser.AST.Select;
+package parser.ast.select;
 
-import Parser.AST.ASTNode;
-import Lexer.Token;
+import parser.ast.ASTNode;
+import lexer.Token;
 
 import java.util.List;
 
diff --git a/sqlTranslate/src/main/java/Parser/AST/Select/SelectObjNode.java b/sqlTranslate/src/main/java/parser/ast/select/SelectObjNode.java
similarity index 86%
rename from sqlTranslate/src/main/java/Parser/AST/Select/SelectObjNode.java
rename to sqlTranslate/src/main/java/parser/ast/select/SelectObjNode.java
index 1164e571..40d591f4 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Select/SelectObjNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/select/SelectObjNode.java
@@ -1,7 +1,7 @@
-package Parser.AST.Select;
+package parser.ast.select;
 
-import Lexer.Token;
-import Parser.AST.ASTNode;
+import lexer.Token;
+import parser.ast.ASTNode;
 
 import java.util.List;
 
diff --git a/sqlTranslate/src/main/java/Parser/AST/Select/SelectOptionNode.java b/sqlTranslate/src/main/java/parser/ast/select/SelectOptionNode.java
similarity index 86%
rename from sqlTranslate/src/main/java/Parser/AST/Select/SelectOptionNode.java
rename to sqlTranslate/src/main/java/parser/ast/select/SelectOptionNode.java
index a70b71e9..870f975c 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Select/SelectOptionNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/select/SelectOptionNode.java
@@ -1,7 +1,7 @@
-package Parser.AST.Select;
+package parser.ast.select;
 
-import Lexer.Token;
-import Parser.AST.ASTNode;
+import lexer.Token;
+import parser.ast.ASTNode;
 
 import java.util.List;
 
diff --git a/sqlTranslate/src/main/java/Parser/AST/Select/SelectUnionNode.java b/sqlTranslate/src/main/java/parser/ast/select/SelectUnionNode.java
similarity index 86%
rename from sqlTranslate/src/main/java/Parser/AST/Select/SelectUnionNode.java
rename to sqlTranslate/src/main/java/parser/ast/select/SelectUnionNode.java
index 762c5526..f7bede2d 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Select/SelectUnionNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/select/SelectUnionNode.java
@@ -1,7 +1,7 @@
-package Parser.AST.Select;
+package parser.ast.select;
 
-import Lexer.Token;
-import Parser.AST.ASTNode;
+import lexer.Token;
+import parser.ast.ASTNode;
 
 import java.util.List;
 
diff --git a/sqlTranslate/src/main/java/Parser/AST/Select/SelectWhereClauseNode.java b/sqlTranslate/src/main/java/parser/ast/select/SelectWhereClauseNode.java
similarity index 86%
rename from sqlTranslate/src/main/java/Parser/AST/Select/SelectWhereClauseNode.java
rename to sqlTranslate/src/main/java/parser/ast/select/SelectWhereClauseNode.java
index b1f6a0a1..95f43d64 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Select/SelectWhereClauseNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/select/SelectWhereClauseNode.java
@@ -1,7 +1,7 @@
-package Parser.AST.Select;
+package parser.ast.select;
 
-import Lexer.Token;
-import Parser.AST.ASTNode;
+import lexer.Token;
+import parser.ast.ASTNode;
 
 import java.util.List;
 
diff --git a/sqlTranslate/src/main/java/Parser/AST/Trigger/TriggerBeginNode.java b/sqlTranslate/src/main/java/parser/ast/trigger/TriggerBeginNode.java
similarity index 88%
rename from sqlTranslate/src/main/java/Parser/AST/Trigger/TriggerBeginNode.java
rename to sqlTranslate/src/main/java/parser/ast/trigger/TriggerBeginNode.java
index f07ac78e..f58fce5d 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Trigger/TriggerBeginNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/trigger/TriggerBeginNode.java
@@ -1,7 +1,7 @@
-package Parser.AST.Trigger;
+package parser.ast.trigger;
 
-import Lexer.Token;
-import Parser.AST.ASTNode;
+import lexer.Token;
+import parser.ast.ASTNode;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/sqlTranslate/src/main/java/Parser/AST/Trigger/TriggerBodyNode.java b/sqlTranslate/src/main/java/parser/ast/trigger/TriggerBodyNode.java
similarity index 88%
rename from sqlTranslate/src/main/java/Parser/AST/Trigger/TriggerBodyNode.java
rename to sqlTranslate/src/main/java/parser/ast/trigger/TriggerBodyNode.java
index c2b548ab..ca8fcb89 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Trigger/TriggerBodyNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/trigger/TriggerBodyNode.java
@@ -1,7 +1,7 @@
-package Parser.AST.Trigger;
+package parser.ast.trigger;
 
-import Lexer.Token;
-import Parser.AST.ASTNode;
+import lexer.Token;
+import parser.ast.ASTNode;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/sqlTranslate/src/main/java/Parser/AST/Trigger/TriggerConditionNode.java b/sqlTranslate/src/main/java/parser/ast/trigger/TriggerConditionNode.java
similarity index 93%
rename from sqlTranslate/src/main/java/Parser/AST/Trigger/TriggerConditionNode.java
rename to sqlTranslate/src/main/java/parser/ast/trigger/TriggerConditionNode.java
index 4d83c66b..44bb32e9 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Trigger/TriggerConditionNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/trigger/TriggerConditionNode.java
@@ -1,7 +1,7 @@
-package Parser.AST.Trigger;
+package parser.ast.trigger;
 
-import Lexer.Token;
-import Parser.AST.ASTNode;
+import lexer.Token;
+import parser.ast.ASTNode;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/sqlTranslate/src/main/java/Parser/AST/Trigger/TriggerEndNode.java b/sqlTranslate/src/main/java/parser/ast/trigger/TriggerEndNode.java
similarity index 88%
rename from sqlTranslate/src/main/java/Parser/AST/Trigger/TriggerEndNode.java
rename to sqlTranslate/src/main/java/parser/ast/trigger/TriggerEndNode.java
index bdd6608f..27ce119c 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Trigger/TriggerEndNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/trigger/TriggerEndNode.java
@@ -1,7 +1,7 @@
-package Parser.AST.Trigger;
+package parser.ast.trigger;
 
-import Lexer.Token;
-import Parser.AST.ASTNode;
+import lexer.Token;
+import parser.ast.ASTNode;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/sqlTranslate/src/main/java/Parser/AST/Trigger/TriggerForEachRowNode.java b/sqlTranslate/src/main/java/parser/ast/trigger/TriggerForEachRowNode.java
similarity index 88%
rename from sqlTranslate/src/main/java/Parser/AST/Trigger/TriggerForEachRowNode.java
rename to sqlTranslate/src/main/java/parser/ast/trigger/TriggerForEachRowNode.java
index 521eeca8..6c6bb635 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Trigger/TriggerForEachRowNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/trigger/TriggerForEachRowNode.java
@@ -1,7 +1,7 @@
-package Parser.AST.Trigger;
+package parser.ast.trigger;
 
-import Lexer.Token;
-import Parser.AST.ASTNode;
+import lexer.Token;
+import parser.ast.ASTNode;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/sqlTranslate/src/main/java/Parser/AST/Trigger/TriggerNameNode.java b/sqlTranslate/src/main/java/parser/ast/trigger/TriggerNameNode.java
similarity index 88%
rename from sqlTranslate/src/main/java/Parser/AST/Trigger/TriggerNameNode.java
rename to sqlTranslate/src/main/java/parser/ast/trigger/TriggerNameNode.java
index 981ea523..ce0f0245 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Trigger/TriggerNameNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/trigger/TriggerNameNode.java
@@ -1,7 +1,7 @@
-package Parser.AST.Trigger;
+package parser.ast.trigger;
 
-import Lexer.Token;
-import Parser.AST.ASTNode;
+import lexer.Token;
+import parser.ast.ASTNode;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/sqlTranslate/src/main/java/Parser/AST/Trigger/TriggerNode.java b/sqlTranslate/src/main/java/parser/ast/trigger/TriggerNode.java
similarity index 88%
rename from sqlTranslate/src/main/java/Parser/AST/Trigger/TriggerNode.java
rename to sqlTranslate/src/main/java/parser/ast/trigger/TriggerNode.java
index e89e584b..6f4a8c05 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Trigger/TriggerNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/trigger/TriggerNode.java
@@ -1,7 +1,7 @@
-package Parser.AST.Trigger;
+package parser.ast.trigger;
 
-import Lexer.Token;
-import Parser.AST.ASTNode;
+import lexer.Token;
+import parser.ast.ASTNode;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/sqlTranslate/src/main/java/Parser/AST/Trigger/TriggerObjNode.java b/sqlTranslate/src/main/java/parser/ast/trigger/TriggerObjNode.java
similarity index 88%
rename from sqlTranslate/src/main/java/Parser/AST/Trigger/TriggerObjNode.java
rename to sqlTranslate/src/main/java/parser/ast/trigger/TriggerObjNode.java
index fdee8395..0898ba6c 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Trigger/TriggerObjNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/trigger/TriggerObjNode.java
@@ -1,7 +1,7 @@
-package Parser.AST.Trigger;
+package parser.ast.trigger;
 
-import Lexer.Token;
-import Parser.AST.ASTNode;
+import lexer.Token;
+import parser.ast.ASTNode;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/sqlTranslate/src/main/java/Parser/AST/Trigger/TriggerOptionNode.java b/sqlTranslate/src/main/java/parser/ast/trigger/TriggerOptionNode.java
similarity index 88%
rename from sqlTranslate/src/main/java/Parser/AST/Trigger/TriggerOptionNode.java
rename to sqlTranslate/src/main/java/parser/ast/trigger/TriggerOptionNode.java
index ae4e08a5..287006ac 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Trigger/TriggerOptionNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/trigger/TriggerOptionNode.java
@@ -1,7 +1,7 @@
-package Parser.AST.Trigger;
+package parser.ast.trigger;
 
-import Lexer.Token;
-import Parser.AST.ASTNode;
+import lexer.Token;
+import parser.ast.ASTNode;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/sqlTranslate/src/main/java/Parser/AST/Trigger/TriggerWhenNode.java b/sqlTranslate/src/main/java/parser/ast/trigger/TriggerWhenNode.java
similarity index 88%
rename from sqlTranslate/src/main/java/Parser/AST/Trigger/TriggerWhenNode.java
rename to sqlTranslate/src/main/java/parser/ast/trigger/TriggerWhenNode.java
index 0f2ff457..94b5a868 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Trigger/TriggerWhenNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/trigger/TriggerWhenNode.java
@@ -1,7 +1,7 @@
-package Parser.AST.Trigger;
+package parser.ast.trigger;
 
-import Lexer.Token;
-import Parser.AST.ASTNode;
+import lexer.Token;
+import parser.ast.ASTNode;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/sqlTranslate/src/main/java/Parser/AST/Update/UpdateEndNode.java b/sqlTranslate/src/main/java/parser/ast/update/UpdateEndNode.java
similarity index 85%
rename from sqlTranslate/src/main/java/Parser/AST/Update/UpdateEndNode.java
rename to sqlTranslate/src/main/java/parser/ast/update/UpdateEndNode.java
index b3ce1bb9..83db81dc 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Update/UpdateEndNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/update/UpdateEndNode.java
@@ -1,7 +1,7 @@
-package Parser.AST.Update;
+package parser.ast.update;
 
-import Parser.AST.ASTNode;
-import Lexer.Token;
+import parser.ast.ASTNode;
+import lexer.Token;
 
 import java.util.List;
 
diff --git a/sqlTranslate/src/main/java/Parser/AST/Update/UpdateNode.java b/sqlTranslate/src/main/java/parser/ast/update/UpdateNode.java
similarity index 85%
rename from sqlTranslate/src/main/java/Parser/AST/Update/UpdateNode.java
rename to sqlTranslate/src/main/java/parser/ast/update/UpdateNode.java
index 35e5274c..18b546a0 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Update/UpdateNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/update/UpdateNode.java
@@ -1,7 +1,7 @@
-package Parser.AST.Update;
+package parser.ast.update;
 
-import Parser.AST.ASTNode;
-import Lexer.Token;
+import parser.ast.ASTNode;
+import lexer.Token;
 
 import java.util.List;
 
diff --git a/sqlTranslate/src/main/java/Parser/AST/Update/UpdateObjNode.java b/sqlTranslate/src/main/java/parser/ast/update/UpdateObjNode.java
similarity index 85%
rename from sqlTranslate/src/main/java/Parser/AST/Update/UpdateObjNode.java
rename to sqlTranslate/src/main/java/parser/ast/update/UpdateObjNode.java
index f5fb6b84..7df2d854 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Update/UpdateObjNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/update/UpdateObjNode.java
@@ -1,7 +1,7 @@
-package Parser.AST.Update;
+package parser.ast.update;
 
-import Parser.AST.ASTNode;
-import Lexer.Token;
+import parser.ast.ASTNode;
+import lexer.Token;
 
 import java.util.List;
 
diff --git a/sqlTranslate/src/main/java/Parser/AST/Update/UpdateSetNode.java b/sqlTranslate/src/main/java/parser/ast/update/UpdateSetNode.java
similarity index 85%
rename from sqlTranslate/src/main/java/Parser/AST/Update/UpdateSetNode.java
rename to sqlTranslate/src/main/java/parser/ast/update/UpdateSetNode.java
index a46c5f64..55b05a98 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Update/UpdateSetNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/update/UpdateSetNode.java
@@ -1,7 +1,7 @@
-package Parser.AST.Update;
+package parser.ast.update;
 
-import Parser.AST.ASTNode;
-import Lexer.Token;
+import parser.ast.ASTNode;
+import lexer.Token;
 
 import java.util.List;
 
diff --git a/sqlTranslate/src/main/java/Parser/AST/Update/UpdateWhereNode.java b/sqlTranslate/src/main/java/parser/ast/update/UpdateWhereNode.java
similarity index 86%
rename from sqlTranslate/src/main/java/Parser/AST/Update/UpdateWhereNode.java
rename to sqlTranslate/src/main/java/parser/ast/update/UpdateWhereNode.java
index e9d7be47..2c41ad10 100644
--- a/sqlTranslate/src/main/java/Parser/AST/Update/UpdateWhereNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/update/UpdateWhereNode.java
@@ -1,7 +1,7 @@
-package Parser.AST.Update;
+package parser.ast.update;
 
-import Parser.AST.ASTNode;
-import Lexer.Token;
+import parser.ast.ASTNode;
+import lexer.Token;
 
 import java.util.List;
 
diff --git a/sqlTranslate/src/main/java/Parser/AST/View/ViewCreateNode.java b/sqlTranslate/src/main/java/parser/ast/view/ViewCreateNode.java
similarity index 87%
rename from sqlTranslate/src/main/java/Parser/AST/View/ViewCreateNode.java
rename to sqlTranslate/src/main/java/parser/ast/view/ViewCreateNode.java
index a76923ee..db47fb98 100644
--- a/sqlTranslate/src/main/java/Parser/AST/View/ViewCreateNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/view/ViewCreateNode.java
@@ -1,7 +1,7 @@
-package Parser.AST.View;
+package parser.ast.view;
 
-import Lexer.Token;
-import Parser.AST.ASTNode;
+import lexer.Token;
+import parser.ast.ASTNode;
 
 import java.util.List;
 
diff --git a/sqlTranslate/src/main/java/Parser/AST/View/ViewEndNode.java b/sqlTranslate/src/main/java/parser/ast/view/ViewEndNode.java
similarity index 87%
rename from sqlTranslate/src/main/java/Parser/AST/View/ViewEndNode.java
rename to sqlTranslate/src/main/java/parser/ast/view/ViewEndNode.java
index c384900c..e165677e 100644
--- a/sqlTranslate/src/main/java/Parser/AST/View/ViewEndNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/view/ViewEndNode.java
@@ -1,7 +1,7 @@
-package Parser.AST.View;
+package parser.ast.view;
 
-import Lexer.Token;
-import Parser.AST.ASTNode;
+import lexer.Token;
+import parser.ast.ASTNode;
 
 import java.util.List;
 
diff --git a/sqlTranslate/src/main/java/Parser/AST/View/ViewNameNode.java b/sqlTranslate/src/main/java/parser/ast/view/ViewNameNode.java
similarity index 86%
rename from sqlTranslate/src/main/java/Parser/AST/View/ViewNameNode.java
rename to sqlTranslate/src/main/java/parser/ast/view/ViewNameNode.java
index ecdab3fc..a2c5c4e5 100644
--- a/sqlTranslate/src/main/java/Parser/AST/View/ViewNameNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/view/ViewNameNode.java
@@ -1,7 +1,7 @@
-package Parser.AST.View;
+package parser.ast.view;
 
-import Lexer.Token;
-import Parser.AST.ASTNode;
+import lexer.Token;
+import parser.ast.ASTNode;
 
 import java.util.List;
 
diff --git a/sqlTranslate/src/main/java/Parser/AST/View/ViewTargetNode.java b/sqlTranslate/src/main/java/parser/ast/view/ViewTargetNode.java
similarity index 86%
rename from sqlTranslate/src/main/java/Parser/AST/View/ViewTargetNode.java
rename to sqlTranslate/src/main/java/parser/ast/view/ViewTargetNode.java
index 1eadeb99..d5a3d325 100644
--- a/sqlTranslate/src/main/java/Parser/AST/View/ViewTargetNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/view/ViewTargetNode.java
@@ -1,7 +1,7 @@
-package Parser.AST.View;
+package parser.ast.view;
 
-import Lexer.Token;
-import Parser.AST.ASTNode;
+import lexer.Token;
+import parser.ast.ASTNode;
 
 import java.util.List;
 
-- 
Gitee


From ac7e35195cba8eee2effd2b20e6c0434a25e3446 Mon Sep 17 00:00:00 2001
From: XieXudong <xiexudong23@otcaix.iscas.ac.cn>
Date: Thu, 19 Sep 2024 15:34:02 +0800
Subject: [PATCH 097/113] revise

---
 sqlTranslate/.idea/workspace.xml              | 160 ++-------------
 .../src/main/java/config/CommonConfig.java    |  25 +++
 .../java/generator/OpenGaussGenerator.java    | 194 +++++++++++-------
 3 files changed, 165 insertions(+), 214 deletions(-)
 create mode 100644 sqlTranslate/src/main/java/config/CommonConfig.java

diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
index df2b8b33..503e95cb 100644
--- a/sqlTranslate/.idea/workspace.xml
+++ b/sqlTranslate/.idea/workspace.xml
@@ -5,136 +5,9 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add pl/sql">
+      <change afterPath="$PROJECT_DIR$/src/main/java/config/CommonConfig.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Document/Alter table in Oracle" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/document/Alter table in Oracle" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Document/Commit,rollback,execute in Oracle" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/document/Commit,rollback,execute in Oracle" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Document/CreateTable in Oracle" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/document/CreateTable in Oracle" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Document/DataType in Oracle" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/document/DataType in Oracle" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Document/Delete statement in Oracle" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/document/Delete statement in Oracle" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Document/DropTable in Oracle" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/document/DropTable in Oracle" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Document/Exception in Oracle" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/document/Exception in Oracle" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Document/Function in Oracle" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/document/Function in Oracle" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Document/IF ELSEIF ELSE in Oracle" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/document/IF ELSEIF ELSE in Oracle" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Document/Insert statement in Oracle" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/document/Insert statement in Oracle" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Document/Loop in PLSQL" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/document/Loop in PLSQL" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Document/PL in Oracle" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/document/PL in Oracle" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Document/Procedure in Oracle" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/document/Procedure in Oracle" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Document/Select statement in Oracle" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/document/Select statement in Oracle" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Document/Todolist" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/document/Todolist" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Document/Trigger in Oracle" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/document/Trigger in Oracle" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Document/Update statement in Oracle" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/document/Update statement in Oracle" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Document/View in Oracle" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/document/View in Oracle" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Exception/GenerateFailedException.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/exception/GenerateFailedException.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Exception/ParseFailedException.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/exception/ParseFailedException.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Generator/OpenGaussGenerator.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/generator/OpenGaussGenerator.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Interface/DataType.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/interfaces/DataType.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Lexer/OracleLexer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/lexer/OracleLexer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Lexer/Token.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/lexer/Token.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Main.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/ASTNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/ASTNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/AlterTable/AlterAddColumnNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/alterTable/AlterAddColumnNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/AlterTable/AlterAddConstraintNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/alterTable/AlterAddConstraintNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/AlterTable/AlterDropColumnNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/alterTable/AlterDropColumnNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/AlterTable/AlterDropConstraintNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/alterTable/AlterDropConstraintNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/AlterTable/AlterEndNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/alterTable/AlterEndNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/AlterTable/AlterModifyColumnNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/alterTable/AlterModifyColumnNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/AlterTable/AlterNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/alterTable/AlterNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/AlterTable/AlterObjNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/alterTable/AlterObjNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/AlterTable/AlterRenameColumnNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/alterTable/AlterRenameColumnNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/AlterTable/AlterRenameTableNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/alterTable/AlterRenameTableNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/CaseWhen/CaseConditionNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/caseWhen/CaseConditionNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/CaseWhen/CaseElseNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/caseWhen/CaseElseNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/CaseWhen/CaseEndNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/caseWhen/CaseEndNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/CaseWhen/CaseThenNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/caseWhen/CaseThenNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/CreateTable/CRTEndNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/createTable/CRTEndNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/CreateTable/ColumnNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/createTable/ColumnNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/CreateTable/CreateTabNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/createTable/CreateTabNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/CreateTable/TableConstraintNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/createTable/TableConstraintNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/CreateTable/TableNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/createTable/TableNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/CreateTable/TableTypeNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/createTable/TableTypeNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Delete/DeleteConditionNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/delete/DeleteConditionNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Delete/DeleteEndNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/delete/DeleteEndNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Delete/DeleteNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/delete/DeleteNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Delete/DeleteObjNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/delete/DeleteObjNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Drop/DropEndNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/drop/DropEndNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Drop/DropNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/drop/DropNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Drop/DropObjNameNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/drop/DropObjNameNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Drop/DropOptionNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/drop/DropOptionNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Exception/CustomExceptionNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/exception/CustomExceptionNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Exception/ExceptionActionNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/exception/ExceptionActionNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Exception/ExceptionEndNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/exception/ExceptionEndNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Exception/ExceptionNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/exception/ExceptionNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Exception/Invalid_numberNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/exception/Invalid_numberNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Exception/OtherExceptionNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/exception/OtherExceptionNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Exception/Zero_divideNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/exception/Zero_divideNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Function/FunctionBeginNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/function/FunctionBeginNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Function/FunctionBodyNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/function/FunctionBodyNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Function/FunctionColumnNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/function/FunctionColumnNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Function/FunctionEndNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/function/FunctionEndNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Function/FunctionNameNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/function/FunctionNameNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Function/FunctionNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/function/FunctionNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Function/FunctionRetDefNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/function/FunctionRetDefNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Function/FunctionReturnNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/function/FunctionReturnNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/IFELSIF/ELSENode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/iFELSIF/ELSENode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/IFELSIF/ELSIFActionNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/iFELSIF/ELSIFActionNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/IFELSIF/ELSIFConditionNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/iFELSIF/ELSIFConditionNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/IFELSIF/EndIFNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/iFELSIF/EndIFNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/IFELSIF/IFActionNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/iFELSIF/IFActionNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/IFELSIF/IFConditionNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/iFELSIF/IFConditionNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Insert/InsertDataNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/insert/InsertDataNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Insert/InsertEndNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/insert/InsertEndNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Insert/InsertNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/insert/InsertNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Insert/InsertObjNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/insert/InsertObjNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Join/JoinConditionNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/join/JoinConditionNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Join/JoinEndNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/join/JoinEndNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Join/JoinSourceTabNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/join/JoinSourceTabNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Join/JoinTargetTabNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/join/JoinTargetTabNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Join/JoinTypeNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/join/JoinTypeNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Loop/ForNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/loop/ForNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Loop/LoopBodyNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/loop/LoopBodyNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Loop/LoopEndNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/loop/LoopEndNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Loop/LoopExitNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/loop/LoopExitNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Loop/LoopNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/loop/LoopNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Loop/WhileNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/loop/WhileNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/PL/PLBeginNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/pl/PLBeginNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/PL/PLBodyNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/pl/PLBodyNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/PL/PLDeclareNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/pl/PLDeclareNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/PL/PLEndNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/pl/PLEndNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/PL/PLNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/pl/PLNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Procedure/ProcedureBeginNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/procedure/ProcedureBeginNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Procedure/ProcedureColumnNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/procedure/ProcedureColumnNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Procedure/ProcedureEndNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/procedure/ProcedureEndNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Procedure/ProcedureNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/procedure/ProcedureNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Procedure/ProcedureObjNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/procedure/ProcedureObjNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Procedure/ProcedurePLStatementNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/procedure/ProcedurePLStatementNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Procedure/ProcedureRetDefNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/procedure/ProcedureRetDefNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Select/SelectContentNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/select/SelectContentNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Select/SelectEndNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/select/SelectEndNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Select/SelectNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/select/SelectNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Select/SelectObjNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/select/SelectObjNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Select/SelectOptionNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/select/SelectOptionNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Select/SelectUnionNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/select/SelectUnionNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Select/SelectWhereClauseNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/select/SelectWhereClauseNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Trigger/TriggerBeginNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/trigger/TriggerBeginNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Trigger/TriggerBodyNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/trigger/TriggerBodyNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Trigger/TriggerConditionNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/trigger/TriggerConditionNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Trigger/TriggerEndNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/trigger/TriggerEndNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Trigger/TriggerForEachRowNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/trigger/TriggerForEachRowNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Trigger/TriggerNameNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/trigger/TriggerNameNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Trigger/TriggerNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/trigger/TriggerNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Trigger/TriggerObjNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/trigger/TriggerObjNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Trigger/TriggerOptionNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/trigger/TriggerOptionNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Trigger/TriggerWhenNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/trigger/TriggerWhenNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Update/UpdateEndNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/update/UpdateEndNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Update/UpdateNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/update/UpdateNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Update/UpdateObjNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/update/UpdateObjNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Update/UpdateSetNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/update/UpdateSetNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/Update/UpdateWhereNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/update/UpdateWhereNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/View/ViewCreateNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/view/ViewCreateNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/View/ViewEndNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/view/ViewEndNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/View/ViewNameNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/view/ViewNameNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/AST/View/ViewTargetNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/view/ViewTargetNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Parser/OracleParser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/OracleParser.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/generator/OpenGaussGenerator.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/generator/OpenGaussGenerator.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -149,16 +22,16 @@
       </list>
     </option>
   </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
+  </component>
   <component name="MarkdownSettingsMigration">
     <option name="stateVersion" value="1" />
   </component>
-  <component name="MavenImportPreferences">
-    <option name="importingSettings">
-      <MavenImportingSettings>
-        <option name="workspaceImportEnabled" value="true" />
-      </MavenImportingSettings>
-    </option>
-  </component>
+  <component name="ProjectColorInfo">{
+  &quot;customColor&quot;: &quot;&quot;,
+  &quot;associatedIndex&quot;: 4
+}</component>
   <component name="ProjectId" id="2kMwWhUohyqt8bZ1bSi1kwgGkSK" />
   <component name="ProjectLevelVcsManager">
     <ConfirmationsSetting value="2" id="Add" />
@@ -171,14 +44,16 @@
   &quot;keyToString&quot;: {
     &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
     &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    &quot;git-widget-placeholder&quot;: &quot;master&quot;,
+    &quot;kotlin-language-version-configured&quot;: &quot;true&quot;,
     &quot;last_opened_file_path&quot;: &quot;F:/oracle2opengauss/examples/sqlTranslate&quot;,
     &quot;project.structure.last.edited&quot;: &quot;模块&quot;,
     &quot;project.structure.proportion&quot;: &quot;0.0&quot;,
     &quot;project.structure.side.proportion&quot;: &quot;0.0&quot;,
-    &quot;settings.editor.selected.configurable&quot;: &quot;preferences.fileTypes&quot;
+    &quot;settings.editor.selected.configurable&quot;: &quot;preferences.pluginManager&quot;
   }
 }</component>
-  <component name="RunManager" selected="应用程序.Main">
+  <component name="RunManager" selected="Application.Main">
     <configuration name="App" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
       <option name="MAIN_CLASS_NAME" value="org.example.App" />
       <module name="sqlTranslate" />
@@ -215,11 +90,16 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
+    <list>
+      <item itemvalue="Application.App" />
+      <item itemvalue="Application.Main" />
+      <item itemvalue="JUnit.AppTest.shouldAnswerWithTrue" />
+    </list>
     <recent_temporary>
       <list>
-        <item itemvalue="应用程序.Main" />
-        <item itemvalue="应用程序.App" />
         <item itemvalue="JUnit.AppTest.shouldAnswerWithTrue" />
+        <item itemvalue="Application.Main" />
+        <item itemvalue="Application.App" />
       </list>
     </recent_temporary>
   </component>
diff --git a/sqlTranslate/src/main/java/config/CommonConfig.java b/sqlTranslate/src/main/java/config/CommonConfig.java
new file mode 100644
index 00000000..97b7eb5d
--- /dev/null
+++ b/sqlTranslate/src/main/java/config/CommonConfig.java
@@ -0,0 +1,25 @@
+package config;
+
+public class CommonConfig {
+    public static final String DEFAULT_SOURCE_DB = "Oracle-19C";
+    public static final String DEFAULT_TARGET_DB = "OpenGauss-3.0.0";
+    private static String sourceDB = DEFAULT_SOURCE_DB;
+    private static String targetDB = DEFAULT_TARGET_DB;
+
+    public static void setSourceDB(String sourceDB) {
+        CommonConfig.sourceDB = sourceDB;
+    }
+
+    public static void setTargetDB(String targetDB) {
+        CommonConfig.targetDB = targetDB;
+    }
+
+    public static String getSourceDB() {
+        return sourceDB;
+    }
+
+    public static String getTargetDB() {
+        return targetDB;
+    }
+
+}
diff --git a/sqlTranslate/src/main/java/generator/OpenGaussGenerator.java b/sqlTranslate/src/main/java/generator/OpenGaussGenerator.java
index 0396f08e..30224eea 100644
--- a/sqlTranslate/src/main/java/generator/OpenGaussGenerator.java
+++ b/sqlTranslate/src/main/java/generator/OpenGaussGenerator.java
@@ -1,5 +1,6 @@
 package generator;
 
+import config.CommonConfig;
 import interfaces.DataType;
 import lexer.OracleLexer;
 import lexer.Token;
@@ -192,8 +193,11 @@ public class OpenGaussGenerator {
     }
 
     private void visitCrt(ASTNode node) {
-        if (node instanceof ColumnNode) {
-            DataTypeConvert((ColumnNode) node);
+        if (CommonConfig.getSourceDB().equalsIgnoreCase("ORACLE-19C")
+         && CommonConfig.getTargetDB().equalsIgnoreCase("OPENGAUSS-3.0.0")) {
+            if (node instanceof ColumnNode) {
+                DataTypeConvert((ColumnNode) node);
+            }
         }
         for (ASTNode child : node.getChildren()) {
             visitCrt(child);
@@ -201,29 +205,23 @@ public class OpenGaussGenerator {
     }
 
     private void visitDrop(ASTNode node) {
-        try {
+        if (CommonConfig.getSourceDB().equalsIgnoreCase("ORACLE-19C")
+         && CommonConfig.getTargetDB().equalsIgnoreCase("OPENGAUSS-3.0.0")) {
             if (node instanceof DropOptionNode) {
-                List<Token> tokens = new ArrayList<>();
-                tokens.add(new Token(Token.TokenType.KEYWORD, "CASCADE"));
-                tokens.add(new Token(Token.TokenType.KEYWORD, "CONSTRAINTS"));
-                if (node.tokensEqual(tokens)) {
-                    throw new GenerateFailedException("Unsupported type:" + node.toString() + "(OpenGauss doesn't support the keyword -- " + node.toString() + " or have any expression that keeps the same semantic!)");
-                }
+                CommonConvert(node);
             }
         }
-        catch (GenerateFailedException e) {
-            e.printStackTrace();
-        }
         for (ASTNode child : node.getChildren()) {
             visitDrop(child);
         }
     }
 
     private void visitJoin(ASTNode node) {
-        if (node instanceof JoinConditionNode) {
-           if (((JoinConditionNode) node).getKeyword().equalsIgnoreCase("USING")) {
-               ((JoinConditionNode) node).setKeyword("ON");
-           }
+        if (CommonConfig.getSourceDB().equalsIgnoreCase("ORACLE-19C")
+         && CommonConfig.getTargetDB().equalsIgnoreCase("OPENGAUSS-3.0.0")) {
+            if (node instanceof JoinConditionNode) {
+                CommonConvert(node);
+            }
         }
         for (ASTNode child : node.getChildren()) {
             visitJoin(child);
@@ -231,8 +229,11 @@ public class OpenGaussGenerator {
     }
 
     private void visitLoop(ASTNode node) {
-        if (node instanceof LoopBodyNode) {
-            PLConvert(node);
+        if (CommonConfig.getSourceDB().equalsIgnoreCase("ORACLE-19C")
+         && CommonConfig.getTargetDB().equalsIgnoreCase("OPENGAUSS-3.0.0")) {
+            if (node instanceof LoopBodyNode) {
+                CommonConvert(node);
+            }
         }
         for (ASTNode child : node.getChildren()) {
             visitLoop(child);
@@ -240,8 +241,11 @@ public class OpenGaussGenerator {
     }
 
     private void visitException(ASTNode node) {
-        if (node instanceof ExceptionActionNode) {
-            PLConvert(node);
+        if (CommonConfig.getSourceDB().equalsIgnoreCase("ORACLE-19C")
+         && CommonConfig.getTargetDB().equalsIgnoreCase("OPENGAUSS-3.0.0")) {
+            if (node instanceof ExceptionActionNode) {
+                CommonConvert(node);
+            }
         }
         for (ASTNode child : node.getChildren()) {
             visitException(child);
@@ -249,8 +253,11 @@ public class OpenGaussGenerator {
     }
 
     private void visitSelect(ASTNode node) {
-        if (node instanceof JoinSourceTabNode) {
-            visitJoin(node);
+        if (CommonConfig.getSourceDB().equalsIgnoreCase("ORACLE-19C")
+         && CommonConfig.getTargetDB().equalsIgnoreCase("OPENGAUSS-3.0.0")) {
+            if (node instanceof JoinSourceTabNode) {
+                visitJoin(node);
+            }
         }
         for (ASTNode child : node.getChildren()) {
             visitSelect(child);
@@ -258,8 +265,11 @@ public class OpenGaussGenerator {
     }
 
     private void visitUpdate(ASTNode node) {
-        if (node instanceof JoinSourceTabNode) {
-            visitJoin(node);
+        if (CommonConfig.getSourceDB().equalsIgnoreCase("ORACLE-19C")
+         && CommonConfig.getTargetDB().equalsIgnoreCase("OPENGAUSS-3.0.0")) {
+            if (node instanceof JoinSourceTabNode) {
+                visitJoin(node);
+            }
         }
         for (ASTNode child : node.getChildren()) {
             visitUpdate(child);
@@ -267,11 +277,14 @@ public class OpenGaussGenerator {
     }
 
     private void visitAlter(ASTNode node) {
-        if (node instanceof AlterAddColumnNode) {
-            DataTypeConvert((AlterAddColumnNode) node);
-        }
-        else if (node instanceof AlterModifyColumnNode) {
-            DataTypeConvert((AlterModifyColumnNode) node);
+        if (CommonConfig.getSourceDB().equalsIgnoreCase("ORACLE-19C")
+         && CommonConfig.getTargetDB().equalsIgnoreCase("OPENGAUSS-3.0.0")) {
+            if (node instanceof AlterAddColumnNode) {
+                DataTypeConvert((AlterAddColumnNode) node);
+            }
+            else if (node instanceof AlterModifyColumnNode) {
+                DataTypeConvert((AlterModifyColumnNode) node);
+            }
         }
         for (ASTNode child : node.getChildren()) {
             visitAlter(child);
@@ -279,8 +292,11 @@ public class OpenGaussGenerator {
     }
 
     private void visitCreateView(ASTNode node) {
-        if (node instanceof SelectNode) {
-            visitSelect(node);
+        if (CommonConfig.getSourceDB().equalsIgnoreCase("ORACLE-19C")
+         && CommonConfig.getTargetDB().equalsIgnoreCase("OPENGAUSS-3.0.0")) {
+            if (node instanceof SelectNode) {
+                visitSelect(node);
+            }
         }
         for (ASTNode child : node.getChildren()) {
             visitCreateView(child);
@@ -288,18 +304,21 @@ public class OpenGaussGenerator {
     }
 
     private void visitPL(ASTNode node) {
-        if (node instanceof ProcedureRetDefNode) {
-            DataTypeConvert((ProcedureRetDefNode) node);
-            PLConvert(node);
-        }
-        else if (node instanceof ProcedureColumnNode) {
-            DataTypeConvert((ProcedureColumnNode) node);
-        }
-        else if (node instanceof ProcedureEndNode) {
-            PLConvert(node);
-        }
-        else if (node instanceof ExceptionNode) {
-            visitException(node);
+        if (CommonConfig.getSourceDB().equalsIgnoreCase("ORACLE-19C")
+         && CommonConfig.getTargetDB().equalsIgnoreCase("OPENGAUSS-3.0.0")) {
+            if (node instanceof ProcedureRetDefNode) {
+                DataTypeConvert((ProcedureRetDefNode) node);
+                CommonConvert(node);
+            }
+            else if (node instanceof ProcedureColumnNode) {
+                DataTypeConvert((ProcedureColumnNode) node);
+            }
+            else if (node instanceof ProcedureEndNode) {
+                CommonConvert(node);
+            }
+            else if (node instanceof ExceptionNode) {
+                visitException(node);
+            }
         }
         for (ASTNode child : node.getChildren()) {
             visitPL(child);
@@ -307,17 +326,20 @@ public class OpenGaussGenerator {
     }
 
     private void visitFunc(ASTNode node) {
-        if (node instanceof FunctionRetDefNode) {
-            PLConvert(node);
-        }
-        else if (node instanceof ExceptionNode) {
-            visitException(node);
-        }
-        else if (node instanceof FunctionColumnNode) {
-            DataTypeConvert((FunctionColumnNode) node);
-        }
-        else if (node instanceof FunctionEndNode) {
-            PLConvert(node);
+        if (CommonConfig.getSourceDB().equalsIgnoreCase("ORACLE-19C")
+         && CommonConfig.getTargetDB().equalsIgnoreCase("OPENGAUSS-3.0.0")) {
+            if (node instanceof FunctionRetDefNode) {
+                CommonConvert(node);
+            }
+            else if (node instanceof ExceptionNode) {
+                visitException(node);
+            }
+            else if (node instanceof FunctionColumnNode) {
+                DataTypeConvert((FunctionColumnNode) node);
+            }
+            else if (node instanceof FunctionEndNode) {
+                CommonConvert(node);
+            }
         }
         for (ASTNode child : node.getChildren()) {
             visitFunc(child);
@@ -325,14 +347,17 @@ public class OpenGaussGenerator {
     }
 
     private void visitTrigger(ASTNode node) {
-        if (node instanceof TriggerBodyNode) {
-            PLConvert(node);
-        }
-        else if (node instanceof TriggerConditionNode) {
-            PLConvert(node);
-        }
-        else if (node instanceof TriggerOptionNode) {
-            PLConvert(node);
+        if (CommonConfig.getSourceDB().equalsIgnoreCase("ORACLE-19C")
+         && CommonConfig.getTargetDB().equalsIgnoreCase("OPENGAUSS-3.0.0")) {
+            if (node instanceof TriggerBodyNode) {
+                CommonConvert(node);
+            }
+            else if (node instanceof TriggerConditionNode) {
+                CommonConvert(node);
+            }
+            else if (node instanceof TriggerOptionNode) {
+                CommonConvert(node);
+            }
         }
         for (ASTNode child : node.getChildren()) {
             visitTrigger(child);
@@ -340,24 +365,27 @@ public class OpenGaussGenerator {
     }
 
     private void visitPLSQL(ASTNode node) {
-        if (node instanceof PLNode) {
-            PLConvert(node);
-        }
-        else if (node instanceof PLDeclareNode) {
-            DataTypeConvert((PLDeclareNode) node);
-        }
-        else if (node instanceof PLEndNode) {
-            PLConvert(node);
-        }
-        else if (node instanceof PLBodyNode) {
-            PLConvert(node);
+        if (CommonConfig.getSourceDB().equalsIgnoreCase("ORACLE-19C")
+         && CommonConfig.getTargetDB().equalsIgnoreCase("OPENGAUSS-3.0.0")) {
+            if (node instanceof PLNode) {
+                CommonConvert(node);
+            }
+            else if (node instanceof PLDeclareNode) {
+                DataTypeConvert((PLDeclareNode) node);
+            }
+            else if (node instanceof PLEndNode) {
+                CommonConvert(node);
+            }
+            else if (node instanceof PLBodyNode) {
+                CommonConvert(node);
+            }
         }
         for (ASTNode child : node.getChildren()) {
             visitPLSQL(child);
         }
     }
 
-    private void PLConvert(ASTNode node) {
+    private void CommonConvert(ASTNode node) {
         if (node.checkExistsByRegex("(?i)DBMS_OUTPUT.PUT_LINE\\(.*?\\)")) {
             String printObj = "";
             for (Token token: node.getTokens()) {
@@ -504,6 +532,24 @@ public class OpenGaussGenerator {
             tokens.add(new Token(Token.TokenType.SYMBOL, ";"));
             node.setTokens(tokens);
         }
+        if (node instanceof DropOptionNode) {
+            try {
+                List<Token> tokens = new ArrayList<>();
+                tokens.add(new Token(Token.TokenType.KEYWORD, "CASCADE"));
+                tokens.add(new Token(Token.TokenType.KEYWORD, "CONSTRAINTS"));
+                if (node.tokensEqual(tokens)) {
+                    throw new GenerateFailedException("Unsupported type:" + node.toString() + "(OpenGauss doesn't support the keyword -- " + node.toString() + " or have any expression that keeps the same semantic!)");
+                }
+            } catch (GenerateFailedException e) {
+                e.printStackTrace();
+            }
+        }
+        if (node instanceof JoinConditionNode) {
+            if (((JoinConditionNode) node).getKeyword().equalsIgnoreCase("USING")) {
+                ((JoinConditionNode) node).setKeyword("ON");
+            }
+        }
+
     }
 
 
-- 
Gitee


From 8deb614144dd4c39dc18dfb8e91b6556fc9d8245 Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Thu, 19 Sep 2024 15:38:32 +0800
Subject: [PATCH 098/113] revise

---
 sqlTranslate/.idea/workspace.xml     | 14 +++---
 sqlTranslate/src/main/java/Main.java | 66 ++++++++++++++--------------
 2 files changed, 38 insertions(+), 42 deletions(-)

diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
index 503e95cb..83e2c196 100644
--- a/sqlTranslate/.idea/workspace.xml
+++ b/sqlTranslate/.idea/workspace.xml
@@ -4,11 +4,7 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add pl/sql">
-      <change afterPath="$PROJECT_DIR$/src/main/java/config/CommonConfig.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/generator/OpenGaussGenerator.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/generator/OpenGaussGenerator.java" afterDir="false" />
-    </list>
+    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="revise" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -97,8 +93,8 @@
     </list>
     <recent_temporary>
       <list>
-        <item itemvalue="JUnit.AppTest.shouldAnswerWithTrue" />
         <item itemvalue="Application.Main" />
+        <item itemvalue="JUnit.AppTest.shouldAnswerWithTrue" />
         <item itemvalue="Application.App" />
       </list>
     </recent_temporary>
@@ -455,7 +451,7 @@
       <option name="project" value="LOCAL" />
       <updated>1726633703475</updated>
     </task>
-    <option name="localTasksCounter" value="94" />
+    <option name="localTasksCounter" value="95" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
@@ -493,9 +489,9 @@
     <MESSAGE value="add trigger" />
     <MESSAGE value="add PL document" />
     <MESSAGE value="add PL ast classes" />
-    <MESSAGE value="revise" />
     <MESSAGE value="add pl/sql" />
-    <option name="LAST_COMMIT_MESSAGE" value="add pl/sql" />
+    <MESSAGE value="revise" />
+    <option name="LAST_COMMIT_MESSAGE" value="revise" />
   </component>
   <component name="XDebuggerManager">
     <watches-manager>
diff --git a/sqlTranslate/src/main/java/Main.java b/sqlTranslate/src/main/java/Main.java
index b17eed35..59442883 100644
--- a/sqlTranslate/src/main/java/Main.java
+++ b/sqlTranslate/src/main/java/Main.java
@@ -57,32 +57,32 @@ public class Main {
 //                "        DBMS_OUTPUT.PUT_LINE('Caught an exception: Invalid number');\n" +
 //                "    WHEN OTHERS THEN\n" +
 //                "        DBMS_OUTPUT.PUT_LINE('Caught an exception: ' || SQLERRM);";
-        String sql = "CREATE OR REPLACE PROCEDURE update_salary (\n" +
-                "             employee_id IN NUMBER,\n" +
-                "             new_salary IN OUT NUMBER\n" +
-                "         ) IS\n" +
-                "             v_employee NUMBER;\n" +
-                "         BEGIN\n" +
-                "             SELECT * INTO v_employee FROM employees WHERE employee_id = employee_id;\n" +
-                "\n" +
-                "             IF new_salary < 3000 THEN\n" +
-                "                 new_salary := new_salary * 1.1;\n" +
-                "             ELSE\n" +
-                "                 new_salary := new_salary * 1.05;\n" +
-                "             END IF;\n" +
-                "\n" +
-                "             UPDATE employees SET salary = new_salary WHERE employee_id = employee_id;\n" +
-                "             COMMIT;\n" +
-                "\n" +
-                "             DBMS_OUTPUT.PUT_LINE('Updated Salary: ' || new_salary);\n" +
-                "         EXCEPTION\n" +
-                "             WHEN NO_DATA_FOUND THEN\n" +
-                "                 DBMS_OUTPUT.PUT_LINE('Employee not found.');\n" +
-                "             WHEN TOO_MANY_ROWS THEN\n" +
-                "                 DBMS_OUTPUT.PUT_LINE('Multiple employees found.');\n" +
-                "             WHEN OTHERS THEN\n" +
-                "                 DBMS_OUTPUT.PUT_LINE('An error occurred: ' || SQLERRM);\n" +
-                "         END update_salary;\n";
+//        String sql = "CREATE OR REPLACE PROCEDURE update_salary (\n" +
+//                "             employee_id IN NUMBER,\n" +
+//                "             new_salary IN OUT NUMBER\n" +
+//                "         ) IS\n" +
+//                "             v_employee NUMBER;\n" +
+//                "         BEGIN\n" +
+//                "             SELECT * INTO v_employee FROM employees WHERE employee_id = employee_id;\n" +
+//                "\n" +
+//                "             IF new_salary < 3000 THEN\n" +
+//                "                 new_salary := new_salary * 1.1;\n" +
+//                "             ELSE\n" +
+//                "                 new_salary := new_salary * 1.05;\n" +
+//                "             END IF;\n" +
+//                "\n" +
+//                "             UPDATE employees SET salary = new_salary WHERE employee_id = employee_id;\n" +
+//                "             COMMIT;\n" +
+//                "\n" +
+//                "             DBMS_OUTPUT.PUT_LINE('Updated Salary: ' || new_salary);\n" +
+//                "         EXCEPTION\n" +
+//                "             WHEN NO_DATA_FOUND THEN\n" +
+//                "                 DBMS_OUTPUT.PUT_LINE('Employee not found.');\n" +
+//                "             WHEN TOO_MANY_ROWS THEN\n" +
+//                "                 DBMS_OUTPUT.PUT_LINE('Multiple employees found.');\n" +
+//                "             WHEN OTHERS THEN\n" +
+//                "                 DBMS_OUTPUT.PUT_LINE('An error occurred: ' || SQLERRM);\n" +
+//                "         END update_salary;\n";
 //        String sql = "CREATE OR REPLACE FUNCTION string_length (\n" +
 //                "    input_string VARCHAR2\n" +
 //                ") RETURN NUMBER IS\n" +
@@ -95,13 +95,13 @@ public class Main {
 //                "         BEGIN\n" +
 //                "             INSERT INTO audit_log (action, employee_id) VALUES ('INSERT', :NEW.id);\n" +
 //                "         END;";
-//        String sql = "DECLARE\n" +
-//                "            v_name Varchar2(20);\n" +
-//                "            v_salary employees.salary%TYPE;\n" +
-//                "         BEGIN\n" +
-//                "            SELECT name, salary INTO v_name, v_salary FROM employees WHERE employee_id = 100;\n" +
-//                "            DBMS_OUTPUT.PUT_LINE('Name: ' || v_name || ', Salary: ' || v_salary);\n" +
-//                "         END;";
+        String sql = "DECLARE\n" +
+                "            v_name Varchar2(20);\n" +
+                "            v_salary employees.salary%TYPE;\n" +
+                "         BEGIN\n" +
+                "            SELECT name, salary INTO v_name, v_salary FROM employees WHERE employee_id = 100;\n" +
+                "            DBMS_OUTPUT.PUT_LINE('Name: ' || v_name || ', Salary: ' || v_salary);\n" +
+                "         END;";
         OracleLexer lexer = new OracleLexer(sql);
         lexer.printTokens();
         OracleParser parser = new OracleParser(lexer);
-- 
Gitee


From 97091da1d1eee74011a34ce24a922342755c1238 Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Fri, 20 Sep 2024 09:46:27 +0800
Subject: [PATCH 099/113] add unit test

---
 sqlTranslate/.idea/workspace.xml              | 47 ++++++++++------
 .../src/test/java/testAlterTable.java         | 54 +++++++++++++++++++
 2 files changed, 86 insertions(+), 15 deletions(-)
 create mode 100644 sqlTranslate/src/test/java/testAlterTable.java

diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
index 83e2c196..21970c27 100644
--- a/sqlTranslate/.idea/workspace.xml
+++ b/sqlTranslate/.idea/workspace.xml
@@ -4,7 +4,10 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="revise" />
+    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="revise">
+      <change afterPath="$PROJECT_DIR$/src/test/java/testAlterTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -36,20 +39,22 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent">{
-  &quot;keyToString&quot;: {
-    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
-    &quot;git-widget-placeholder&quot;: &quot;master&quot;,
-    &quot;kotlin-language-version-configured&quot;: &quot;true&quot;,
-    &quot;last_opened_file_path&quot;: &quot;F:/oracle2opengauss/examples/sqlTranslate&quot;,
-    &quot;project.structure.last.edited&quot;: &quot;模块&quot;,
-    &quot;project.structure.proportion&quot;: &quot;0.0&quot;,
-    &quot;project.structure.side.proportion&quot;: &quot;0.0&quot;,
-    &quot;settings.editor.selected.configurable&quot;: &quot;preferences.pluginManager&quot;
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "Application.Main.executor": "Run",
+    "JUnit.testAlterTable.testAlterTable.executor": "Run",
+    "RunOnceActivity.OpenProjectViewOnStart": "true",
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "git-widget-placeholder": "master",
+    "kotlin-language-version-configured": "true",
+    "last_opened_file_path": "F:/oracle2opengauss/examples/sqlTranslate",
+    "project.structure.last.edited": "模块",
+    "project.structure.proportion": "0.0",
+    "project.structure.side.proportion": "0.0",
+    "settings.editor.selected.configurable": "preferences.pluginManager"
   }
-}</component>
-  <component name="RunManager" selected="Application.Main">
+}]]></component>
+  <component name="RunManager" selected="JUnit.testAlterTable.testAlterTable">
     <configuration name="App" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
       <option name="MAIN_CLASS_NAME" value="org.example.App" />
       <module name="sqlTranslate" />
@@ -86,13 +91,25 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
+    <configuration name="testAlterTable.testAlterTable" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+      <module name="sqlTranslate" />
+      <option name="PACKAGE_NAME" value="" />
+      <option name="MAIN_CLASS_NAME" value="testAlterTable" />
+      <option name="METHOD_NAME" value="testAlterTable" />
+      <option name="TEST_OBJECT" value="method" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
     <list>
       <item itemvalue="Application.App" />
       <item itemvalue="Application.Main" />
+      <item itemvalue="JUnit.testAlterTable.testAlterTable" />
       <item itemvalue="JUnit.AppTest.shouldAnswerWithTrue" />
     </list>
     <recent_temporary>
       <list>
+        <item itemvalue="JUnit.testAlterTable.testAlterTable" />
         <item itemvalue="Application.Main" />
         <item itemvalue="JUnit.AppTest.shouldAnswerWithTrue" />
         <item itemvalue="Application.App" />
@@ -451,7 +468,7 @@
       <option name="project" value="LOCAL" />
       <updated>1726633703475</updated>
     </task>
-    <option name="localTasksCounter" value="95" />
+    <option name="localTasksCounter" value="96" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
diff --git a/sqlTranslate/src/test/java/testAlterTable.java b/sqlTranslate/src/test/java/testAlterTable.java
new file mode 100644
index 00000000..ef9ab229
--- /dev/null
+++ b/sqlTranslate/src/test/java/testAlterTable.java
@@ -0,0 +1,54 @@
+import config.CommonConfig;
+import generator.OpenGaussGenerator;
+import lexer.OracleLexer;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import parser.OracleParser;
+import parser.ast.ASTNode;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class testAlterTable {
+    List<String> testSQL = new ArrayList<>();
+    @BeforeEach
+    public void loadData()
+    {
+        testSQL.add("ALTER TABLE employees ADD email VARCHAR2(100);");
+        testSQL.add("ALTER TABLE employees ADD email LONG RAW;");
+        testSQL.add("ALTER TABLE employees DROP COLUMN middle_name;");
+        testSQL.add("ALTER TABLE employees MODIFY salary NUMBER(10,2);");
+        testSQL.add("ALTER TABLE employees MODIFY salary ROWID;");
+        testSQL.add("ALTER TABLE employees RENAME COLUMN first_name TO given_name;");
+        testSQL.add("ALTER TABLE employees ADD CONSTRAINT emp_pk PRIMARY KEY (employee_id);");
+        testSQL.add("ALTER TABLE employees DROP CONSTRAINT emp_pk;");
+        testSQL.add("ALTER TABLE employees RENAME TO staff;");
+        System.out.println("===== test of the alter table =====");
+        System.out.println("The source DBMS is: " + CommonConfig.getSourceDB());
+        System.out.println("The target DBMS is: " + CommonConfig.getTargetDB());
+        System.out.println();
+    }
+
+    @Test
+    public void testAlterTable()
+    {
+        int num = 1;
+        for (String sql : testSQL) {
+            System.out.println("===== test of the SQL" + num++ + " =====");
+            System.out.println("Input SQL: " + sql);
+            OracleLexer lexer = new OracleLexer(sql);
+            lexer.printTokens();
+            OracleParser parser = new OracleParser(lexer);
+            ASTNode root = parser.parse();
+            System.out.println("The AST of the input SQL: ");
+            System.out.println(root.getASTString());
+            System.out.println("The query String of the AST parsed from the input SQL: ");
+            System.out.println(root.toQueryString());
+            OpenGaussGenerator generator = new OpenGaussGenerator(root);
+            System.out.println("The converted query String: ");
+            System.out.println(generator.generate());
+
+            System.out.println();
+        }
+    }
+}
-- 
Gitee


From db2701ae443792e4bdc8fe0f65e66304d8a2e472 Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Fri, 20 Sep 2024 09:57:33 +0800
Subject: [PATCH 100/113] add unit test

---
 sqlTranslate/.idea/workspace.xml              | 28 +++++++---
 .../src/test/java/testAlterTable.java         |  2 +-
 .../src/test/java/testCommitRollbackExec.java | 53 +++++++++++++++++++
 3 files changed, 75 insertions(+), 8 deletions(-)
 create mode 100644 sqlTranslate/src/test/java/testCommitRollbackExec.java

diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
index 21970c27..cee46f3e 100644
--- a/sqlTranslate/.idea/workspace.xml
+++ b/sqlTranslate/.idea/workspace.xml
@@ -4,9 +4,10 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="revise">
-      <change afterPath="$PROJECT_DIR$/src/test/java/testAlterTable.java" afterDir="false" />
+    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add unit test">
+      <change afterPath="$PROJECT_DIR$/src/test/java/testCommitRollbackExec.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/test/java/testAlterTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/testAlterTable.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -43,18 +44,19 @@
   "keyToString": {
     "Application.Main.executor": "Run",
     "JUnit.testAlterTable.testAlterTable.executor": "Run",
+    "JUnit.testCommitRollbackExec.test.executor": "Run",
     "RunOnceActivity.OpenProjectViewOnStart": "true",
     "RunOnceActivity.ShowReadmeOnStart": "true",
     "git-widget-placeholder": "master",
     "kotlin-language-version-configured": "true",
     "last_opened_file_path": "F:/oracle2opengauss/examples/sqlTranslate",
-    "project.structure.last.edited": "模块",
+    "project.structure.last.edited": "Project",
     "project.structure.proportion": "0.0",
     "project.structure.side.proportion": "0.0",
     "settings.editor.selected.configurable": "preferences.pluginManager"
   }
 }]]></component>
-  <component name="RunManager" selected="JUnit.testAlterTable.testAlterTable">
+  <component name="RunManager" selected="JUnit.testCommitRollbackExec.test">
     <configuration name="App" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
       <option name="MAIN_CLASS_NAME" value="org.example.App" />
       <module name="sqlTranslate" />
@@ -101,14 +103,26 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
+    <configuration name="testCommitRollbackExec.test" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+      <module name="sqlTranslate" />
+      <option name="PACKAGE_NAME" value="" />
+      <option name="MAIN_CLASS_NAME" value="testCommitRollbackExec" />
+      <option name="METHOD_NAME" value="test" />
+      <option name="TEST_OBJECT" value="method" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
     <list>
       <item itemvalue="Application.App" />
       <item itemvalue="Application.Main" />
       <item itemvalue="JUnit.testAlterTable.testAlterTable" />
+      <item itemvalue="JUnit.testCommitRollbackExec.test" />
       <item itemvalue="JUnit.AppTest.shouldAnswerWithTrue" />
     </list>
     <recent_temporary>
       <list>
+        <item itemvalue="JUnit.testCommitRollbackExec.test" />
         <item itemvalue="JUnit.testAlterTable.testAlterTable" />
         <item itemvalue="Application.Main" />
         <item itemvalue="JUnit.AppTest.shouldAnswerWithTrue" />
@@ -468,7 +482,7 @@
       <option name="project" value="LOCAL" />
       <updated>1726633703475</updated>
     </task>
-    <option name="localTasksCounter" value="96" />
+    <option name="localTasksCounter" value="97" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
@@ -483,7 +497,6 @@
     </option>
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="add view generate method" />
     <MESSAGE value="add if elseif else endif document" />
     <MESSAGE value="add if elseif else endif ast classes" />
     <MESSAGE value="add IF ELSIF" />
@@ -508,7 +521,8 @@
     <MESSAGE value="add PL ast classes" />
     <MESSAGE value="add pl/sql" />
     <MESSAGE value="revise" />
-    <option name="LAST_COMMIT_MESSAGE" value="revise" />
+    <MESSAGE value="add unit test" />
+    <option name="LAST_COMMIT_MESSAGE" value="add unit test" />
   </component>
   <component name="XDebuggerManager">
     <watches-manager>
diff --git a/sqlTranslate/src/test/java/testAlterTable.java b/sqlTranslate/src/test/java/testAlterTable.java
index ef9ab229..8e19514b 100644
--- a/sqlTranslate/src/test/java/testAlterTable.java
+++ b/sqlTranslate/src/test/java/testAlterTable.java
@@ -30,7 +30,7 @@ public class testAlterTable {
     }
 
     @Test
-    public void testAlterTable()
+    public void test()
     {
         int num = 1;
         for (String sql : testSQL) {
diff --git a/sqlTranslate/src/test/java/testCommitRollbackExec.java b/sqlTranslate/src/test/java/testCommitRollbackExec.java
new file mode 100644
index 00000000..f5014755
--- /dev/null
+++ b/sqlTranslate/src/test/java/testCommitRollbackExec.java
@@ -0,0 +1,53 @@
+import config.CommonConfig;
+import generator.OpenGaussGenerator;
+import lexer.OracleLexer;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import parser.OracleParser;
+import parser.ast.ASTNode;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class testCommitRollbackExec {
+    List<String> testSQL = new ArrayList<>();
+    @BeforeEach
+    public void loadData()
+    {
+        testSQL.add("BEGIN\n" +
+                "    INSERT INTO my_table (id, value) VALUES (1, 'test');\n" +
+                "    ROLLBACK;\n" +
+                "END;");
+        testSQL.add("BEGIN\n" +
+                "    INSERT INTO my_table (id, value) VALUES (1, 'test');\n" +
+                "    COMMIT;\n" +
+                "END;");
+        System.out.println("===== test of the alter table =====");
+        System.out.println("The source DBMS is: " + CommonConfig.getSourceDB());
+        System.out.println("The target DBMS is: " + CommonConfig.getTargetDB());
+        System.out.println();
+    }
+
+    @Test
+    public void test()
+    {
+        int num = 1;
+        for (String sql : testSQL) {
+            System.out.println("===== test of the SQL" + num++ + " =====");
+            System.out.println("Input SQL: " + sql);
+            OracleLexer lexer = new OracleLexer(sql);
+            lexer.printTokens();
+            OracleParser parser = new OracleParser(lexer);
+            ASTNode root = parser.parse();
+            System.out.println("The AST of the input SQL: ");
+            System.out.println(root.getASTString());
+            System.out.println("The query String of the AST parsed from the input SQL: ");
+            System.out.println(root.toQueryString());
+            OpenGaussGenerator generator = new OpenGaussGenerator(root);
+            System.out.println("The converted query String: ");
+            System.out.println(generator.generate());
+
+            System.out.println();
+        }
+    }
+}
-- 
Gitee


From 9cd1066f079d7886b46deaa0d6c6d5553ab9572b Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Fri, 20 Sep 2024 12:30:52 +0800
Subject: [PATCH 101/113] add unit test

---
 sqlTranslate/.idea/workspace.xml              | 61 ++++++++-----------
 .../src/main/java/parser/OracleParser.java    |  2 +-
 .../src/test/java/testCommitRollbackExec.java |  6 +-
 .../src/test/java/testCreateTable.java        | 53 ++++++++++++++++
 4 files changed, 85 insertions(+), 37 deletions(-)
 create mode 100644 sqlTranslate/src/test/java/testCreateTable.java

diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
index cee46f3e..8304d3f7 100644
--- a/sqlTranslate/.idea/workspace.xml
+++ b/sqlTranslate/.idea/workspace.xml
@@ -5,9 +5,10 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add unit test">
-      <change afterPath="$PROJECT_DIR$/src/test/java/testCommitRollbackExec.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/test/java/testCreateTable.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/test/java/testAlterTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/testAlterTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/parser/OracleParser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/OracleParser.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/test/java/testCommitRollbackExec.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/testCommitRollbackExec.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -45,6 +46,8 @@
     "Application.Main.executor": "Run",
     "JUnit.testAlterTable.testAlterTable.executor": "Run",
     "JUnit.testCommitRollbackExec.test.executor": "Run",
+    "JUnit.testCreateTable.executor": "Run",
+    "JUnit.testCreateTable.test.executor": "Run",
     "RunOnceActivity.OpenProjectViewOnStart": "true",
     "RunOnceActivity.ShowReadmeOnStart": "true",
     "git-widget-placeholder": "master",
@@ -56,57 +59,47 @@
     "settings.editor.selected.configurable": "preferences.pluginManager"
   }
 }]]></component>
-  <component name="RunManager" selected="JUnit.testCommitRollbackExec.test">
-    <configuration name="App" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
-      <option name="MAIN_CLASS_NAME" value="org.example.App" />
+  <component name="RunManager" selected="JUnit.testCreateTable">
+    <configuration name="Main" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
+      <option name="MAIN_CLASS_NAME" value="Main" />
       <module name="sqlTranslate" />
-      <extension name="coverage">
-        <pattern>
-          <option name="PATTERN" value="org.example.*" />
-          <option name="ENABLED" value="true" />
-        </pattern>
-      </extension>
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="Main" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
-      <option name="MAIN_CLASS_NAME" value="Main" />
+    <configuration name="testAlterTable.testAlterTable" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="sqlTranslate" />
+      <option name="PACKAGE_NAME" value="" />
+      <option name="MAIN_CLASS_NAME" value="testAlterTable" />
+      <option name="METHOD_NAME" value="testAlterTable" />
+      <option name="TEST_OBJECT" value="method" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="AppTest.shouldAnswerWithTrue" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="testCommitRollbackExec.test" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="sqlTranslate" />
-      <extension name="coverage">
-        <pattern>
-          <option name="PATTERN" value="org.example.*" />
-          <option name="ENABLED" value="true" />
-        </pattern>
-      </extension>
-      <option name="PACKAGE_NAME" value="org.example" />
-      <option name="MAIN_CLASS_NAME" value="org.example.AppTest" />
-      <option name="METHOD_NAME" value="shouldAnswerWithTrue" />
+      <option name="PACKAGE_NAME" value="" />
+      <option name="MAIN_CLASS_NAME" value="testCommitRollbackExec" />
+      <option name="METHOD_NAME" value="test" />
       <option name="TEST_OBJECT" value="method" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="testAlterTable.testAlterTable" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="testCreateTable" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="sqlTranslate" />
       <option name="PACKAGE_NAME" value="" />
-      <option name="MAIN_CLASS_NAME" value="testAlterTable" />
-      <option name="METHOD_NAME" value="testAlterTable" />
-      <option name="TEST_OBJECT" value="method" />
+      <option name="MAIN_CLASS_NAME" value="testCreateTable" />
+      <option name="TEST_OBJECT" value="class" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="testCommitRollbackExec.test" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="testCreateTable.test" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="sqlTranslate" />
       <option name="PACKAGE_NAME" value="" />
-      <option name="MAIN_CLASS_NAME" value="testCommitRollbackExec" />
+      <option name="MAIN_CLASS_NAME" value="testCreateTable" />
       <option name="METHOD_NAME" value="test" />
       <option name="TEST_OBJECT" value="method" />
       <method v="2">
@@ -114,19 +107,19 @@
       </method>
     </configuration>
     <list>
-      <item itemvalue="Application.App" />
       <item itemvalue="Application.Main" />
       <item itemvalue="JUnit.testAlterTable.testAlterTable" />
       <item itemvalue="JUnit.testCommitRollbackExec.test" />
-      <item itemvalue="JUnit.AppTest.shouldAnswerWithTrue" />
+      <item itemvalue="JUnit.testCreateTable" />
+      <item itemvalue="JUnit.testCreateTable.test" />
     </list>
     <recent_temporary>
       <list>
+        <item itemvalue="JUnit.testCreateTable" />
+        <item itemvalue="JUnit.testCreateTable.test" />
         <item itemvalue="JUnit.testCommitRollbackExec.test" />
         <item itemvalue="JUnit.testAlterTable.testAlterTable" />
         <item itemvalue="Application.Main" />
-        <item itemvalue="JUnit.AppTest.shouldAnswerWithTrue" />
-        <item itemvalue="Application.App" />
       </list>
     </recent_temporary>
   </component>
@@ -482,7 +475,7 @@
       <option name="project" value="LOCAL" />
       <updated>1726633703475</updated>
     </task>
-    <option name="localTasksCounter" value="97" />
+    <option name="localTasksCounter" value="98" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
diff --git a/sqlTranslate/src/main/java/parser/OracleParser.java b/sqlTranslate/src/main/java/parser/OracleParser.java
index 9c6bf93b..fb2c1d4a 100644
--- a/sqlTranslate/src/main/java/parser/OracleParser.java
+++ b/sqlTranslate/src/main/java/parser/OracleParser.java
@@ -2362,7 +2362,7 @@ public class OracleParser {
         ASTNode currentNode = root;
         for (int i = 1; i < parseTokens.size(); i++) {
             // match declare
-            if (currentNode == root) {
+            if (currentNode == root && !(parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("BEGIN"))) {
                 for (int j = i; j < parseTokens.size(); j++) {
                     if (parseTokens.get(j).hasType(Token.TokenType.KEYWORD) && parseTokens.get(j).getValue().equalsIgnoreCase("BEGIN")) {
                         i = j - 1;
diff --git a/sqlTranslate/src/test/java/testCommitRollbackExec.java b/sqlTranslate/src/test/java/testCommitRollbackExec.java
index f5014755..c825ef5e 100644
--- a/sqlTranslate/src/test/java/testCommitRollbackExec.java
+++ b/sqlTranslate/src/test/java/testCommitRollbackExec.java
@@ -14,11 +14,13 @@ public class testCommitRollbackExec {
     @BeforeEach
     public void loadData()
     {
-        testSQL.add("BEGIN\n" +
+        testSQL.add("DECLARE\n" +
+                "BEGIN\n" +
                 "    INSERT INTO my_table (id, value) VALUES (1, 'test');\n" +
                 "    ROLLBACK;\n" +
                 "END;");
-        testSQL.add("BEGIN\n" +
+        testSQL.add("DECLARE\n" +
+                "BEGIN\n" +
                 "    INSERT INTO my_table (id, value) VALUES (1, 'test');\n" +
                 "    COMMIT;\n" +
                 "END;");
diff --git a/sqlTranslate/src/test/java/testCreateTable.java b/sqlTranslate/src/test/java/testCreateTable.java
new file mode 100644
index 00000000..91d6c139
--- /dev/null
+++ b/sqlTranslate/src/test/java/testCreateTable.java
@@ -0,0 +1,53 @@
+import config.CommonConfig;
+import generator.OpenGaussGenerator;
+import lexer.OracleLexer;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import parser.OracleParser;
+import parser.ast.ASTNode;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class testCreateTable {
+    List<String> testSQL = new ArrayList<>();
+    @BeforeEach
+    public void loadData()
+    {
+        testSQL.add("CREATE TABLE employees (\n" +
+                "    employee_id NUMBER PRIMARY KEY,\n" +
+                "    first_name VARCHAR2(20) Check(first_name > '221'),\n" +
+                "    last_name VARCHAR2(25) Check (last_name != '12813@163.com'),\n" +
+                "    email VARCHAR2(25),\n" +
+                "    hire_date DATE,\n" +
+                "    CONSTRAINT chk_example CHECK (employee_id > 0)" +
+                ");");
+        System.out.println("===== test of the alter table =====");
+        System.out.println("The source DBMS is: " + CommonConfig.getSourceDB());
+        System.out.println("The target DBMS is: " + CommonConfig.getTargetDB());
+        System.out.println();
+    }
+
+    @Test
+    public void test()
+    {
+        int num = 1;
+        for (String sql : testSQL) {
+            System.out.println("===== test of the SQL" + num++ + " =====");
+            System.out.println("Input SQL: " + sql);
+            OracleLexer lexer = new OracleLexer(sql);
+            lexer.printTokens();
+            OracleParser parser = new OracleParser(lexer);
+            ASTNode root = parser.parse();
+            System.out.println("The AST of the input SQL: ");
+            System.out.println(root.getASTString());
+            System.out.println("The query String of the AST parsed from the input SQL: ");
+            System.out.println(root.toQueryString());
+            OpenGaussGenerator generator = new OpenGaussGenerator(root);
+            System.out.println("The converted query String: ");
+            System.out.println(generator.generate());
+
+            System.out.println();
+        }
+    }
+}
-- 
Gitee


From acaf7f12140aadeb8924fb7d7bb802a6d6c523fc Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Fri, 20 Sep 2024 12:57:18 +0800
Subject: [PATCH 102/113] add unit test

---
 sqlTranslate/.idea/workspace.xml              | 53 ++++++++++---------
 .../src/test/java/testAlterTable.java         |  4 +-
 .../src/test/java/testCommitRollbackExec.java |  4 +-
 .../src/test/java/testCreateTable.java        |  4 +-
 sqlTranslate/src/test/java/testDelete.java    | 51 ++++++++++++++++++
 sqlTranslate/src/test/java/testDropTable.java | 47 ++++++++++++++++
 sqlTranslate/src/test/java/testException.java | 53 +++++++++++++++++++
 7 files changed, 186 insertions(+), 30 deletions(-)
 create mode 100644 sqlTranslate/src/test/java/testDelete.java
 create mode 100644 sqlTranslate/src/test/java/testDropTable.java
 create mode 100644 sqlTranslate/src/test/java/testException.java

diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
index 8304d3f7..783ee293 100644
--- a/sqlTranslate/.idea/workspace.xml
+++ b/sqlTranslate/.idea/workspace.xml
@@ -5,10 +5,10 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add unit test">
-      <change afterPath="$PROJECT_DIR$/src/test/java/testCreateTable.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/test/java/testDelete.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/test/java/testDropTable.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/test/java/testException.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/parser/OracleParser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/OracleParser.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/test/java/testCommitRollbackExec.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/testCommitRollbackExec.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -48,6 +48,9 @@
     "JUnit.testCommitRollbackExec.test.executor": "Run",
     "JUnit.testCreateTable.executor": "Run",
     "JUnit.testCreateTable.test.executor": "Run",
+    "JUnit.testDelete.test.executor": "Run",
+    "JUnit.testDropTable.test.executor": "Run",
+    "JUnit.testException.executor": "Debug",
     "RunOnceActivity.OpenProjectViewOnStart": "true",
     "RunOnceActivity.ShowReadmeOnStart": "true",
     "git-widget-placeholder": "master",
@@ -59,47 +62,49 @@
     "settings.editor.selected.configurable": "preferences.pluginManager"
   }
 }]]></component>
-  <component name="RunManager" selected="JUnit.testCreateTable">
-    <configuration name="Main" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
-      <option name="MAIN_CLASS_NAME" value="Main" />
+  <component name="RunManager" selected="JUnit.testException.test">
+    <configuration name="testCreateTable" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="sqlTranslate" />
+      <option name="PACKAGE_NAME" value="" />
+      <option name="MAIN_CLASS_NAME" value="testCreateTable" />
+      <option name="TEST_OBJECT" value="class" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="testAlterTable.testAlterTable" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="testDelete.test" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="sqlTranslate" />
       <option name="PACKAGE_NAME" value="" />
-      <option name="MAIN_CLASS_NAME" value="testAlterTable" />
-      <option name="METHOD_NAME" value="testAlterTable" />
+      <option name="MAIN_CLASS_NAME" value="testDelete" />
+      <option name="METHOD_NAME" value="test" />
       <option name="TEST_OBJECT" value="method" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="testCommitRollbackExec.test" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="testDropTable.test" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="sqlTranslate" />
       <option name="PACKAGE_NAME" value="" />
-      <option name="MAIN_CLASS_NAME" value="testCommitRollbackExec" />
+      <option name="MAIN_CLASS_NAME" value="testDropTable" />
       <option name="METHOD_NAME" value="test" />
       <option name="TEST_OBJECT" value="method" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="testCreateTable" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="testException" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="sqlTranslate" />
       <option name="PACKAGE_NAME" value="" />
-      <option name="MAIN_CLASS_NAME" value="testCreateTable" />
+      <option name="MAIN_CLASS_NAME" value="testException" />
       <option name="TEST_OBJECT" value="class" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="testCreateTable.test" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="testException.test" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="sqlTranslate" />
       <option name="PACKAGE_NAME" value="" />
-      <option name="MAIN_CLASS_NAME" value="testCreateTable" />
+      <option name="MAIN_CLASS_NAME" value="testException" />
       <option name="METHOD_NAME" value="test" />
       <option name="TEST_OBJECT" value="method" />
       <method v="2">
@@ -107,19 +112,19 @@
       </method>
     </configuration>
     <list>
-      <item itemvalue="Application.Main" />
-      <item itemvalue="JUnit.testAlterTable.testAlterTable" />
-      <item itemvalue="JUnit.testCommitRollbackExec.test" />
       <item itemvalue="JUnit.testCreateTable" />
-      <item itemvalue="JUnit.testCreateTable.test" />
+      <item itemvalue="JUnit.testDelete.test" />
+      <item itemvalue="JUnit.testDropTable.test" />
+      <item itemvalue="JUnit.testException" />
+      <item itemvalue="JUnit.testException.test" />
     </list>
     <recent_temporary>
       <list>
+        <item itemvalue="JUnit.testException.test" />
+        <item itemvalue="JUnit.testException" />
+        <item itemvalue="JUnit.testDropTable.test" />
+        <item itemvalue="JUnit.testDelete.test" />
         <item itemvalue="JUnit.testCreateTable" />
-        <item itemvalue="JUnit.testCreateTable.test" />
-        <item itemvalue="JUnit.testCommitRollbackExec.test" />
-        <item itemvalue="JUnit.testAlterTable.testAlterTable" />
-        <item itemvalue="Application.Main" />
       </list>
     </recent_temporary>
   </component>
@@ -475,7 +480,7 @@
       <option name="project" value="LOCAL" />
       <updated>1726633703475</updated>
     </task>
-    <option name="localTasksCounter" value="98" />
+    <option name="localTasksCounter" value="99" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
diff --git a/sqlTranslate/src/test/java/testAlterTable.java b/sqlTranslate/src/test/java/testAlterTable.java
index 8e19514b..70c0efb4 100644
--- a/sqlTranslate/src/test/java/testAlterTable.java
+++ b/sqlTranslate/src/test/java/testAlterTable.java
@@ -23,7 +23,7 @@ public class testAlterTable {
         testSQL.add("ALTER TABLE employees ADD CONSTRAINT emp_pk PRIMARY KEY (employee_id);");
         testSQL.add("ALTER TABLE employees DROP CONSTRAINT emp_pk;");
         testSQL.add("ALTER TABLE employees RENAME TO staff;");
-        System.out.println("===== test of the alter table =====");
+        System.out.println("===== test of alter table =====");
         System.out.println("The source DBMS is: " + CommonConfig.getSourceDB());
         System.out.println("The target DBMS is: " + CommonConfig.getTargetDB());
         System.out.println();
@@ -34,7 +34,7 @@ public class testAlterTable {
     {
         int num = 1;
         for (String sql : testSQL) {
-            System.out.println("===== test of the SQL" + num++ + " =====");
+            System.out.println("===== test the SQL" + num++ + " =====");
             System.out.println("Input SQL: " + sql);
             OracleLexer lexer = new OracleLexer(sql);
             lexer.printTokens();
diff --git a/sqlTranslate/src/test/java/testCommitRollbackExec.java b/sqlTranslate/src/test/java/testCommitRollbackExec.java
index c825ef5e..96f4b193 100644
--- a/sqlTranslate/src/test/java/testCommitRollbackExec.java
+++ b/sqlTranslate/src/test/java/testCommitRollbackExec.java
@@ -24,7 +24,7 @@ public class testCommitRollbackExec {
                 "    INSERT INTO my_table (id, value) VALUES (1, 'test');\n" +
                 "    COMMIT;\n" +
                 "END;");
-        System.out.println("===== test of the alter table =====");
+        System.out.println("===== test of Commit, Rollback，Exec =====");
         System.out.println("The source DBMS is: " + CommonConfig.getSourceDB());
         System.out.println("The target DBMS is: " + CommonConfig.getTargetDB());
         System.out.println();
@@ -35,7 +35,7 @@ public class testCommitRollbackExec {
     {
         int num = 1;
         for (String sql : testSQL) {
-            System.out.println("===== test of the SQL" + num++ + " =====");
+            System.out.println("===== test the SQL" + num++ + " =====");
             System.out.println("Input SQL: " + sql);
             OracleLexer lexer = new OracleLexer(sql);
             lexer.printTokens();
diff --git a/sqlTranslate/src/test/java/testCreateTable.java b/sqlTranslate/src/test/java/testCreateTable.java
index 91d6c139..11f8e90e 100644
--- a/sqlTranslate/src/test/java/testCreateTable.java
+++ b/sqlTranslate/src/test/java/testCreateTable.java
@@ -22,7 +22,7 @@ public class testCreateTable {
                 "    hire_date DATE,\n" +
                 "    CONSTRAINT chk_example CHECK (employee_id > 0)" +
                 ");");
-        System.out.println("===== test of the alter table =====");
+        System.out.println("===== test of Create table =====");
         System.out.println("The source DBMS is: " + CommonConfig.getSourceDB());
         System.out.println("The target DBMS is: " + CommonConfig.getTargetDB());
         System.out.println();
@@ -33,7 +33,7 @@ public class testCreateTable {
     {
         int num = 1;
         for (String sql : testSQL) {
-            System.out.println("===== test of the SQL" + num++ + " =====");
+            System.out.println("===== test the SQL" + num++ + " =====");
             System.out.println("Input SQL: " + sql);
             OracleLexer lexer = new OracleLexer(sql);
             lexer.printTokens();
diff --git a/sqlTranslate/src/test/java/testDelete.java b/sqlTranslate/src/test/java/testDelete.java
new file mode 100644
index 00000000..a8f13610
--- /dev/null
+++ b/sqlTranslate/src/test/java/testDelete.java
@@ -0,0 +1,51 @@
+import config.CommonConfig;
+import generator.OpenGaussGenerator;
+import lexer.OracleLexer;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import parser.OracleParser;
+import parser.ast.ASTNode;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class testDelete {
+    List<String> testSQL = new ArrayList<>();
+    @BeforeEach
+    public void loadData()
+    {
+        testSQL.add("DELETE FROM employees e\n" +
+                "WHERE e.department_id IN (\n" +
+                "    SELECT d.department_id\n" +
+                "    FROM departments d\n" +
+                "    WHERE d.department_name = 'Sales'\n" +
+                ");");
+        System.out.println("===== test of Delete =====");
+        System.out.println("The source DBMS is: " + CommonConfig.getSourceDB());
+        System.out.println("The target DBMS is: " + CommonConfig.getTargetDB());
+        System.out.println();
+    }
+
+    @Test
+    public void test()
+    {
+        int num = 1;
+        for (String sql : testSQL) {
+            System.out.println("===== test the SQL" + num++ + " =====");
+            System.out.println("Input SQL: " + sql);
+            OracleLexer lexer = new OracleLexer(sql);
+            lexer.printTokens();
+            OracleParser parser = new OracleParser(lexer);
+            ASTNode root = parser.parse();
+            System.out.println("The AST of the input SQL: ");
+            System.out.println(root.getASTString());
+            System.out.println("The query String of the AST parsed from the input SQL: ");
+            System.out.println(root.toQueryString());
+            OpenGaussGenerator generator = new OpenGaussGenerator(root);
+            System.out.println("The converted query String: ");
+            System.out.println(generator.generate());
+
+            System.out.println();
+        }
+    }
+}
diff --git a/sqlTranslate/src/test/java/testDropTable.java b/sqlTranslate/src/test/java/testDropTable.java
new file mode 100644
index 00000000..f3618c85
--- /dev/null
+++ b/sqlTranslate/src/test/java/testDropTable.java
@@ -0,0 +1,47 @@
+import config.CommonConfig;
+import generator.OpenGaussGenerator;
+import lexer.OracleLexer;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import parser.OracleParser;
+import parser.ast.ASTNode;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class testDropTable {
+    List<String> testSQL = new ArrayList<>();
+    @BeforeEach
+    public void loadData()
+    {
+        testSQL.add("DROP TABLE employees CASCADE CONSTRAINTS;");
+        testSQL.add("DROP TABLE employees;");
+        System.out.println("===== test of Drop table =====");
+        System.out.println("The source DBMS is: " + CommonConfig.getSourceDB());
+        System.out.println("The target DBMS is: " + CommonConfig.getTargetDB());
+        System.out.println();
+    }
+
+    @Test
+    public void test()
+    {
+        int num = 1;
+        for (String sql : testSQL) {
+            System.out.println("===== test the SQL" + num++ + " =====");
+            System.out.println("Input SQL: " + sql);
+            OracleLexer lexer = new OracleLexer(sql);
+            lexer.printTokens();
+            OracleParser parser = new OracleParser(lexer);
+            ASTNode root = parser.parse();
+            System.out.println("The AST of the input SQL: ");
+            System.out.println(root.getASTString());
+            System.out.println("The query String of the AST parsed from the input SQL: ");
+            System.out.println(root.toQueryString());
+            OpenGaussGenerator generator = new OpenGaussGenerator(root);
+            System.out.println("The converted query String: ");
+            System.out.println(generator.generate());
+
+            System.out.println();
+        }
+    }
+}
diff --git a/sqlTranslate/src/test/java/testException.java b/sqlTranslate/src/test/java/testException.java
new file mode 100644
index 00000000..a3e66c96
--- /dev/null
+++ b/sqlTranslate/src/test/java/testException.java
@@ -0,0 +1,53 @@
+import config.CommonConfig;
+import generator.OpenGaussGenerator;
+import lexer.OracleLexer;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import parser.OracleParser;
+import parser.ast.ASTNode;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class testException {
+    List<String> testSQL = new ArrayList<>();
+    @BeforeEach
+    public void loadData()
+    {
+        testSQL.add("EXCEPTION\n" +
+                "    WHEN e_custom_exception THEN\n" +
+                "        DBMS_OUTPUT.PUT_LINE('Caught an exception: Custom exception raised');\n" +
+                "    WHEN ZERO_DIVIDE THEN\n" +
+                "        DBMS_OUTPUT.PUT_LINE('Caught an exception: Division by zero');\n" +
+                "    WHEN INVALID_NUMBER THEN\n" +
+                "        DBMS_OUTPUT.PUT_LINE('Caught an exception: Invalid number');\n" +
+                "    WHEN OTHERS THEN\n" +
+                "        DBMS_OUTPUT.PUT_LINE('Caught an exception: ' || SQLERRM);");
+        System.out.println("===== test of EXCEPTION =====");
+        System.out.println("The source DBMS is: " + CommonConfig.getSourceDB());
+        System.out.println("The target DBMS is: " + CommonConfig.getTargetDB());
+        System.out.println();
+    }
+
+    @Test
+    public void test()
+    {
+        int num = 1;
+        for (String sql : testSQL) {
+            System.out.println("===== test the SQL" + num++ + " =====");
+            System.out.println("Input SQL: " + sql);
+            OracleLexer lexer = new OracleLexer(sql);
+            lexer.printTokens();
+            ASTNode root = OracleParser.parseException(lexer.getTokens());
+            System.out.println("The AST of the input SQL: ");
+            System.out.println(root.getASTString());
+            System.out.println("The query String of the AST parsed from the input SQL: ");
+            System.out.println(root.toQueryString());
+            OpenGaussGenerator generator = new OpenGaussGenerator(root);
+            System.out.println("The converted query String: ");
+            System.out.println(generator.generate());
+
+            System.out.println();
+        }
+    }
+}
-- 
Gitee


From e2ba57e485e608ff8f21d501126f344c21ab525e Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Fri, 20 Sep 2024 14:27:19 +0800
Subject: [PATCH 103/113] add unit test

---
 sqlTranslate/.idea/workspace.xml              | 83 ++++++++++++-------
 sqlTranslate/src/main/java/Main.java          | 66 +++++++--------
 .../java/generator/OpenGaussGenerator.java    | 39 ++++++---
 .../src/main/java/parser/ast/ASTNode.java     | 33 ++++++++
 .../ast/function/FunctionRetDefNode.java      |  1 +
 .../ast/procedure/ProcedureRetDefNode.java    |  1 +
 sqlTranslate/src/test/java/testFunction.java  | 51 ++++++++++++
 sqlTranslate/src/test/java/testIfElse.java    | 53 ++++++++++++
 sqlTranslate/src/test/java/testInsert.java    | 47 +++++++++++
 sqlTranslate/src/test/java/testLoop.java      | 56 +++++++++++++
 sqlTranslate/src/test/java/testPL.java        | 55 ++++++++++++
 sqlTranslate/src/test/java/testProcedure.java | 68 +++++++++++++++
 sqlTranslate/src/test/java/testSelect.java    | 58 +++++++++++++
 sqlTranslate/src/test/java/testTrigger.java   | 51 ++++++++++++
 sqlTranslate/src/test/java/testUpdate.java    | 47 +++++++++++
 sqlTranslate/src/test/java/testView.java      | 49 +++++++++++
 16 files changed, 684 insertions(+), 74 deletions(-)
 create mode 100644 sqlTranslate/src/test/java/testFunction.java
 create mode 100644 sqlTranslate/src/test/java/testIfElse.java
 create mode 100644 sqlTranslate/src/test/java/testInsert.java
 create mode 100644 sqlTranslate/src/test/java/testLoop.java
 create mode 100644 sqlTranslate/src/test/java/testPL.java
 create mode 100644 sqlTranslate/src/test/java/testProcedure.java
 create mode 100644 sqlTranslate/src/test/java/testSelect.java
 create mode 100644 sqlTranslate/src/test/java/testTrigger.java
 create mode 100644 sqlTranslate/src/test/java/testUpdate.java
 create mode 100644 sqlTranslate/src/test/java/testView.java

diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
index 783ee293..72c990a7 100644
--- a/sqlTranslate/.idea/workspace.xml
+++ b/sqlTranslate/.idea/workspace.xml
@@ -5,10 +5,22 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add unit test">
-      <change afterPath="$PROJECT_DIR$/src/test/java/testDelete.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/test/java/testDropTable.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/test/java/testException.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/test/java/testFunction.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/test/java/testIfElse.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/test/java/testInsert.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/test/java/testLoop.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/test/java/testPL.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/test/java/testProcedure.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/test/java/testSelect.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/test/java/testTrigger.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/test/java/testUpdate.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/test/java/testView.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Main.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/generator/OpenGaussGenerator.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/generator/OpenGaussGenerator.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/parser/ast/ASTNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/ASTNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/parser/ast/function/FunctionRetDefNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/function/FunctionRetDefNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/parser/ast/procedure/ProcedureRetDefNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/procedure/ProcedureRetDefNode.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -50,7 +62,17 @@
     "JUnit.testCreateTable.test.executor": "Run",
     "JUnit.testDelete.test.executor": "Run",
     "JUnit.testDropTable.test.executor": "Run",
-    "JUnit.testException.executor": "Debug",
+    "JUnit.testException.executor": "Run",
+    "JUnit.testException.test.executor": "Run",
+    "JUnit.testIfElse.test.executor": "Run",
+    "JUnit.testInsert.test.executor": "Run",
+    "JUnit.testLoop.test.executor": "Run",
+    "JUnit.testPL.executor": "Run",
+    "JUnit.testProcedure.test.executor": "Run",
+    "JUnit.testSelect.test.executor": "Run",
+    "JUnit.testTrigger.executor": "Run",
+    "JUnit.testUpdate.executor": "Run",
+    "JUnit.testView.executor": "Run",
     "RunOnceActivity.OpenProjectViewOnStart": "true",
     "RunOnceActivity.ShowReadmeOnStart": "true",
     "git-widget-placeholder": "master",
@@ -62,69 +84,68 @@
     "settings.editor.selected.configurable": "preferences.pluginManager"
   }
 }]]></component>
-  <component name="RunManager" selected="JUnit.testException.test">
-    <configuration name="testCreateTable" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+  <component name="RunManager" selected="JUnit.testView">
+    <configuration name="testProcedure.test" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="sqlTranslate" />
       <option name="PACKAGE_NAME" value="" />
-      <option name="MAIN_CLASS_NAME" value="testCreateTable" />
-      <option name="TEST_OBJECT" value="class" />
+      <option name="MAIN_CLASS_NAME" value="testProcedure" />
+      <option name="METHOD_NAME" value="test" />
+      <option name="TEST_OBJECT" value="method" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="testDelete.test" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="testSelect.test" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="sqlTranslate" />
       <option name="PACKAGE_NAME" value="" />
-      <option name="MAIN_CLASS_NAME" value="testDelete" />
+      <option name="MAIN_CLASS_NAME" value="testSelect" />
       <option name="METHOD_NAME" value="test" />
       <option name="TEST_OBJECT" value="method" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="testDropTable.test" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="testTrigger" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="sqlTranslate" />
       <option name="PACKAGE_NAME" value="" />
-      <option name="MAIN_CLASS_NAME" value="testDropTable" />
-      <option name="METHOD_NAME" value="test" />
-      <option name="TEST_OBJECT" value="method" />
+      <option name="MAIN_CLASS_NAME" value="testTrigger" />
+      <option name="TEST_OBJECT" value="class" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="testException" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="testUpdate" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="sqlTranslate" />
       <option name="PACKAGE_NAME" value="" />
-      <option name="MAIN_CLASS_NAME" value="testException" />
+      <option name="MAIN_CLASS_NAME" value="testUpdate" />
       <option name="TEST_OBJECT" value="class" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="testException.test" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="testView" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="sqlTranslate" />
       <option name="PACKAGE_NAME" value="" />
-      <option name="MAIN_CLASS_NAME" value="testException" />
-      <option name="METHOD_NAME" value="test" />
-      <option name="TEST_OBJECT" value="method" />
+      <option name="MAIN_CLASS_NAME" value="testView" />
+      <option name="TEST_OBJECT" value="class" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
     </configuration>
     <list>
-      <item itemvalue="JUnit.testCreateTable" />
-      <item itemvalue="JUnit.testDelete.test" />
-      <item itemvalue="JUnit.testDropTable.test" />
-      <item itemvalue="JUnit.testException" />
-      <item itemvalue="JUnit.testException.test" />
+      <item itemvalue="JUnit.testProcedure.test" />
+      <item itemvalue="JUnit.testSelect.test" />
+      <item itemvalue="JUnit.testTrigger" />
+      <item itemvalue="JUnit.testUpdate" />
+      <item itemvalue="JUnit.testView" />
     </list>
     <recent_temporary>
       <list>
-        <item itemvalue="JUnit.testException.test" />
-        <item itemvalue="JUnit.testException" />
-        <item itemvalue="JUnit.testDropTable.test" />
-        <item itemvalue="JUnit.testDelete.test" />
-        <item itemvalue="JUnit.testCreateTable" />
+        <item itemvalue="JUnit.testView" />
+        <item itemvalue="JUnit.testUpdate" />
+        <item itemvalue="JUnit.testTrigger" />
+        <item itemvalue="JUnit.testSelect.test" />
+        <item itemvalue="JUnit.testProcedure.test" />
       </list>
     </recent_temporary>
   </component>
@@ -480,7 +501,7 @@
       <option name="project" value="LOCAL" />
       <updated>1726633703475</updated>
     </task>
-    <option name="localTasksCounter" value="99" />
+    <option name="localTasksCounter" value="100" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
diff --git a/sqlTranslate/src/main/java/Main.java b/sqlTranslate/src/main/java/Main.java
index 59442883..b17eed35 100644
--- a/sqlTranslate/src/main/java/Main.java
+++ b/sqlTranslate/src/main/java/Main.java
@@ -57,32 +57,32 @@ public class Main {
 //                "        DBMS_OUTPUT.PUT_LINE('Caught an exception: Invalid number');\n" +
 //                "    WHEN OTHERS THEN\n" +
 //                "        DBMS_OUTPUT.PUT_LINE('Caught an exception: ' || SQLERRM);";
-//        String sql = "CREATE OR REPLACE PROCEDURE update_salary (\n" +
-//                "             employee_id IN NUMBER,\n" +
-//                "             new_salary IN OUT NUMBER\n" +
-//                "         ) IS\n" +
-//                "             v_employee NUMBER;\n" +
-//                "         BEGIN\n" +
-//                "             SELECT * INTO v_employee FROM employees WHERE employee_id = employee_id;\n" +
-//                "\n" +
-//                "             IF new_salary < 3000 THEN\n" +
-//                "                 new_salary := new_salary * 1.1;\n" +
-//                "             ELSE\n" +
-//                "                 new_salary := new_salary * 1.05;\n" +
-//                "             END IF;\n" +
-//                "\n" +
-//                "             UPDATE employees SET salary = new_salary WHERE employee_id = employee_id;\n" +
-//                "             COMMIT;\n" +
-//                "\n" +
-//                "             DBMS_OUTPUT.PUT_LINE('Updated Salary: ' || new_salary);\n" +
-//                "         EXCEPTION\n" +
-//                "             WHEN NO_DATA_FOUND THEN\n" +
-//                "                 DBMS_OUTPUT.PUT_LINE('Employee not found.');\n" +
-//                "             WHEN TOO_MANY_ROWS THEN\n" +
-//                "                 DBMS_OUTPUT.PUT_LINE('Multiple employees found.');\n" +
-//                "             WHEN OTHERS THEN\n" +
-//                "                 DBMS_OUTPUT.PUT_LINE('An error occurred: ' || SQLERRM);\n" +
-//                "         END update_salary;\n";
+        String sql = "CREATE OR REPLACE PROCEDURE update_salary (\n" +
+                "             employee_id IN NUMBER,\n" +
+                "             new_salary IN OUT NUMBER\n" +
+                "         ) IS\n" +
+                "             v_employee NUMBER;\n" +
+                "         BEGIN\n" +
+                "             SELECT * INTO v_employee FROM employees WHERE employee_id = employee_id;\n" +
+                "\n" +
+                "             IF new_salary < 3000 THEN\n" +
+                "                 new_salary := new_salary * 1.1;\n" +
+                "             ELSE\n" +
+                "                 new_salary := new_salary * 1.05;\n" +
+                "             END IF;\n" +
+                "\n" +
+                "             UPDATE employees SET salary = new_salary WHERE employee_id = employee_id;\n" +
+                "             COMMIT;\n" +
+                "\n" +
+                "             DBMS_OUTPUT.PUT_LINE('Updated Salary: ' || new_salary);\n" +
+                "         EXCEPTION\n" +
+                "             WHEN NO_DATA_FOUND THEN\n" +
+                "                 DBMS_OUTPUT.PUT_LINE('Employee not found.');\n" +
+                "             WHEN TOO_MANY_ROWS THEN\n" +
+                "                 DBMS_OUTPUT.PUT_LINE('Multiple employees found.');\n" +
+                "             WHEN OTHERS THEN\n" +
+                "                 DBMS_OUTPUT.PUT_LINE('An error occurred: ' || SQLERRM);\n" +
+                "         END update_salary;\n";
 //        String sql = "CREATE OR REPLACE FUNCTION string_length (\n" +
 //                "    input_string VARCHAR2\n" +
 //                ") RETURN NUMBER IS\n" +
@@ -95,13 +95,13 @@ public class Main {
 //                "         BEGIN\n" +
 //                "             INSERT INTO audit_log (action, employee_id) VALUES ('INSERT', :NEW.id);\n" +
 //                "         END;";
-        String sql = "DECLARE\n" +
-                "            v_name Varchar2(20);\n" +
-                "            v_salary employees.salary%TYPE;\n" +
-                "         BEGIN\n" +
-                "            SELECT name, salary INTO v_name, v_salary FROM employees WHERE employee_id = 100;\n" +
-                "            DBMS_OUTPUT.PUT_LINE('Name: ' || v_name || ', Salary: ' || v_salary);\n" +
-                "         END;";
+//        String sql = "DECLARE\n" +
+//                "            v_name Varchar2(20);\n" +
+//                "            v_salary employees.salary%TYPE;\n" +
+//                "         BEGIN\n" +
+//                "            SELECT name, salary INTO v_name, v_salary FROM employees WHERE employee_id = 100;\n" +
+//                "            DBMS_OUTPUT.PUT_LINE('Name: ' || v_name || ', Salary: ' || v_salary);\n" +
+//                "         END;";
         OracleLexer lexer = new OracleLexer(sql);
         lexer.printTokens();
         OracleParser parser = new OracleParser(lexer);
diff --git a/sqlTranslate/src/main/java/generator/OpenGaussGenerator.java b/sqlTranslate/src/main/java/generator/OpenGaussGenerator.java
index 30224eea..9ae034c9 100644
--- a/sqlTranslate/src/main/java/generator/OpenGaussGenerator.java
+++ b/sqlTranslate/src/main/java/generator/OpenGaussGenerator.java
@@ -20,6 +20,7 @@ import parser.ast.function.FunctionColumnNode;
 import parser.ast.function.FunctionEndNode;
 import parser.ast.function.FunctionNode;
 import parser.ast.function.FunctionRetDefNode;
+import parser.ast.iFELSIF.IFConditionNode;
 import parser.ast.insert.InsertNode;
 import parser.ast.join.JoinConditionNode;
 import parser.ast.join.JoinSourceTabNode;
@@ -31,10 +32,7 @@ import parser.ast.pl.PLBodyNode;
 import parser.ast.pl.PLDeclareNode;
 import parser.ast.pl.PLEndNode;
 import parser.ast.pl.PLNode;
-import parser.ast.procedure.ProcedureColumnNode;
-import parser.ast.procedure.ProcedureEndNode;
-import parser.ast.procedure.ProcedureNode;
-import parser.ast.procedure.ProcedureRetDefNode;
+import parser.ast.procedure.*;
 import parser.ast.select.SelectNode;
 import parser.ast.trigger.*;
 import parser.ast.update.UpdateNode;
@@ -101,6 +99,9 @@ public class OpenGaussGenerator {
         else if (node instanceof PLNode) {
             return GenPLSQL(node);
         }
+        else if (node instanceof IFConditionNode) {
+            return GenIfElseSQL(node);
+        }
         else {
             try {
                 throw new GenerateFailedException("Root node:" + node.getClass() + "(Unsupported node type!)");
@@ -189,6 +190,12 @@ public class OpenGaussGenerator {
 
     private String GenPLSQL(ASTNode node) {
         visitPLSQL(node);
+//        System.out.println(node.getASTString());
+        return node.toQueryString();
+    }
+
+    private String GenIfElseSQL(ASTNode node) {
+        visitIfElse(node);
         return node.toQueryString();
     }
 
@@ -240,6 +247,13 @@ public class OpenGaussGenerator {
         }
     }
 
+    private void visitIfElse(ASTNode node) {
+
+        for (ASTNode child : node.getChildren()) {
+            visitIfElse(child);
+        }
+    }
+
     private void visitException(ASTNode node) {
         if (CommonConfig.getSourceDB().equalsIgnoreCase("ORACLE-19C")
          && CommonConfig.getTargetDB().equalsIgnoreCase("OPENGAUSS-3.0.0")) {
@@ -319,6 +333,9 @@ public class OpenGaussGenerator {
             else if (node instanceof ExceptionNode) {
                 visitException(node);
             }
+            else if (node instanceof ProcedurePLStatementNode) {
+                CommonConvert(node);
+            }
         }
         for (ASTNode child : node.getChildren()) {
             visitPL(child);
@@ -388,8 +405,10 @@ public class OpenGaussGenerator {
     private void CommonConvert(ASTNode node) {
         if (node.checkExistsByRegex("(?i)DBMS_OUTPUT.PUT_LINE\\(.*?\\)")) {
             String printObj = "";
+            int index = -1;
             for (Token token: node.getTokens()) {
                 if (token.getValue().matches("(?i)DBMS_OUTPUT.PUT_LINE\\(.*?\\)")) {
+                    index = node.getTokenIndexByRegex("(?i)DBMS_OUTPUT.PUT_LINE\\(.*?\\)");
                     Pattern pattern = Pattern.compile("\\(([^()]*)\\)");
                     Matcher matcher = pattern.matcher(token.getValue());
                     while (matcher.find()) {
@@ -405,8 +424,8 @@ public class OpenGaussGenerator {
                 tokens.add(new Token(Token.TokenType.STRING, "'%'"));
                 tokens.add(new Token(Token.TokenType.SYMBOL, ","));
                 tokens.add(new Token(Token.TokenType.IDENTIFIER, printObj));
-                tokens.add(new Token(Token.TokenType.SYMBOL, ";"));
-                node.setTokens(tokens);
+                node.moveTokenByIndex(index);
+                node.addTokensByIndex(index, tokens);
             }
             else {
                 OracleLexer lexer = new OracleLexer(printObj.replace("||", " "));
@@ -433,8 +452,8 @@ public class OpenGaussGenerator {
                         tokens.add(new Token(Token.TokenType.SYMBOL, ","));
                         tokens.add(token);
                     }
-                    tokens.add(new Token(Token.TokenType.SYMBOL, ";"));
-                    node.setTokens(tokens);
+                    node.moveTokenByIndex(index);
+                    node.addTokensByIndex(index, tokens);
                 }
                 else {
                     List<Token> tokens = new ArrayList<>();
@@ -443,8 +462,8 @@ public class OpenGaussGenerator {
                     tokens.add(new Token(Token.TokenType.STRING, "'%'"));
                     tokens.add(new Token(Token.TokenType.SYMBOL, ","));
                     tokens.add(new Token(Token.TokenType.STRING, "'" + output + "'"));
-                    tokens.add(new Token(Token.TokenType.SYMBOL, ";"));
-                    node.setTokens(tokens);
+                    node.moveTokenByIndex(index);
+                    node.addTokensByIndex(index, tokens);
                 }
 
             }
diff --git a/sqlTranslate/src/main/java/parser/ast/ASTNode.java b/sqlTranslate/src/main/java/parser/ast/ASTNode.java
index f927fe47..5bce8b93 100644
--- a/sqlTranslate/src/main/java/parser/ast/ASTNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/ASTNode.java
@@ -4,6 +4,8 @@ import lexer.Token;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
+import java.util.regex.Pattern;
 
 public abstract class ASTNode {
     private List<Token> tokens;
@@ -31,6 +33,37 @@ public abstract class ASTNode {
         this.tokens = tokens;
     }
 
+    public void modifyTokens(int index, Token token) {
+        tokens.set(index, token);
+    }
+
+    public void moveTokenByIndex(int index) {
+        tokens.remove(index);
+    }
+
+    public void addTokenByIndex(int index, Token token) {
+        tokens.add(index, token);
+    }
+
+    public void addTokensByIndex(int index, List<Token> tokens) {
+        this.tokens.addAll(index, tokens);
+    }
+
+    public int getTokenIndexByRegex(String regex) {
+        Pattern pattern = Pattern.compile(regex);
+        Optional<Integer> indexOpt = tokens.stream()
+                .filter(token -> pattern.matcher(token.getValue()).matches())
+                .map(token -> tokens.indexOf(token))
+                .findFirst();
+        if (indexOpt.isPresent()) {
+            int index = indexOpt.get();
+            return index;
+        } else {
+            return -1;
+        }
+
+    }
+
     public boolean checkExistsByRegex (String regex) {
         return tokens.stream().anyMatch(token -> token.getValue().matches(regex));
     }
diff --git a/sqlTranslate/src/main/java/parser/ast/function/FunctionRetDefNode.java b/sqlTranslate/src/main/java/parser/ast/function/FunctionRetDefNode.java
index 73723d2b..f46a01e2 100644
--- a/sqlTranslate/src/main/java/parser/ast/function/FunctionRetDefNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/function/FunctionRetDefNode.java
@@ -12,6 +12,7 @@ public class FunctionRetDefNode extends ASTNode implements DataType {
     public FunctionRetDefNode() {
         super();
         setTokens(new ArrayList<>());
+        setType(new Token(Token.TokenType.NULL, ""));
     }
 
     public FunctionRetDefNode(ASTNode node) {
diff --git a/sqlTranslate/src/main/java/parser/ast/procedure/ProcedureRetDefNode.java b/sqlTranslate/src/main/java/parser/ast/procedure/ProcedureRetDefNode.java
index 7d063145..8164b25f 100644
--- a/sqlTranslate/src/main/java/parser/ast/procedure/ProcedureRetDefNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/procedure/ProcedureRetDefNode.java
@@ -12,6 +12,7 @@ public class ProcedureRetDefNode extends ASTNode implements DataType {
     public ProcedureRetDefNode() {
         super();
         setTokens(new ArrayList<>());
+        setType(new Token(Token.TokenType.NULL, ""));
     }
 
     public ProcedureRetDefNode(ASTNode node) {
diff --git a/sqlTranslate/src/test/java/testFunction.java b/sqlTranslate/src/test/java/testFunction.java
new file mode 100644
index 00000000..94a63d42
--- /dev/null
+++ b/sqlTranslate/src/test/java/testFunction.java
@@ -0,0 +1,51 @@
+import config.CommonConfig;
+import generator.OpenGaussGenerator;
+import lexer.OracleLexer;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import parser.OracleParser;
+import parser.ast.ASTNode;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class testFunction {
+    List<String> testSQL = new ArrayList<>();
+    @BeforeEach
+    public void loadData()
+    {
+        testSQL.add("CREATE OR REPLACE FUNCTION string_length (\n" +
+                "             input_string VARCHAR2\n" +
+                "         ) RETURN NUMBER IS\n" +
+                "         BEGIN\n" +
+                "             RETURN LENGTH(input_string);\n" +
+                "         END;");
+        System.out.println("===== test of Function =====");
+        System.out.println("The source DBMS is: " + CommonConfig.getSourceDB());
+        System.out.println("The target DBMS is: " + CommonConfig.getTargetDB());
+        System.out.println();
+    }
+
+    @Test
+    public void test()
+    {
+        int num = 1;
+        for (String sql : testSQL) {
+            System.out.println("===== test the SQL" + num++ + " =====");
+            System.out.println("Input SQL: " + sql);
+            OracleLexer lexer = new OracleLexer(sql);
+            lexer.printTokens();
+            OracleParser parser = new OracleParser(lexer);
+            ASTNode root = parser.parse();
+            System.out.println("The AST of the input SQL: ");
+            System.out.println(root.getASTString());
+            System.out.println("The query String of the AST parsed from the input SQL: ");
+            System.out.println(root.toQueryString());
+            OpenGaussGenerator generator = new OpenGaussGenerator(root);
+            System.out.println("The converted query String: ");
+            System.out.println(generator.generate());
+
+            System.out.println();
+        }
+    }
+}
diff --git a/sqlTranslate/src/test/java/testIfElse.java b/sqlTranslate/src/test/java/testIfElse.java
new file mode 100644
index 00000000..39c930b9
--- /dev/null
+++ b/sqlTranslate/src/test/java/testIfElse.java
@@ -0,0 +1,53 @@
+import config.CommonConfig;
+import generator.OpenGaussGenerator;
+import lexer.OracleLexer;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import parser.OracleParser;
+import parser.ast.ASTNode;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class testIfElse {
+    List<String> testSQL = new ArrayList<>();
+    @BeforeEach
+    public void loadData()
+    {
+        testSQL.add("IF v_salary >= 100000 THEN\n" +
+                "                 v_bonus := v_salary * 0.1;\n" +
+                "             ELSIF v_salary >= 50000 THEN\n" +
+                "                 v_bonus := v_salary * 0.08;\n" +
+                "             ELSIF v_salary >= 30000 THEN\n" +
+                "                 v_bonus := v_salary * 0.05;\n" +
+                "             ELSE\n" +
+                "                 v_bonus := v_salary * 0.03;\n" +
+                "             END IF;");
+        System.out.println("===== test of IfElse =====");
+        System.out.println("The source DBMS is: " + CommonConfig.getSourceDB());
+        System.out.println("The target DBMS is: " + CommonConfig.getTargetDB());
+        System.out.println();
+    }
+
+    @Test
+    public void test()
+    {
+        int num = 1;
+        for (String sql : testSQL) {
+            System.out.println("===== test the SQL" + num++ + " =====");
+            System.out.println("Input SQL: " + sql);
+            OracleLexer lexer = new OracleLexer(sql);
+            lexer.printTokens();
+            ASTNode root = OracleParser.parseIFELSE(lexer.getTokens());
+            System.out.println("The AST of the input SQL: ");
+            System.out.println(root.getASTString());
+            System.out.println("The query String of the AST parsed from the input SQL: ");
+            System.out.println(root.toQueryString());
+            OpenGaussGenerator generator = new OpenGaussGenerator(root);
+            System.out.println("The converted query String: ");
+            System.out.println(generator.generate());
+
+            System.out.println();
+        }
+    }
+}
diff --git a/sqlTranslate/src/test/java/testInsert.java b/sqlTranslate/src/test/java/testInsert.java
new file mode 100644
index 00000000..673cbbfd
--- /dev/null
+++ b/sqlTranslate/src/test/java/testInsert.java
@@ -0,0 +1,47 @@
+import config.CommonConfig;
+import generator.OpenGaussGenerator;
+import lexer.OracleLexer;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import parser.OracleParser;
+import parser.ast.ASTNode;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class testInsert {
+    List<String> testSQL = new ArrayList<>();
+    @BeforeEach
+    public void loadData()
+    {
+        testSQL.add("INSERT INTO employees (first_name, last_name, email) VALUES ('Jane', 'Smith', 'janesm@example.com');");
+        testSQL.add("INSERT INTO employees VALUES ('Jane', 'Smith', 'janesm@example.com');");
+        System.out.println("===== test of Insert =====");
+        System.out.println("The source DBMS is: " + CommonConfig.getSourceDB());
+        System.out.println("The target DBMS is: " + CommonConfig.getTargetDB());
+        System.out.println();
+    }
+
+    @Test
+    public void test()
+    {
+        int num = 1;
+        for (String sql : testSQL) {
+            System.out.println("===== test the SQL" + num++ + " =====");
+            System.out.println("Input SQL: " + sql);
+            OracleLexer lexer = new OracleLexer(sql);
+            lexer.printTokens();
+            OracleParser parser = new OracleParser(lexer);
+            ASTNode root = parser.parse();
+            System.out.println("The AST of the input SQL: ");
+            System.out.println(root.getASTString());
+            System.out.println("The query String of the AST parsed from the input SQL: ");
+            System.out.println(root.toQueryString());
+            OpenGaussGenerator generator = new OpenGaussGenerator(root);
+            System.out.println("The converted query String: ");
+            System.out.println(generator.generate());
+
+            System.out.println();
+        }
+    }
+}
diff --git a/sqlTranslate/src/test/java/testLoop.java b/sqlTranslate/src/test/java/testLoop.java
new file mode 100644
index 00000000..a31e3888
--- /dev/null
+++ b/sqlTranslate/src/test/java/testLoop.java
@@ -0,0 +1,56 @@
+import config.CommonConfig;
+import generator.OpenGaussGenerator;
+import lexer.OracleLexer;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import parser.OracleParser;
+import parser.ast.ASTNode;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class testLoop {
+    List<String> testSQL = new ArrayList<>();
+    @BeforeEach
+    public void loadData()
+    {
+        testSQL.add("LOOP\n" +
+                "            DBMS_OUTPUT.PUT_LINE(v_counter);\n" +
+                "            v_counter := v_counter + 1;\n" +
+                "            EXIT WHEN v_counter > 10;\n" +
+                "        END LOOP;");
+        testSQL.add("WHILE v_counter <= 10 LOOP\n" +
+                "            DBMS_OUTPUT.PUT_LINE(v_counter);\n" +
+                "            v_counter := v_counter + 1;\n" +
+                "        END LOOP;");
+        testSQL.add("FOR i IN 1..10 LOOP\n" +
+                "            DBMS_OUTPUT.PUT_LINE(i);\n" +
+                "        END LOOP;");
+        System.out.println("===== test of Loop =====");
+        System.out.println("The source DBMS is: " + CommonConfig.getSourceDB());
+        System.out.println("The target DBMS is: " + CommonConfig.getTargetDB());
+        System.out.println();
+    }
+
+    @Test
+    public void test()
+    {
+        int num = 1;
+        for (String sql : testSQL) {
+            System.out.println("===== test the SQL" + num++ + " =====");
+            System.out.println("Input SQL: " + sql);
+            OracleLexer lexer = new OracleLexer(sql);
+            lexer.printTokens();
+            ASTNode root = OracleParser.parseLoop(lexer.getTokens());
+            System.out.println("The AST of the input SQL: ");
+            System.out.println(root.getASTString());
+            System.out.println("The query String of the AST parsed from the input SQL: ");
+            System.out.println(root.toQueryString());
+            OpenGaussGenerator generator = new OpenGaussGenerator(root);
+            System.out.println("The converted query String: ");
+            System.out.println(generator.generate());
+
+            System.out.println();
+        }
+    }
+}
diff --git a/sqlTranslate/src/test/java/testPL.java b/sqlTranslate/src/test/java/testPL.java
new file mode 100644
index 00000000..ddeeb6f8
--- /dev/null
+++ b/sqlTranslate/src/test/java/testPL.java
@@ -0,0 +1,55 @@
+import config.CommonConfig;
+import generator.OpenGaussGenerator;
+import lexer.OracleLexer;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import parser.OracleParser;
+import parser.ast.ASTNode;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class testPL {
+    List<String> testSQL = new ArrayList<>();
+    @BeforeEach
+    public void loadData()
+    {
+        testSQL.add("DECLARE\n" +
+                "            v_name Varchar2(20);\n" +
+                "            v_salary employees.salary%TYPE;\n" +
+                "         BEGIN\n" +
+                "            SELECT name, salary INTO v_name, v_salary FROM employees WHERE employee_id = 100;\n" +
+                "            DBMS_OUTPUT.PUT_LINE('Name: ' || v_name || ', Salary: ' || v_salary);\n" +
+                "         EXCEPTION\n" +
+                "            WHEN NO_DATA_FOUND THEN\n" +
+                "               DBMS_OUTPUT.PUT_LINE('No data found.');\n" +
+                "         END;");
+        System.out.println("===== test of PL =====");
+        System.out.println("The source DBMS is: " + CommonConfig.getSourceDB());
+        System.out.println("The target DBMS is: " + CommonConfig.getTargetDB());
+        System.out.println();
+    }
+
+    @Test
+    public void test()
+    {
+        int num = 1;
+        for (String sql : testSQL) {
+            System.out.println("===== test the SQL" + num++ + " =====");
+            System.out.println("Input SQL: " + sql);
+            OracleLexer lexer = new OracleLexer(sql);
+            lexer.printTokens();
+            OracleParser parser = new OracleParser(lexer);
+            ASTNode root = parser.parse();
+            System.out.println("The AST of the input SQL: ");
+            System.out.println(root.getASTString());
+            System.out.println("The query String of the AST parsed from the input SQL: ");
+            System.out.println(root.toQueryString());
+            OpenGaussGenerator generator = new OpenGaussGenerator(root);
+            System.out.println("The converted query String: ");
+            System.out.println(generator.generate());
+
+            System.out.println();
+        }
+    }
+}
diff --git a/sqlTranslate/src/test/java/testProcedure.java b/sqlTranslate/src/test/java/testProcedure.java
new file mode 100644
index 00000000..7069351a
--- /dev/null
+++ b/sqlTranslate/src/test/java/testProcedure.java
@@ -0,0 +1,68 @@
+import config.CommonConfig;
+import generator.OpenGaussGenerator;
+import lexer.OracleLexer;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import parser.OracleParser;
+import parser.ast.ASTNode;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class testProcedure {
+    List<String> testSQL = new ArrayList<>();
+    @BeforeEach
+    public void loadData()
+    {
+        testSQL.add("CREATE OR REPLACE PROCEDURE update_salary (\n" +
+                "             employee_id IN NUMBER,\n" +
+                "             new_salary IN OUT NUMBER\n" +
+                "         ) IS\n" +
+                "             v_employee employees%ROWTYPE;\n" +
+                "         BEGIN\n" +
+                "             SELECT * INTO v_employee FROM employees WHERE employee_id = employee_id;\n" +
+                "             IF new_salary < 3000 THEN\n" +
+                "                 new_salary := new_salary * 1.1;\n" +
+                "             ELSE\n" +
+                "                 new_salary := new_salary * 1.05;\n" +
+                "             END IF;\n" +
+                "             UPDATE employees SET salary = new_salary WHERE employee_id = employee_id;\n" +
+                "             COMMIT;\n" +
+                "             DBMS_OUTPUT.PUT_LINE('Updated Salary: ' || new_salary);\n" +
+                "         EXCEPTION\n" +
+                "             WHEN NO_DATA_FOUND THEN\n" +
+                "                 DBMS_OUTPUT.PUT_LINE('Employee not found.');\n" +
+                "             WHEN TOO_MANY_ROWS THEN\n" +
+                "                 DBMS_OUTPUT.PUT_LINE('Multiple employees found.');\n" +
+                "             WHEN OTHERS THEN\n" +
+                "                 DBMS_OUTPUT.PUT_LINE('An error occurred: ' || SQLERRM);\n" +
+                "         END update_salary;");
+        System.out.println("===== test of Procedure =====");
+        System.out.println("The source DBMS is: " + CommonConfig.getSourceDB());
+        System.out.println("The target DBMS is: " + CommonConfig.getTargetDB());
+        System.out.println();
+    }
+
+    @Test
+    public void test()
+    {
+        int num = 1;
+        for (String sql : testSQL) {
+            System.out.println("===== test the SQL" + num++ + " =====");
+            System.out.println("Input SQL: " + sql);
+            OracleLexer lexer = new OracleLexer(sql);
+            lexer.printTokens();
+            OracleParser parser = new OracleParser(lexer);
+            ASTNode root = parser.parse();
+            System.out.println("The AST of the input SQL: ");
+            System.out.println(root.getASTString());
+            System.out.println("The query String of the AST parsed from the input SQL: ");
+            System.out.println(root.toQueryString());
+            OpenGaussGenerator generator = new OpenGaussGenerator(root);
+            System.out.println("The converted query String: ");
+            System.out.println(generator.generate());
+
+            System.out.println();
+        }
+    }
+}
diff --git a/sqlTranslate/src/test/java/testSelect.java b/sqlTranslate/src/test/java/testSelect.java
new file mode 100644
index 00000000..ad319651
--- /dev/null
+++ b/sqlTranslate/src/test/java/testSelect.java
@@ -0,0 +1,58 @@
+import config.CommonConfig;
+import generator.OpenGaussGenerator;
+import lexer.OracleLexer;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import parser.OracleParser;
+import parser.ast.ASTNode;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class testSelect {
+    List<String> testSQL = new ArrayList<>();
+    @BeforeEach
+    public void loadData()
+    {
+        testSQL.add("SELECT * FROM employees;");
+        testSQL.add("SELECT employee_id, first_name, last_name FROM employees;");
+        testSQL.add("SELECT * FROM employees WHERE department_id = 10;");
+        testSQL.add("SELECT * FROM employees ORDER BY hire_date DESC;");
+        testSQL.add("SELECT COUNT(*), AVG(salary) FROM employees;");
+        testSQL.add("SELECT department_id, COUNT(*) FROM employees GROUP BY department_id;");
+        testSQL.add("SELECT e.first_name, d.department_name FROM employees e JOIN departments d ON e.department_id = d.department_id;");
+        testSQL.add("SELECT\n" +
+                "        column1,\n" +
+                "        CASE WHEN column2 > 0 THEN 'Positive' ELSE 'Non-positive' END as status,\n" +
+                "        SUBSTR(column3, 1, 5) as substring_column3\n" +
+                "    FROM table_name;");
+        testSQL.add("SELECT column1, COUNT(column2) FROM table_name GROUP BY column1 HAVING COUNT(column2) > 10;");
+        System.out.println("===== test of Select =====");
+        System.out.println("The source DBMS is: " + CommonConfig.getSourceDB());
+        System.out.println("The target DBMS is: " + CommonConfig.getTargetDB());
+        System.out.println();
+    }
+
+    @Test
+    public void test()
+    {
+        int num = 1;
+        for (String sql : testSQL) {
+            System.out.println("===== test the SQL" + num++ + " =====");
+            System.out.println("Input SQL: " + sql);
+            OracleLexer lexer = new OracleLexer(sql);
+            lexer.printTokens();
+            OracleParser parser = new OracleParser(lexer);
+            ASTNode root = parser.parse();
+            System.out.println("The AST of the input SQL: ");
+            System.out.println(root.getASTString());
+            System.out.println("The query String of the AST parsed from the input SQL: ");
+            System.out.println(root.toQueryString());
+            OpenGaussGenerator generator = new OpenGaussGenerator(root);
+            System.out.println("The converted query String: ");
+            System.out.println(generator.generate());
+
+            System.out.println();
+        }
+    }
+}
diff --git a/sqlTranslate/src/test/java/testTrigger.java b/sqlTranslate/src/test/java/testTrigger.java
new file mode 100644
index 00000000..bc7d067c
--- /dev/null
+++ b/sqlTranslate/src/test/java/testTrigger.java
@@ -0,0 +1,51 @@
+import config.CommonConfig;
+import generator.OpenGaussGenerator;
+import lexer.OracleLexer;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import parser.OracleParser;
+import parser.ast.ASTNode;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class testTrigger {
+    List<String> testSQL = new ArrayList<>();
+    @BeforeEach
+    public void loadData()
+    {
+        testSQL.add("CREATE OR REPLACE TRIGGER log_insert\n" +
+                "         BEFORE INSERT ON employees\n" +
+                "         FOR EACH ROW\n" +
+                "         BEGIN\n" +
+                "             INSERT INTO audit_log (action, employee_id) VALUES ('INSERT', :NEW.id);\n" +
+                "         END;");
+        System.out.println("===== test of Trigger =====");
+        System.out.println("The source DBMS is: " + CommonConfig.getSourceDB());
+        System.out.println("The target DBMS is: " + CommonConfig.getTargetDB());
+        System.out.println();
+    }
+
+    @Test
+    public void test()
+    {
+        int num = 1;
+        for (String sql : testSQL) {
+            System.out.println("===== test the SQL" + num++ + " =====");
+            System.out.println("Input SQL: " + sql);
+            OracleLexer lexer = new OracleLexer(sql);
+            lexer.printTokens();
+            OracleParser parser = new OracleParser(lexer);
+            ASTNode root = parser.parse();
+            System.out.println("The AST of the input SQL: ");
+            System.out.println(root.getASTString());
+            System.out.println("The query String of the AST parsed from the input SQL: ");
+            System.out.println(root.toQueryString());
+            OpenGaussGenerator generator = new OpenGaussGenerator(root);
+            System.out.println("The converted query String: ");
+            System.out.println(generator.generate());
+
+            System.out.println();
+        }
+    }
+}
diff --git a/sqlTranslate/src/test/java/testUpdate.java b/sqlTranslate/src/test/java/testUpdate.java
new file mode 100644
index 00000000..3fe863e6
--- /dev/null
+++ b/sqlTranslate/src/test/java/testUpdate.java
@@ -0,0 +1,47 @@
+import config.CommonConfig;
+import generator.OpenGaussGenerator;
+import lexer.OracleLexer;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import parser.OracleParser;
+import parser.ast.ASTNode;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class testUpdate {
+    List<String> testSQL = new ArrayList<>();
+    @BeforeEach
+    public void loadData()
+    {
+        testSQL.add("UPDATE employees e JOIN departments d using e.department_id = d.department_id\n" +
+                "         SET e.salary = e.salary * 1.10, d.budget = d.budget * 1.10 WHERE d.department_name = 'Sales';");
+        System.out.println("===== test of Update =====");
+        System.out.println("The source DBMS is: " + CommonConfig.getSourceDB());
+        System.out.println("The target DBMS is: " + CommonConfig.getTargetDB());
+        System.out.println();
+    }
+
+    @Test
+    public void test()
+    {
+        int num = 1;
+        for (String sql : testSQL) {
+            System.out.println("===== test the SQL" + num++ + " =====");
+            System.out.println("Input SQL: " + sql);
+            OracleLexer lexer = new OracleLexer(sql);
+            lexer.printTokens();
+            OracleParser parser = new OracleParser(lexer);
+            ASTNode root = parser.parse();
+            System.out.println("The AST of the input SQL: ");
+            System.out.println(root.getASTString());
+            System.out.println("The query String of the AST parsed from the input SQL: ");
+            System.out.println(root.toQueryString());
+            OpenGaussGenerator generator = new OpenGaussGenerator(root);
+            System.out.println("The converted query String: ");
+            System.out.println(generator.generate());
+
+            System.out.println();
+        }
+    }
+}
diff --git a/sqlTranslate/src/test/java/testView.java b/sqlTranslate/src/test/java/testView.java
new file mode 100644
index 00000000..b3b36afb
--- /dev/null
+++ b/sqlTranslate/src/test/java/testView.java
@@ -0,0 +1,49 @@
+import config.CommonConfig;
+import generator.OpenGaussGenerator;
+import lexer.OracleLexer;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import parser.OracleParser;
+import parser.ast.ASTNode;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class testView {
+    List<String> testSQL = new ArrayList<>();
+    @BeforeEach
+    public void loadData()
+    {
+        testSQL.add("CREATE OR REPLACE VIEW employee_details AS SELECT first_name, last_name, salary FROM employees;");
+        testSQL.add("CREATE OR REPLACE VIEW emp_info (full_name, pay) AS SELECT first_name || ' ' || last_name AS full_name, salary AS pay FROM employees;");
+        testSQL.add("CREATE OR REPLACE VIEW emp_dept_info AS SELECT e.first_name, e.last_name, d.department_name FROM employees e JOIN departments d ON e.department_id = d.department_id;");
+        testSQL.add("CREATE OR REPLACE VIEW high_salary_employees AS SELECT first_name, last_name, salary FROM employees WHERE salary > 50000;");
+        System.out.println("===== test of View =====");
+        System.out.println("The source DBMS is: " + CommonConfig.getSourceDB());
+        System.out.println("The target DBMS is: " + CommonConfig.getTargetDB());
+        System.out.println();
+    }
+
+    @Test
+    public void test()
+    {
+        int num = 1;
+        for (String sql : testSQL) {
+            System.out.println("===== test the SQL" + num++ + " =====");
+            System.out.println("Input SQL: " + sql);
+            OracleLexer lexer = new OracleLexer(sql);
+            lexer.printTokens();
+            OracleParser parser = new OracleParser(lexer);
+            ASTNode root = parser.parse();
+            System.out.println("The AST of the input SQL: ");
+            System.out.println(root.getASTString());
+            System.out.println("The query String of the AST parsed from the input SQL: ");
+            System.out.println(root.toQueryString());
+            OpenGaussGenerator generator = new OpenGaussGenerator(root);
+            System.out.println("The converted query String: ");
+            System.out.println(generator.generate());
+
+            System.out.println();
+        }
+    }
+}
-- 
Gitee


From bfd142e34ff5d2cb364b3ce7f0f9e7466f8f8046 Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Fri, 20 Sep 2024 14:58:23 +0800
Subject: [PATCH 104/113] fix some bugs

---
 sqlTranslate/.idea/workspace.xml              | 67 ++++++++-----------
 sqlTranslate/src/main/java/Main.java          | 54 +++++++--------
 .../src/main/java/lexer/OracleLexer.java      | 12 +---
 sqlTranslate/src/test/java/testJoin.java      | 46 +++++++++++++
 sqlTranslate/src/test/java/testProcedure.java |  2 +-
 5 files changed, 106 insertions(+), 75 deletions(-)
 create mode 100644 sqlTranslate/src/test/java/testJoin.java

diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
index 72c990a7..6adffbc1 100644
--- a/sqlTranslate/.idea/workspace.xml
+++ b/sqlTranslate/.idea/workspace.xml
@@ -5,22 +5,10 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add unit test">
-      <change afterPath="$PROJECT_DIR$/src/test/java/testFunction.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/test/java/testIfElse.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/test/java/testInsert.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/test/java/testLoop.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/test/java/testPL.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/test/java/testProcedure.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/test/java/testSelect.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/test/java/testTrigger.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/test/java/testUpdate.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/test/java/testView.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/test/java/testJoin.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Main.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/generator/OpenGaussGenerator.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/generator/OpenGaussGenerator.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/parser/ast/ASTNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/ASTNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/parser/ast/function/FunctionRetDefNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/function/FunctionRetDefNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/parser/ast/procedure/ProcedureRetDefNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/procedure/ProcedureRetDefNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/lexer/OracleLexer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/lexer/OracleLexer.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -56,6 +44,7 @@
   <component name="PropertiesComponent"><![CDATA[{
   "keyToString": {
     "Application.Main.executor": "Run",
+    "JUnit.testAlterTable.executor": "Run",
     "JUnit.testAlterTable.testAlterTable.executor": "Run",
     "JUnit.testCommitRollbackExec.test.executor": "Run",
     "JUnit.testCreateTable.executor": "Run",
@@ -66,6 +55,8 @@
     "JUnit.testException.test.executor": "Run",
     "JUnit.testIfElse.test.executor": "Run",
     "JUnit.testInsert.test.executor": "Run",
+    "JUnit.testJoin.executor": "Run",
+    "JUnit.testJoin.test.executor": "Run",
     "JUnit.testLoop.test.executor": "Run",
     "JUnit.testPL.executor": "Run",
     "JUnit.testProcedure.test.executor": "Run",
@@ -84,68 +75,68 @@
     "settings.editor.selected.configurable": "preferences.pluginManager"
   }
 }]]></component>
-  <component name="RunManager" selected="JUnit.testView">
-    <configuration name="testProcedure.test" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+  <component name="RunManager" selected="JUnit.testProcedure.test">
+    <configuration name="testAlterTable" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="sqlTranslate" />
       <option name="PACKAGE_NAME" value="" />
-      <option name="MAIN_CLASS_NAME" value="testProcedure" />
-      <option name="METHOD_NAME" value="test" />
-      <option name="TEST_OBJECT" value="method" />
+      <option name="MAIN_CLASS_NAME" value="testAlterTable" />
+      <option name="TEST_OBJECT" value="class" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="testSelect.test" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="testJoin" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="sqlTranslate" />
       <option name="PACKAGE_NAME" value="" />
-      <option name="MAIN_CLASS_NAME" value="testSelect" />
-      <option name="METHOD_NAME" value="test" />
-      <option name="TEST_OBJECT" value="method" />
+      <option name="MAIN_CLASS_NAME" value="testJoin" />
+      <option name="TEST_OBJECT" value="class" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="testTrigger" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="testProcedure.test" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="sqlTranslate" />
       <option name="PACKAGE_NAME" value="" />
-      <option name="MAIN_CLASS_NAME" value="testTrigger" />
-      <option name="TEST_OBJECT" value="class" />
+      <option name="MAIN_CLASS_NAME" value="testProcedure" />
+      <option name="METHOD_NAME" value="test" />
+      <option name="TEST_OBJECT" value="method" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="testUpdate" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="testSelect.test" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="sqlTranslate" />
       <option name="PACKAGE_NAME" value="" />
-      <option name="MAIN_CLASS_NAME" value="testUpdate" />
-      <option name="TEST_OBJECT" value="class" />
+      <option name="MAIN_CLASS_NAME" value="testSelect" />
+      <option name="METHOD_NAME" value="test" />
+      <option name="TEST_OBJECT" value="method" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="testView" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="testUpdate" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="sqlTranslate" />
       <option name="PACKAGE_NAME" value="" />
-      <option name="MAIN_CLASS_NAME" value="testView" />
+      <option name="MAIN_CLASS_NAME" value="testUpdate" />
       <option name="TEST_OBJECT" value="class" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
     </configuration>
     <list>
+      <item itemvalue="JUnit.testAlterTable" />
+      <item itemvalue="JUnit.testJoin" />
       <item itemvalue="JUnit.testProcedure.test" />
       <item itemvalue="JUnit.testSelect.test" />
-      <item itemvalue="JUnit.testTrigger" />
       <item itemvalue="JUnit.testUpdate" />
-      <item itemvalue="JUnit.testView" />
     </list>
     <recent_temporary>
       <list>
-        <item itemvalue="JUnit.testView" />
-        <item itemvalue="JUnit.testUpdate" />
-        <item itemvalue="JUnit.testTrigger" />
-        <item itemvalue="JUnit.testSelect.test" />
         <item itemvalue="JUnit.testProcedure.test" />
+        <item itemvalue="JUnit.testAlterTable" />
+        <item itemvalue="JUnit.testJoin" />
+        <item itemvalue="JUnit.testSelect.test" />
+        <item itemvalue="JUnit.testUpdate" />
       </list>
     </recent_temporary>
   </component>
@@ -501,7 +492,7 @@
       <option name="project" value="LOCAL" />
       <updated>1726633703475</updated>
     </task>
-    <option name="localTasksCounter" value="100" />
+    <option name="localTasksCounter" value="101" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
diff --git a/sqlTranslate/src/main/java/Main.java b/sqlTranslate/src/main/java/Main.java
index b17eed35..840bf217 100644
--- a/sqlTranslate/src/main/java/Main.java
+++ b/sqlTranslate/src/main/java/Main.java
@@ -17,7 +17,7 @@ public class Main {
 //                ");";
 //        String sql = "INSERT INTO employees (first_name, last_name, email) VALUES ('Jane', 'Smith', 'janesm@example.com');";
 //        String sql = "DROP TABLE employees CASCADE CONSTRAINTS;";
-//        String sql = "SELECT e.first_name, d.department_name FROM employees e JOIN departments d Using e.department_id = d.department_id;";
+        String sql = "SELECT e.first_name, d.department_name FROM employees e JOIN departments d Using e.department_id = d.department_id;";
 //        String sql = "employees e JOIN departments d ON e.department_id = d.department_id;";
 //        String sql = "UPDATE employees e\n" +
 //                "JOIN departments d using e.department_id = d.department_id\n" +
@@ -57,32 +57,32 @@ public class Main {
 //                "        DBMS_OUTPUT.PUT_LINE('Caught an exception: Invalid number');\n" +
 //                "    WHEN OTHERS THEN\n" +
 //                "        DBMS_OUTPUT.PUT_LINE('Caught an exception: ' || SQLERRM);";
-        String sql = "CREATE OR REPLACE PROCEDURE update_salary (\n" +
-                "             employee_id IN NUMBER,\n" +
-                "             new_salary IN OUT NUMBER\n" +
-                "         ) IS\n" +
-                "             v_employee NUMBER;\n" +
-                "         BEGIN\n" +
-                "             SELECT * INTO v_employee FROM employees WHERE employee_id = employee_id;\n" +
-                "\n" +
-                "             IF new_salary < 3000 THEN\n" +
-                "                 new_salary := new_salary * 1.1;\n" +
-                "             ELSE\n" +
-                "                 new_salary := new_salary * 1.05;\n" +
-                "             END IF;\n" +
-                "\n" +
-                "             UPDATE employees SET salary = new_salary WHERE employee_id = employee_id;\n" +
-                "             COMMIT;\n" +
-                "\n" +
-                "             DBMS_OUTPUT.PUT_LINE('Updated Salary: ' || new_salary);\n" +
-                "         EXCEPTION\n" +
-                "             WHEN NO_DATA_FOUND THEN\n" +
-                "                 DBMS_OUTPUT.PUT_LINE('Employee not found.');\n" +
-                "             WHEN TOO_MANY_ROWS THEN\n" +
-                "                 DBMS_OUTPUT.PUT_LINE('Multiple employees found.');\n" +
-                "             WHEN OTHERS THEN\n" +
-                "                 DBMS_OUTPUT.PUT_LINE('An error occurred: ' || SQLERRM);\n" +
-                "         END update_salary;\n";
+//        String sql = "CREATE OR REPLACE PROCEDURE update_salary (\n" +
+//                "             employee_id IN NUMBER,\n" +
+//                "             new_salary IN OUT NUMBER\n" +
+//                "         ) IS\n" +
+//                "             v_employee NUMBER;\n" +
+//                "         BEGIN\n" +
+//                "             SELECT * INTO v_employee FROM employees WHERE employee_id = employee_id;\n" +
+//                "\n" +
+//                "             IF new_salary < 3000 THEN\n" +
+//                "                 new_salary := new_salary * 1.1;\n" +
+//                "             ELSE\n" +
+//                "                 new_salary := new_salary * 1.05;\n" +
+//                "             END IF;\n" +
+//                "\n" +
+//                "             UPDATE employees SET salary = new_salary WHERE employee_id = employee_id;\n" +
+//                "             COMMIT;\n" +
+//                "\n" +
+//                "             DBMS_OUTPUT.PUT_LINE('Updated Salary: ' || new_salary);\n" +
+//                "         EXCEPTION\n" +
+//                "             WHEN NO_DATA_FOUND THEN\n" +
+//                "                 DBMS_OUTPUT.PUT_LINE('Employee not found.');\n" +
+//                "             WHEN TOO_MANY_ROWS THEN\n" +
+//                "                 DBMS_OUTPUT.PUT_LINE('Multiple employees found.');\n" +
+//                "             WHEN OTHERS THEN\n" +
+//                "                 DBMS_OUTPUT.PUT_LINE('An error occurred: ' || SQLERRM);\n" +
+//                "         END update_salary;\n";
 //        String sql = "CREATE OR REPLACE FUNCTION string_length (\n" +
 //                "    input_string VARCHAR2\n" +
 //                ") RETURN NUMBER IS\n" +
diff --git a/sqlTranslate/src/main/java/lexer/OracleLexer.java b/sqlTranslate/src/main/java/lexer/OracleLexer.java
index 21d0e017..fa85ba0c 100644
--- a/sqlTranslate/src/main/java/lexer/OracleLexer.java
+++ b/sqlTranslate/src/main/java/lexer/OracleLexer.java
@@ -7,7 +7,7 @@ import java.util.regex.Pattern;
 
 
 public class OracleLexer {
-    public static final String[] keywords = {"SELECT", "FROM", "WHERE", "AND", "OR", "INSERT", "UPDATE", "DELETE", "VALUES",
+    public static final String[] keywords = {"SELECT", "FROM", "WHERE", "AND", "OR", "INSERT", "UPDATE", "DELETE", "VALUES", "INTO",
             // keywords of creating table
             "CREATE", "TABLE", "TEMPORARY", "GLOBAL",
             "NUMBER", "INTEGER", "SMALLIN", "BINARY_INTEGER", "DECIMAL", "REAL", "FLOAT", "DOUBLE PRECISION", "CHAR", "VARCHAR2",
@@ -85,9 +85,7 @@ public class OracleLexer {
                     "(:=)|" +
                     "(\\.\\.)|" +
 
-                    "(\\b[A-Za-z_][A-Za-z0-9_]*(%[A-Za-z_][A-Za-z0-9_]*)*\\b)|" + // Keywords and identifiers
-                    "(\\b[A-Za-z_][A-Za-z0-9_]*(\\.[A-Za-z_][A-Za-z0-9_]*)*\\b)|" + // Keywords and identifiers
-                    "(\\b[A-Za-z_][A-Za-z0-9_]*\\b)|" + // Keywords and identifiers
+                    "(\\b[A-Za-z_][A-Za-z0-9_.%]*\\b)|" + // Keywords and identifiers
                     "(\\d+\\.?\\d*)|" +                 // Numbers (integer or decimal)
                     "(\"[^\"]*\")|" +                   // Double-quoted strings
                     "('([^']|\\\\')*)'|" +              // Single-quoted strings
@@ -189,11 +187,7 @@ public class OracleLexer {
 
         else if (isKeyword(tokenValue)) {
             return new Token(Token.TokenType.KEYWORD, tokenValue);
-        } else if (tokenValue.matches("[A-Za-z_][A-Za-z0-9_]*(%[A-Za-z_][A-Za-z0-9_]*)*")) {
-            return new Token(Token.TokenType.IDENTIFIER, tokenValue);
-        } else if (tokenValue.matches("[A-Za-z_][A-Za-z0-9_]*(\\.[A-Za-z_][A-Za-z0-9_]*)*")) {
-            return new Token(Token.TokenType.IDENTIFIER, tokenValue);
-        } else if (tokenValue.matches("[a-zA-Z_][a-zA-Z0-9_]*")) {
+        } else if (tokenValue.matches("[a-zA-Z_][a-zA-Z0-9_.%]*")) {
             return new Token(Token.TokenType.IDENTIFIER, tokenValue);
         }
         return null;
diff --git a/sqlTranslate/src/test/java/testJoin.java b/sqlTranslate/src/test/java/testJoin.java
new file mode 100644
index 00000000..87f6e8a3
--- /dev/null
+++ b/sqlTranslate/src/test/java/testJoin.java
@@ -0,0 +1,46 @@
+import config.CommonConfig;
+import generator.OpenGaussGenerator;
+import lexer.OracleLexer;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import parser.OracleParser;
+import parser.ast.ASTNode;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class testJoin {
+    List<String> testSQL = new ArrayList<>();
+    @BeforeEach
+    public void loadData()
+    {
+        testSQL.add("employees e JOIN departments d using e.department_id = d.department_id;");
+        testSQL.add("employees JOIN departments on employees.department_id = departments.department_id;");
+        System.out.println("===== test of Join =====");
+        System.out.println("The source DBMS is: " + CommonConfig.getSourceDB());
+        System.out.println("The target DBMS is: " + CommonConfig.getTargetDB());
+        System.out.println();
+    }
+
+    @Test
+    public void test()
+    {
+        int num = 1;
+        for (String sql : testSQL) {
+            System.out.println("===== test the SQL" + num++ + " =====");
+            System.out.println("Input SQL: " + sql);
+            OracleLexer lexer = new OracleLexer(sql);
+            lexer.printTokens();
+            ASTNode root = OracleParser.parseJoin(lexer.getTokens());
+            System.out.println("The AST of the input SQL: ");
+            System.out.println(root.getASTString());
+            System.out.println("The query String of the AST parsed from the input SQL: ");
+            System.out.println(root.toQueryString());
+            OpenGaussGenerator generator = new OpenGaussGenerator(root);
+            System.out.println("The converted query String: ");
+            System.out.println(generator.generate());
+
+            System.out.println();
+        }
+    }
+}
diff --git a/sqlTranslate/src/test/java/testProcedure.java b/sqlTranslate/src/test/java/testProcedure.java
index 7069351a..798a345b 100644
--- a/sqlTranslate/src/test/java/testProcedure.java
+++ b/sqlTranslate/src/test/java/testProcedure.java
@@ -20,7 +20,7 @@ public class testProcedure {
                 "         ) IS\n" +
                 "             v_employee employees%ROWTYPE;\n" +
                 "         BEGIN\n" +
-                "             SELECT * INTO v_employee FROM employees WHERE employee_id = employee_id;\n" +
+                "             SELECT * FROM employees WHERE employee_id = employee_id;\n" +
                 "             IF new_salary < 3000 THEN\n" +
                 "                 new_salary := new_salary * 1.1;\n" +
                 "             ELSE\n" +
-- 
Gitee


From 4a25a62b724b0be34468ee0c2ea83698c56f2e5f Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Fri, 20 Sep 2024 15:08:51 +0800
Subject: [PATCH 105/113] fix some bugs

---
 sqlTranslate/.idea/workspace.xml              | 48 +++++-----
 sqlTranslate/src/main/java/Main.java          | 94 +------------------
 .../java/document/Select statement in Oracle  |  3 +-
 .../java/generator/OpenGaussGenerator.java    | 16 ++++
 sqlTranslate/src/test/java/testCaseWhen.java  | 45 +++++++++
 sqlTranslate/src/test/java/testSelect.java    |  3 +-
 6 files changed, 90 insertions(+), 119 deletions(-)
 create mode 100644 sqlTranslate/src/test/java/testCaseWhen.java

diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
index 6adffbc1..6b5ea573 100644
--- a/sqlTranslate/.idea/workspace.xml
+++ b/sqlTranslate/.idea/workspace.xml
@@ -4,11 +4,13 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="add unit test">
-      <change afterPath="$PROJECT_DIR$/src/test/java/testJoin.java" afterDir="false" />
+    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="fix some bugs">
+      <change afterPath="$PROJECT_DIR$/src/test/java/testCaseWhen.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Main.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/lexer/OracleLexer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/lexer/OracleLexer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/document/Select statement in Oracle" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/document/Select statement in Oracle" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/document/Todolist" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/document/Todolist" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/test/java/testSelect.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/testSelect.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -46,6 +48,7 @@
     "Application.Main.executor": "Run",
     "JUnit.testAlterTable.executor": "Run",
     "JUnit.testAlterTable.testAlterTable.executor": "Run",
+    "JUnit.testCaseWhen.test.executor": "Run",
     "JUnit.testCommitRollbackExec.test.executor": "Run",
     "JUnit.testCreateTable.executor": "Run",
     "JUnit.testCreateTable.test.executor": "Run",
@@ -60,6 +63,7 @@
     "JUnit.testLoop.test.executor": "Run",
     "JUnit.testPL.executor": "Run",
     "JUnit.testProcedure.test.executor": "Run",
+    "JUnit.testSelect.executor": "Run",
     "JUnit.testSelect.test.executor": "Run",
     "JUnit.testTrigger.executor": "Run",
     "JUnit.testUpdate.executor": "Run",
@@ -75,7 +79,7 @@
     "settings.editor.selected.configurable": "preferences.pluginManager"
   }
 }]]></component>
-  <component name="RunManager" selected="JUnit.testProcedure.test">
+  <component name="RunManager" selected="JUnit.testCaseWhen.test">
     <configuration name="testAlterTable" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="sqlTranslate" />
       <option name="PACKAGE_NAME" value="" />
@@ -85,39 +89,39 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="testJoin" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="testCaseWhen.test" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="sqlTranslate" />
       <option name="PACKAGE_NAME" value="" />
-      <option name="MAIN_CLASS_NAME" value="testJoin" />
-      <option name="TEST_OBJECT" value="class" />
+      <option name="MAIN_CLASS_NAME" value="testCaseWhen" />
+      <option name="METHOD_NAME" value="test" />
+      <option name="TEST_OBJECT" value="method" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="testProcedure.test" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="testJoin" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="sqlTranslate" />
       <option name="PACKAGE_NAME" value="" />
-      <option name="MAIN_CLASS_NAME" value="testProcedure" />
-      <option name="METHOD_NAME" value="test" />
-      <option name="TEST_OBJECT" value="method" />
+      <option name="MAIN_CLASS_NAME" value="testJoin" />
+      <option name="TEST_OBJECT" value="class" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="testSelect.test" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="testProcedure.test" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="sqlTranslate" />
       <option name="PACKAGE_NAME" value="" />
-      <option name="MAIN_CLASS_NAME" value="testSelect" />
+      <option name="MAIN_CLASS_NAME" value="testProcedure" />
       <option name="METHOD_NAME" value="test" />
       <option name="TEST_OBJECT" value="method" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="testUpdate" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="testSelect" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="sqlTranslate" />
       <option name="PACKAGE_NAME" value="" />
-      <option name="MAIN_CLASS_NAME" value="testUpdate" />
+      <option name="MAIN_CLASS_NAME" value="testSelect" />
       <option name="TEST_OBJECT" value="class" />
       <method v="2">
         <option name="Make" enabled="true" />
@@ -125,18 +129,18 @@
     </configuration>
     <list>
       <item itemvalue="JUnit.testAlterTable" />
+      <item itemvalue="JUnit.testCaseWhen.test" />
       <item itemvalue="JUnit.testJoin" />
       <item itemvalue="JUnit.testProcedure.test" />
-      <item itemvalue="JUnit.testSelect.test" />
-      <item itemvalue="JUnit.testUpdate" />
+      <item itemvalue="JUnit.testSelect" />
     </list>
     <recent_temporary>
       <list>
+        <item itemvalue="JUnit.testCaseWhen.test" />
+        <item itemvalue="JUnit.testSelect" />
         <item itemvalue="JUnit.testProcedure.test" />
         <item itemvalue="JUnit.testAlterTable" />
         <item itemvalue="JUnit.testJoin" />
-        <item itemvalue="JUnit.testSelect.test" />
-        <item itemvalue="JUnit.testUpdate" />
       </list>
     </recent_temporary>
   </component>
@@ -492,7 +496,7 @@
       <option name="project" value="LOCAL" />
       <updated>1726633703475</updated>
     </task>
-    <option name="localTasksCounter" value="101" />
+    <option name="localTasksCounter" value="102" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
@@ -507,7 +511,6 @@
     </option>
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="add if elseif else endif document" />
     <MESSAGE value="add if elseif else endif ast classes" />
     <MESSAGE value="add IF ELSIF" />
     <MESSAGE value="add Loop document" />
@@ -532,7 +535,8 @@
     <MESSAGE value="add pl/sql" />
     <MESSAGE value="revise" />
     <MESSAGE value="add unit test" />
-    <option name="LAST_COMMIT_MESSAGE" value="add unit test" />
+    <MESSAGE value="fix some bugs" />
+    <option name="LAST_COMMIT_MESSAGE" value="fix some bugs" />
   </component>
   <component name="XDebuggerManager">
     <watches-manager>
diff --git a/sqlTranslate/src/main/java/Main.java b/sqlTranslate/src/main/java/Main.java
index 840bf217..63c9b318 100644
--- a/sqlTranslate/src/main/java/Main.java
+++ b/sqlTranslate/src/main/java/Main.java
@@ -7,101 +7,9 @@ import parser.OracleParser;
 
 public class Main {
     public static void main(String[] args) {
-//        String sql = "CREATE TABLE employees (\n" +
-//                "    employee_id NUMBER PRIMARY KEY,\n" +
-//                "    first_name VARCHAR2(20) Check(first_name > '221'),\n" +
-//                "    last_name VARCHAR2(25) Check (last_name != '12813@163.com'),\n" +
-//                "    email VARCHAR2(25),\n" +
-//                "    hire_date DATE,\n" +
-//                "    CONSTRAINT chk_example CHECK (employee_id > 0)" +
-//                ");";
-//        String sql = "INSERT INTO employees (first_name, last_name, email) VALUES ('Jane', 'Smith', 'janesm@example.com');";
-//        String sql = "DROP TABLE employees CASCADE CONSTRAINTS;";
         String sql = "SELECT e.first_name, d.department_name FROM employees e JOIN departments d Using e.department_id = d.department_id;";
-//        String sql = "employees e JOIN departments d ON e.department_id = d.department_id;";
-//        String sql = "UPDATE employees e\n" +
-//                "JOIN departments d using e.department_id = d.department_id\n" +
-//                "SET e.salary = e.salary * 1.10,\n" +
-//                "    d.budget = d.budget * 1.10\n" +
-//                "WHERE d.department_name = 'Sales';";
-//        String sql = "DELETE FROM employees e\n" +
-//                "WHERE e.department_id IN (\n" +
-//                "    SELECT d.department_id\n" +
-//                "    FROM departments d\n" +
-//                "    WHERE d.department_name = 'Sales'\n" +
-//                ");";
-//        String sql = "ALTER TABLE employees ADD email VARCHAR2(100) Check (email != '12813@163.com');";
 //        String sql = "CASE WHEN column2 > 0 THEN 'Positive' ELSE 'Non-positive' END";
-//        String sql = "CREATE OR REPLACE VIEW emp_dept_info AS SELECT e.first_name, e.last_name, d.department_name FROM employees e JOIN departments d Using e.department_id = d.department_id;";
-//        String sql = "IF v_salary >= 100000 THEN\n" +
-//                "                 v_bonus := v_salary * 0.1;\n" +
-//                "             ELSIF v_salary >= 50000 THEN\n" +
-//                "                 v_bonus := v_salary * 0.08;\n" +
-//                "             ELSIF v_salary >= 30000 THEN\n" +
-//                "                 v_bonus := v_salary * 0.05;\n" +
-//                "             ELSE\n" +
-//                "                 v_bonus := v_salary * 0.03;\n" +
-//                "             END IF;";
-//        String sql = "LOOP\n" +
-//                "        DBMS_OUTPUT.PUT_LINE(v_counter);\n" +
-//                "        Continue;\n" +
-//                "        v_counter := v_counter + 1;\n" +
-//                "        EXIT WHEN v_counter > 10;\n" +
-//                "    END LOOP;";
-//        String sql = "EXCEPTION\n" +
-//                "    WHEN e_custom_exception THEN\n" +
-//                "        DBMS_OUTPUT.PUT_LINE('Caught an exception: Custom exception raised');\n" +
-//                "    WHEN ZERO_DIVIDE THEN\n" +
-//                "        DBMS_OUTPUT.PUT_LINE('Caught an exception: Division by zero');\n" +
-//                "    WHEN INVALID_NUMBER THEN\n" +
-//                "        DBMS_OUTPUT.PUT_LINE('Caught an exception: Invalid number');\n" +
-//                "    WHEN OTHERS THEN\n" +
-//                "        DBMS_OUTPUT.PUT_LINE('Caught an exception: ' || SQLERRM);";
-//        String sql = "CREATE OR REPLACE PROCEDURE update_salary (\n" +
-//                "             employee_id IN NUMBER,\n" +
-//                "             new_salary IN OUT NUMBER\n" +
-//                "         ) IS\n" +
-//                "             v_employee NUMBER;\n" +
-//                "         BEGIN\n" +
-//                "             SELECT * INTO v_employee FROM employees WHERE employee_id = employee_id;\n" +
-//                "\n" +
-//                "             IF new_salary < 3000 THEN\n" +
-//                "                 new_salary := new_salary * 1.1;\n" +
-//                "             ELSE\n" +
-//                "                 new_salary := new_salary * 1.05;\n" +
-//                "             END IF;\n" +
-//                "\n" +
-//                "             UPDATE employees SET salary = new_salary WHERE employee_id = employee_id;\n" +
-//                "             COMMIT;\n" +
-//                "\n" +
-//                "             DBMS_OUTPUT.PUT_LINE('Updated Salary: ' || new_salary);\n" +
-//                "         EXCEPTION\n" +
-//                "             WHEN NO_DATA_FOUND THEN\n" +
-//                "                 DBMS_OUTPUT.PUT_LINE('Employee not found.');\n" +
-//                "             WHEN TOO_MANY_ROWS THEN\n" +
-//                "                 DBMS_OUTPUT.PUT_LINE('Multiple employees found.');\n" +
-//                "             WHEN OTHERS THEN\n" +
-//                "                 DBMS_OUTPUT.PUT_LINE('An error occurred: ' || SQLERRM);\n" +
-//                "         END update_salary;\n";
-//        String sql = "CREATE OR REPLACE FUNCTION string_length (\n" +
-//                "    input_string VARCHAR2\n" +
-//                ") RETURN NUMBER IS\n" +
-//                "BEGIN\n" +
-//                "    RETURN LENGTH(input_string);\n" +
-//                "END;\n";
-//        String sql = "CREATE OR REPLACE TRIGGER log_insert\n" +
-//                "         BEFORE INSERT ON employees\n" +
-//                "         FOR EACH ROW\n" +
-//                "         BEGIN\n" +
-//                "             INSERT INTO audit_log (action, employee_id) VALUES ('INSERT', :NEW.id);\n" +
-//                "         END;";
-//        String sql = "DECLARE\n" +
-//                "            v_name Varchar2(20);\n" +
-//                "            v_salary employees.salary%TYPE;\n" +
-//                "         BEGIN\n" +
-//                "            SELECT name, salary INTO v_name, v_salary FROM employees WHERE employee_id = 100;\n" +
-//                "            DBMS_OUTPUT.PUT_LINE('Name: ' || v_name || ', Salary: ' || v_salary);\n" +
-//                "         END;";
+//
         OracleLexer lexer = new OracleLexer(sql);
         lexer.printTokens();
         OracleParser parser = new OracleParser(lexer);
diff --git a/sqlTranslate/src/main/java/document/Select statement in Oracle b/sqlTranslate/src/main/java/document/Select statement in Oracle
index 562fc927..44672239 100644
--- a/sqlTranslate/src/main/java/document/Select statement in Oracle	
+++ b/sqlTranslate/src/main/java/document/Select statement in Oracle	
@@ -5,8 +5,7 @@ select_option = GROUP BY | ORDER BY | HAVING
 function = COUNT() | SUM() | AVG() | MAX() | MIN()
 
 example:
-    SELECT * FROM employees;
-    SELECT employee_id, first_name, last_name FROM employees;
+    SELECT * FROM employees Union SELECT employee_id, first_name, last_name FROM employees;
     SELECT * FROM employees WHERE department_id = 10;
     SELECT * FROM employees ORDER BY hire_date DESC;
     SELECT COUNT(*), AVG(salary) FROM employees;
diff --git a/sqlTranslate/src/main/java/generator/OpenGaussGenerator.java b/sqlTranslate/src/main/java/generator/OpenGaussGenerator.java
index 9ae034c9..d1af1787 100644
--- a/sqlTranslate/src/main/java/generator/OpenGaussGenerator.java
+++ b/sqlTranslate/src/main/java/generator/OpenGaussGenerator.java
@@ -8,6 +8,7 @@ import parser.ast.ASTNode;
 import parser.ast.alterTable.AlterAddColumnNode;
 import parser.ast.alterTable.AlterModifyColumnNode;
 import parser.ast.alterTable.AlterNode;
+import parser.ast.caseWhen.CaseConditionNode;
 import parser.ast.createTable.ColumnNode;
 import parser.ast.createTable.CreateTabNode;
 import exception.GenerateFailedException;
@@ -102,6 +103,9 @@ public class OpenGaussGenerator {
         else if (node instanceof IFConditionNode) {
             return GenIfElseSQL(node);
         }
+        else if (node instanceof CaseConditionNode) {
+            return GenCaseWhenSQL(node);
+        }
         else {
             try {
                 throw new GenerateFailedException("Root node:" + node.getClass() + "(Unsupported node type!)");
@@ -141,6 +145,11 @@ public class OpenGaussGenerator {
         return node.toQueryString();
     }
 
+    private String GenCaseWhenSQL(ASTNode node) {
+        visitCaseWhen(node);
+        return node.toQueryString();
+    }
+
     private String GenUpdateSQL(ASTNode node) {
         visitUpdate(node);
 //        System.out.println(node.getASTString());
@@ -235,6 +244,13 @@ public class OpenGaussGenerator {
         }
     }
 
+    private void visitCaseWhen(ASTNode node) {
+
+        for (ASTNode child : node.getChildren()) {
+            visitCaseWhen(child);
+        }
+    }
+
     private void visitLoop(ASTNode node) {
         if (CommonConfig.getSourceDB().equalsIgnoreCase("ORACLE-19C")
          && CommonConfig.getTargetDB().equalsIgnoreCase("OPENGAUSS-3.0.0")) {
diff --git a/sqlTranslate/src/test/java/testCaseWhen.java b/sqlTranslate/src/test/java/testCaseWhen.java
new file mode 100644
index 00000000..a2dca08a
--- /dev/null
+++ b/sqlTranslate/src/test/java/testCaseWhen.java
@@ -0,0 +1,45 @@
+import config.CommonConfig;
+import generator.OpenGaussGenerator;
+import lexer.OracleLexer;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import parser.OracleParser;
+import parser.ast.ASTNode;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class testCaseWhen {
+    List<String> testSQL = new ArrayList<>();
+    @BeforeEach
+    public void loadData()
+    {
+        testSQL.add("CASE WHEN column2 > 0 THEN 'Positive' ELSE 'Non-positive' END");
+        System.out.println("===== test of CaseWhen =====");
+        System.out.println("The source DBMS is: " + CommonConfig.getSourceDB());
+        System.out.println("The target DBMS is: " + CommonConfig.getTargetDB());
+        System.out.println();
+    }
+
+    @Test
+    public void test()
+    {
+        int num = 1;
+        for (String sql : testSQL) {
+            System.out.println("===== test the SQL" + num++ + " =====");
+            System.out.println("Input SQL: " + sql);
+            OracleLexer lexer = new OracleLexer(sql);
+            lexer.printTokens();
+            ASTNode root = OracleParser.parseCaseWhen(lexer.getTokens());
+            System.out.println("The AST of the input SQL: ");
+            System.out.println(root.getASTString());
+            System.out.println("The query String of the AST parsed from the input SQL: ");
+            System.out.println(root.toQueryString());
+            OpenGaussGenerator generator = new OpenGaussGenerator(root);
+            System.out.println("The converted query String: ");
+            System.out.println(generator.generate());
+
+            System.out.println();
+        }
+    }
+}
diff --git a/sqlTranslate/src/test/java/testSelect.java b/sqlTranslate/src/test/java/testSelect.java
index ad319651..acb6baee 100644
--- a/sqlTranslate/src/test/java/testSelect.java
+++ b/sqlTranslate/src/test/java/testSelect.java
@@ -14,8 +14,7 @@ public class testSelect {
     @BeforeEach
     public void loadData()
     {
-        testSQL.add("SELECT * FROM employees;");
-        testSQL.add("SELECT employee_id, first_name, last_name FROM employees;");
+        testSQL.add("SELECT * FROM employees Union SELECT employee_id, first_name, last_name FROM employees;");
         testSQL.add("SELECT * FROM employees WHERE department_id = 10;");
         testSQL.add("SELECT * FROM employees ORDER BY hire_date DESC;");
         testSQL.add("SELECT COUNT(*), AVG(salary) FROM employees;");
-- 
Gitee


From b04c67710e3d8ec0242f10ef63cb336642ba5db6 Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Fri, 20 Sep 2024 15:18:52 +0800
Subject: [PATCH 106/113] revise

---
 sqlTranslate/src/main/java/Main.java | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/sqlTranslate/src/main/java/Main.java b/sqlTranslate/src/main/java/Main.java
index 63c9b318..0c684fa8 100644
--- a/sqlTranslate/src/main/java/Main.java
+++ b/sqlTranslate/src/main/java/Main.java
@@ -8,17 +8,10 @@ import parser.OracleParser;
 public class Main {
     public static void main(String[] args) {
         String sql = "SELECT e.first_name, d.department_name FROM employees e JOIN departments d Using e.department_id = d.department_id;";
-//        String sql = "CASE WHEN column2 > 0 THEN 'Positive' ELSE 'Non-positive' END";
-//
         OracleLexer lexer = new OracleLexer(sql);
         lexer.printTokens();
         OracleParser parser = new OracleParser(lexer);
         ASTNode root = parser.parse();
-//        ASTNode root = OracleParser.parseException(lexer.getTokens());
-//        ASTNode root = OracleParser.parseLoop(lexer.getTokens());
-//        ASTNode root = OracleParser.parseIFELSE(lexer.getTokens());
-//        ASTNode root = OracleParser.parseCaseWhen(lexer.getTokens());
-//        ASTNode root = OracleParser.parseJoin(lexer.getTokens());
         System.out.println(root.toQueryString());
         System.out.println(root.getASTString());
         OpenGaussGenerator generator = new OpenGaussGenerator(root);
-- 
Gitee


From 7cc485ab956183ddf13215ef7eb568a3e7abd551 Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Fri, 20 Sep 2024 23:07:21 +0800
Subject: [PATCH 107/113] revise trigger

---
 sqlTranslate/.idea/workspace.xml              | 52 +++++++------
 .../src/main/java/document/Trigger in Oracle  | 73 +++++++++++++++++--
 .../java/generator/OpenGaussGenerator.java    | 31 ++++----
 .../src/main/java/interfaces/DataType.java    |  2 +-
 .../src/main/java/parser/OracleParser.java    | 40 +++++++++-
 .../ast/alterTable/AlterAddColumnNode.java    |  2 +-
 .../ast/alterTable/AlterModifyColumnNode.java |  2 +-
 .../parser/ast/createTable/ColumnNode.java    |  2 +-
 .../ast/function/FunctionColumnNode.java      |  2 +-
 .../ast/function/FunctionRetDefNode.java      |  2 +-
 .../java/parser/ast/pl/PLDeclareNode.java     |  2 +-
 .../ast/procedure/ProcedureColumnNode.java    |  2 +-
 .../ast/procedure/ProcedureRetDefNode.java    |  2 +-
 .../trigger/TriggerDeclareContentNode.java    | 57 +++++++++++++++
 .../ast/trigger/TriggerDeclareNode.java       | 30 ++++++++
 sqlTranslate/src/test/java/testTrigger.java   | 12 ++-
 16 files changed, 260 insertions(+), 53 deletions(-)
 create mode 100644 sqlTranslate/src/main/java/parser/ast/trigger/TriggerDeclareContentNode.java
 create mode 100644 sqlTranslate/src/main/java/parser/ast/trigger/TriggerDeclareNode.java

diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
index 6b5ea573..bae99b4f 100644
--- a/sqlTranslate/.idea/workspace.xml
+++ b/sqlTranslate/.idea/workspace.xml
@@ -4,13 +4,23 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="fix some bugs">
-      <change afterPath="$PROJECT_DIR$/src/test/java/testCaseWhen.java" afterDir="false" />
+    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="revise">
+      <change afterPath="$PROJECT_DIR$/src/main/java/parser/ast/trigger/TriggerDeclareContentNode.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/parser/ast/trigger/TriggerDeclareNode.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Main.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/document/Select statement in Oracle" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/document/Select statement in Oracle" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/document/Todolist" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/document/Todolist" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/test/java/testSelect.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/testSelect.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/document/Trigger in Oracle" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/document/Trigger in Oracle" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/generator/OpenGaussGenerator.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/generator/OpenGaussGenerator.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/interfaces/DataType.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/interfaces/DataType.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/parser/OracleParser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/OracleParser.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/parser/ast/alterTable/AlterAddColumnNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/alterTable/AlterAddColumnNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/parser/ast/alterTable/AlterModifyColumnNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/alterTable/AlterModifyColumnNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/parser/ast/createTable/ColumnNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/createTable/ColumnNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/parser/ast/function/FunctionColumnNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/function/FunctionColumnNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/parser/ast/function/FunctionRetDefNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/function/FunctionRetDefNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/parser/ast/pl/PLDeclareNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/pl/PLDeclareNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/parser/ast/procedure/ProcedureColumnNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/procedure/ProcedureColumnNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/parser/ast/procedure/ProcedureRetDefNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/procedure/ProcedureRetDefNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/test/java/testTrigger.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/testTrigger.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -79,7 +89,7 @@
     "settings.editor.selected.configurable": "preferences.pluginManager"
   }
 }]]></component>
-  <component name="RunManager" selected="JUnit.testCaseWhen.test">
+  <component name="RunManager" selected="JUnit.testTrigger">
     <configuration name="testAlterTable" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="sqlTranslate" />
       <option name="PACKAGE_NAME" value="" />
@@ -99,15 +109,6 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="testJoin" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
-      <module name="sqlTranslate" />
-      <option name="PACKAGE_NAME" value="" />
-      <option name="MAIN_CLASS_NAME" value="testJoin" />
-      <option name="TEST_OBJECT" value="class" />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
     <configuration name="testProcedure.test" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="sqlTranslate" />
       <option name="PACKAGE_NAME" value="" />
@@ -127,20 +128,29 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
+    <configuration name="testTrigger" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+      <module name="sqlTranslate" />
+      <option name="PACKAGE_NAME" value="" />
+      <option name="MAIN_CLASS_NAME" value="testTrigger" />
+      <option name="TEST_OBJECT" value="class" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
     <list>
       <item itemvalue="JUnit.testAlterTable" />
       <item itemvalue="JUnit.testCaseWhen.test" />
-      <item itemvalue="JUnit.testJoin" />
       <item itemvalue="JUnit.testProcedure.test" />
       <item itemvalue="JUnit.testSelect" />
+      <item itemvalue="JUnit.testTrigger" />
     </list>
     <recent_temporary>
       <list>
+        <item itemvalue="JUnit.testTrigger" />
         <item itemvalue="JUnit.testCaseWhen.test" />
         <item itemvalue="JUnit.testSelect" />
         <item itemvalue="JUnit.testProcedure.test" />
         <item itemvalue="JUnit.testAlterTable" />
-        <item itemvalue="JUnit.testJoin" />
       </list>
     </recent_temporary>
   </component>
@@ -496,7 +506,7 @@
       <option name="project" value="LOCAL" />
       <updated>1726633703475</updated>
     </task>
-    <option name="localTasksCounter" value="102" />
+    <option name="localTasksCounter" value="104" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
@@ -533,10 +543,10 @@
     <MESSAGE value="add PL document" />
     <MESSAGE value="add PL ast classes" />
     <MESSAGE value="add pl/sql" />
-    <MESSAGE value="revise" />
     <MESSAGE value="add unit test" />
     <MESSAGE value="fix some bugs" />
-    <option name="LAST_COMMIT_MESSAGE" value="fix some bugs" />
+    <MESSAGE value="revise" />
+    <option name="LAST_COMMIT_MESSAGE" value="revise" />
   </component>
   <component name="XDebuggerManager">
     <watches-manager>
diff --git a/sqlTranslate/src/main/java/document/Trigger in Oracle b/sqlTranslate/src/main/java/document/Trigger in Oracle
index 77056feb..ac052f8b 100644
--- a/sqlTranslate/src/main/java/document/Trigger in Oracle	
+++ b/sqlTranslate/src/main/java/document/Trigger in Oracle	
@@ -1,17 +1,80 @@
 CREATE OR REPLACE TRIGGER trigger_name
-BEFORE | AFTER | INSTEAD OF -- OpenGauss does not support INSTEAD OF
+BEFORE | AFTER
 { INSERT | UPDATE | DELETE }
 ON table_name
 [REFERENCING NEW AS new OLD AS old] -- OpenGauss does not support this
 FOR EACH ROW
 [WHEN (condition)]
+[DECLARE]
+-- declare part
 BEGIN
     -- trigger body
 END;
 
-Example: CREATE OR REPLACE TRIGGER log_insert
-         BEFORE INSERT ON employees
+Example: CREATE OR REPLACE TRIGGER log_insert_trigger
+         AFTER INSERT ON employees
          FOR EACH ROW
+         DECLARE
+             l_action VARCHAR2(10) := 'INSERT';
          BEGIN
-             INSERT INTO audit_log (action, employee_id) VALUES ('INSERT', :NEW.id);
-         END;
\ No newline at end of file
+             INSERT INTO audit_log (action, employee_id) VALUES (l_action, 11);
+             DBMS_OUTPUT.PUT_LINE('Inserted record with ID: ' || :NEW.id);
+         EXCEPTION
+             WHEN OTHERS THEN
+                 DBMS_OUTPUT.PUT_LINE('An error occurred: ' || SQLERRM);
+         END;
+         /
+
+         CREATE TABLE employees (
+             id NUMBER PRIMARY KEY,
+             name VARCHAR2(100) NOT NULL,
+             position VARCHAR2(50),
+             hire_date DATE
+         );
+
+         CREATE TABLE audit_log (
+             action VARCHAR2(10) NOT NULL,
+             employee_id NUMBER,
+             timestamp TIMESTAMP DEFAULT CURRENT_TIMESTAMP
+         );
+
+         INSERT INTO employees (id, name, position, hire_date) VALUES (1, 'John Doe', 'Developer', SYSDATE);
+
+         select * from audit_log;
+
+Equal SQL on OpenGauss:
+    CREATE OR REPLACE FUNCTION log_insert_trigger()
+    RETURNS TRIGGER AS $$
+    DECLARE
+        l_action TEXT := 'INSERT';
+    BEGIN
+        INSERT INTO audit_log (action, employee_id) VALUES (l_action, 11);
+        RETURN NEW;
+    EXCEPTION
+        WHEN OTHERS THEN
+            RAISE NOTICE 'An error occurred: %', SQLERRM;
+    END;
+    $$ LANGUAGE plpgsql;
+
+    CREATE TRIGGER log_insert_trigger
+    AFTER INSERT ON employees
+    FOR EACH ROW
+    EXECUTE PROCEDURE log_insert_trigger();
+
+    CREATE TABLE employees (
+                 id NUMBER PRIMARY KEY,
+                 name VARCHAR(100) NOT NULL,
+                 position VARCHAR(50),
+                 hire_date DATE
+             );
+
+    CREATE TABLE audit_log (
+                 action VARCHAR(10) NOT NULL,
+                 employee_id NUMERIC,
+                 timestamp TIMESTAMP DEFAULT CURRENT_TIMESTAMP
+             );
+
+    INSERT INTO employees (id, name, position, hire_date) VALUES (1, 'John Doe', 'Developer', SYSDATE);
+
+    select * from audit_log;
+
diff --git a/sqlTranslate/src/main/java/generator/OpenGaussGenerator.java b/sqlTranslate/src/main/java/generator/OpenGaussGenerator.java
index d1af1787..7d5a4661 100644
--- a/sqlTranslate/src/main/java/generator/OpenGaussGenerator.java
+++ b/sqlTranslate/src/main/java/generator/OpenGaussGenerator.java
@@ -391,6 +391,9 @@ public class OpenGaussGenerator {
             else if (node instanceof TriggerOptionNode) {
                 CommonConvert(node);
             }
+            else if (node instanceof TriggerDeclareContentNode) {
+                DataTypeConvert((TriggerDeclareContentNode) node);
+            }
         }
         for (ASTNode child : node.getChildren()) {
             visitTrigger(child);
@@ -592,67 +595,67 @@ public class OpenGaussGenerator {
         // type convert
         if (node.getType().getValue().equalsIgnoreCase("NUMBER")) {
             node.setType(new Token(Token.TokenType.KEYWORD, "NUMERIC"));
-            node.ResetTokensbyNameTypeConstraint();
+            node.ResetTokensbyType();
         }
         if (node.getType().getValue().matches("(?i)NUMBER\\(.*?\\)")) {
             node.setType(new Token(Token.TokenType.KEYWORD, node.getType().getValue().toUpperCase().replace("NUMBER", "DECIMAL")));
-            node.ResetTokensbyNameTypeConstraint();
+            node.ResetTokensbyType();
         }
 
         if (node.getType().getValue().equalsIgnoreCase("VARCHAR2")) {
             node.setType(new Token(Token.TokenType.KEYWORD, "VARCHAR"));
-            node.ResetTokensbyNameTypeConstraint();
+            node.ResetTokensbyType();
         }
         if (node.getType().getValue().matches("(?i)VARCHAR2\\(.*?\\)")) {
             node.setType(new Token(Token.TokenType.KEYWORD, node.getType().getValue().toUpperCase().replace("VARCHAR2", "VARCHAR")));
-            node.ResetTokensbyNameTypeConstraint();
+            node.ResetTokensbyType();
         }
 
         if (node.getType().getValue().equalsIgnoreCase("RAW")) {
             node.setType(new Token(Token.TokenType.KEYWORD, "BYTEA"));
-            node.ResetTokensbyNameTypeConstraint();
+            node.ResetTokensbyType();
         }
         if (node.getType().getValue().matches("(?i)RAW\\(.*?\\)")) {
             node.setType(new Token(Token.TokenType.KEYWORD, node.getType().getValue().toUpperCase().replace("RAW", "BYTEA")));
-            node.ResetTokensbyNameTypeConstraint();
+            node.ResetTokensbyType();
         }
 
         if (node.getType().getValue().equalsIgnoreCase("BINARY_INTEGER")) {
             node.setType(new Token(Token.TokenType.KEYWORD, "INTEGER"));
-            node.ResetTokensbyNameTypeConstraint();
+            node.ResetTokensbyType();
         }
 
         if (node.getType().getValue().equalsIgnoreCase("NCHAR")) {
             node.setType(new Token(Token.TokenType.KEYWORD, "VARCHAR"));
-            node.ResetTokensbyNameTypeConstraint();
+            node.ResetTokensbyType();
         }
         if (node.getType().getValue().matches("(?i)NCHAR\\(.*?\\)")) {
             node.setType(new Token(Token.TokenType.KEYWORD, node.getType().getValue().toUpperCase().replace("NCHAR", "VARCHAR")));
-            node.ResetTokensbyNameTypeConstraint();
+            node.ResetTokensbyType();
         }
 
         if (node.getType().getValue().equalsIgnoreCase("NVARCHAR2")) {
             node.setType(new Token(Token.TokenType.KEYWORD, "VARCHAR"));
-            node.ResetTokensbyNameTypeConstraint();
+            node.ResetTokensbyType();
         }
         if (node.getType().getValue().matches("(?i)NVARCHAR2\\(.*?\\)")) {
             node.setType(new Token(Token.TokenType.KEYWORD, node.getType().getValue().toUpperCase().replace("NVARCHAR2", "VARCHAR")));
-            node.ResetTokensbyNameTypeConstraint();
+            node.ResetTokensbyType();
         }
 
         if (node.getType().getValue().equalsIgnoreCase("NCLOB")) {
             node.setType(new Token(Token.TokenType.KEYWORD, "TEXT"));
-            node.ResetTokensbyNameTypeConstraint();
+            node.ResetTokensbyType();
         }
 
         if (node.getType().getValue().equalsIgnoreCase("INTERVAL YEAR TO MONTH")) {
             node.setType(new Token(Token.TokenType.KEYWORD, "INTERVAL"));
-            node.ResetTokensbyNameTypeConstraint();
+            node.ResetTokensbyType();
         }
 
         if (node.getType().getValue().equalsIgnoreCase("INTERVAL DAY TO SECOND")) {
             node.setType(new Token(Token.TokenType.KEYWORD, "INTERVAL"));
-            node.ResetTokensbyNameTypeConstraint();
+            node.ResetTokensbyType();
         }
 
         // Impossible to convert
diff --git a/sqlTranslate/src/main/java/interfaces/DataType.java b/sqlTranslate/src/main/java/interfaces/DataType.java
index 32abfcef..486a5239 100644
--- a/sqlTranslate/src/main/java/interfaces/DataType.java
+++ b/sqlTranslate/src/main/java/interfaces/DataType.java
@@ -5,5 +5,5 @@ import lexer.Token;
 public interface DataType {
     Token getType();
     void setType(Token type);
-    void ResetTokensbyNameTypeConstraint();
+    void ResetTokensbyType();
 }
diff --git a/sqlTranslate/src/main/java/parser/OracleParser.java b/sqlTranslate/src/main/java/parser/OracleParser.java
index fb2c1d4a..aff759d9 100644
--- a/sqlTranslate/src/main/java/parser/OracleParser.java
+++ b/sqlTranslate/src/main/java/parser/OracleParser.java
@@ -2157,7 +2157,7 @@ public class OracleParser {
     /**
      * Create TRIGGER
      * Grammar: CREATE OR REPLACE TRIGGER trigger_name
-     * BEFORE | AFTER | INSTEAD OF -- OpenGauss does not support INSTEAD OF
+     * BEFORE | AFTER
      * { INSERT | UPDATE | DELETE }
      * ON table_name
      * [REFERENCING NEW AS new OLD AS old] -- OpenGauss does not support this
@@ -2284,6 +2284,44 @@ public class OracleParser {
                 currentNode.addChild(childNode);
                 currentNode = childNode;
             }
+            // match declare
+            else if (parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("DECLARE")) {
+                ASTNode childNode = new TriggerDeclareNode();
+                childNode.addToken(parseTokens.get(i));
+                currentNode.addChild(childNode);
+                currentNode = childNode;
+            }
+            // match declare content
+            else if (currentNode instanceof TriggerDeclareNode && parseTokens.get(i).hasType(Token.TokenType.IDENTIFIER)) {
+                TriggerDeclareContentNode childNode = new TriggerDeclareContentNode();
+                for (int j = i; j < parseTokens.size(); j++) {
+                    childNode.addToken(parseTokens.get(j));
+                    if (parseTokens.get(j).hasType(Token.TokenType.SYMBOL) && parseTokens.get(j).getValue().equals(";")) {
+                        i = j;
+                        break;
+                    }
+                    if (parseTokens.get(j).hasType(Token.TokenType.KEYWORD) && !parseTokens.get(j).getValue().equalsIgnoreCase(":=")) {
+                        childNode.setType(parseTokens.get(j));
+                    }
+                }
+                currentNode.addChild(childNode);
+                currentNode = childNode;
+            }
+            else if (currentNode instanceof TriggerDeclareContentNode && parseTokens.get(i).hasType(Token.TokenType.IDENTIFIER)) {
+                TriggerDeclareContentNode childNode = new TriggerDeclareContentNode();
+                for (int j = i; j < parseTokens.size(); j++) {
+                    childNode.addToken(parseTokens.get(j));
+                    if (parseTokens.get(j).hasType(Token.TokenType.SYMBOL) && parseTokens.get(j).getValue().equals(";")) {
+                        i = j;
+                        break;
+                    }
+                    if (parseTokens.get(j).hasType(Token.TokenType.KEYWORD) && !parseTokens.get(j).getValue().equalsIgnoreCase(":=")) {
+                        childNode.setType(parseTokens.get(j));
+                    }
+                }
+                currentNode.addChild(childNode);
+                currentNode = childNode;
+            }
             // match begin
             else if (parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("BEGIN")) {
                 ASTNode childNode = new TriggerBeginNode();
diff --git a/sqlTranslate/src/main/java/parser/ast/alterTable/AlterAddColumnNode.java b/sqlTranslate/src/main/java/parser/ast/alterTable/AlterAddColumnNode.java
index 9cea1dca..60f4a0b3 100644
--- a/sqlTranslate/src/main/java/parser/ast/alterTable/AlterAddColumnNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/alterTable/AlterAddColumnNode.java
@@ -61,7 +61,7 @@ public class AlterAddColumnNode extends ASTNode implements DataType {
     }
 
     @Override
-    public void ResetTokensbyNameTypeConstraint() {
+    public void ResetTokensbyType() {
         List <Token> tokens = new ArrayList<>();
         tokens.add(new Token(Token.TokenType.KEYWORD, "ADD"));
         tokens.add(name);
diff --git a/sqlTranslate/src/main/java/parser/ast/alterTable/AlterModifyColumnNode.java b/sqlTranslate/src/main/java/parser/ast/alterTable/AlterModifyColumnNode.java
index 9c321bf4..aaa7e3be 100644
--- a/sqlTranslate/src/main/java/parser/ast/alterTable/AlterModifyColumnNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/alterTable/AlterModifyColumnNode.java
@@ -50,7 +50,7 @@ public class AlterModifyColumnNode extends ASTNode implements DataType {
     }
 
     @Override
-    public void ResetTokensbyNameTypeConstraint() {
+    public void ResetTokensbyType() {
         List <Token> tokens = new ArrayList<>();
         tokens.add(new Token(Token.TokenType.KEYWORD, "MODIFY"));
         tokens.add(name);
diff --git a/sqlTranslate/src/main/java/parser/ast/createTable/ColumnNode.java b/sqlTranslate/src/main/java/parser/ast/createTable/ColumnNode.java
index 3a49b6ce..db6ecbde 100644
--- a/sqlTranslate/src/main/java/parser/ast/createTable/ColumnNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/createTable/ColumnNode.java
@@ -63,7 +63,7 @@ public class ColumnNode extends ASTNode implements DataType {
     }
 
     @Override
-    public void ResetTokensbyNameTypeConstraint() {
+    public void ResetTokensbyType() {
         List <Token> tokens = new ArrayList<>();
         tokens.add(name);
         tokens.add(type);
diff --git a/sqlTranslate/src/main/java/parser/ast/function/FunctionColumnNode.java b/sqlTranslate/src/main/java/parser/ast/function/FunctionColumnNode.java
index c5090015..70a934f5 100644
--- a/sqlTranslate/src/main/java/parser/ast/function/FunctionColumnNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/function/FunctionColumnNode.java
@@ -78,7 +78,7 @@ public class FunctionColumnNode extends ASTNode implements DataType {
     }
 
     @Override
-    public void ResetTokensbyNameTypeConstraint() {
+    public void ResetTokensbyType() {
         List <Token> tokens = new ArrayList<>();
         tokens.add(name);
         for (Token token : InOut) {
diff --git a/sqlTranslate/src/main/java/parser/ast/function/FunctionRetDefNode.java b/sqlTranslate/src/main/java/parser/ast/function/FunctionRetDefNode.java
index f46a01e2..7572007e 100644
--- a/sqlTranslate/src/main/java/parser/ast/function/FunctionRetDefNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/function/FunctionRetDefNode.java
@@ -42,7 +42,7 @@ public class FunctionRetDefNode extends ASTNode implements DataType {
     }
 
     @Override
-    public void ResetTokensbyNameTypeConstraint() {
+    public void ResetTokensbyType() {
         List <Token> tokens = new ArrayList<>();
         tokens.add(new Token(Token.TokenType.KEYWORD, "RETURN"));
         tokens.add(type);
diff --git a/sqlTranslate/src/main/java/parser/ast/pl/PLDeclareNode.java b/sqlTranslate/src/main/java/parser/ast/pl/PLDeclareNode.java
index 4ec9f3ed..0c7f35a8 100644
--- a/sqlTranslate/src/main/java/parser/ast/pl/PLDeclareNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/pl/PLDeclareNode.java
@@ -43,7 +43,7 @@ public class PLDeclareNode extends ASTNode implements DataType {
     }
 
     @Override
-    public void ResetTokensbyNameTypeConstraint() {
+    public void ResetTokensbyType() {
         List <Token> tokens = new ArrayList<>();
         for (Token token: getTokens()) {
             if (token.hasType(Token.TokenType.KEYWORD)) {
diff --git a/sqlTranslate/src/main/java/parser/ast/procedure/ProcedureColumnNode.java b/sqlTranslate/src/main/java/parser/ast/procedure/ProcedureColumnNode.java
index 4325d55a..810e9ce6 100644
--- a/sqlTranslate/src/main/java/parser/ast/procedure/ProcedureColumnNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/procedure/ProcedureColumnNode.java
@@ -80,7 +80,7 @@ public class ProcedureColumnNode extends ASTNode implements DataType {
     }
 
     @Override
-    public void ResetTokensbyNameTypeConstraint() {
+    public void ResetTokensbyType() {
         List <Token> tokens = new ArrayList<>();
         tokens.add(name);
         for (Token token : InOut) {
diff --git a/sqlTranslate/src/main/java/parser/ast/procedure/ProcedureRetDefNode.java b/sqlTranslate/src/main/java/parser/ast/procedure/ProcedureRetDefNode.java
index 8164b25f..ed31a5d9 100644
--- a/sqlTranslate/src/main/java/parser/ast/procedure/ProcedureRetDefNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/procedure/ProcedureRetDefNode.java
@@ -43,7 +43,7 @@ public class ProcedureRetDefNode extends ASTNode implements DataType {
     }
 
     @Override
-    public void ResetTokensbyNameTypeConstraint() {
+    public void ResetTokensbyType() {
         List <Token> tokens = new ArrayList<>();
         for (Token token: getTokens()) {
             if (token.hasType(Token.TokenType.KEYWORD) && !token.getValue().equalsIgnoreCase("IS")) {
diff --git a/sqlTranslate/src/main/java/parser/ast/trigger/TriggerDeclareContentNode.java b/sqlTranslate/src/main/java/parser/ast/trigger/TriggerDeclareContentNode.java
new file mode 100644
index 00000000..a5d41205
--- /dev/null
+++ b/sqlTranslate/src/main/java/parser/ast/trigger/TriggerDeclareContentNode.java
@@ -0,0 +1,57 @@
+package parser.ast.trigger;
+
+import interfaces.DataType;
+import lexer.Token;
+import parser.ast.ASTNode;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class TriggerDeclareContentNode extends ASTNode implements DataType {
+    private Token type;
+    public TriggerDeclareContentNode() {
+        super();
+        setTokens(new ArrayList<>());
+        setType(new Token(Token.TokenType.NULL, ""));
+    }
+
+    public TriggerDeclareContentNode(ASTNode node) {
+        super(node);
+    }
+
+    public TriggerDeclareContentNode(List<Token> tokens) {
+        super(tokens);
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString) {
+        queryString.append(toString() + " ");
+        for (ASTNode child : getChildren()) {
+            child.visit(child, queryString);
+        }
+    }
+
+    @Override
+    public Token getType() {
+        return type;
+    }
+
+    @Override
+    public void setType(Token type) {
+        this.type = type;
+    }
+
+    @Override
+    public void ResetTokensbyType() {
+        List<Token> tokens = new ArrayList<>();
+        for (Token token : getTokens()) {
+            if (token.hasType(Token.TokenType.KEYWORD) && !token.getValue().equalsIgnoreCase(":=")) {
+                tokens.add(getType());
+            }
+            else {
+                tokens.add(token);
+            }
+        }
+        setTokens(tokens);
+    }
+}
diff --git a/sqlTranslate/src/main/java/parser/ast/trigger/TriggerDeclareNode.java b/sqlTranslate/src/main/java/parser/ast/trigger/TriggerDeclareNode.java
new file mode 100644
index 00000000..2576e067
--- /dev/null
+++ b/sqlTranslate/src/main/java/parser/ast/trigger/TriggerDeclareNode.java
@@ -0,0 +1,30 @@
+package parser.ast.trigger;
+
+import lexer.Token;
+import parser.ast.ASTNode;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class TriggerDeclareNode extends ASTNode {
+    public TriggerDeclareNode() {
+        super();
+        setTokens(new ArrayList<>());
+    }
+
+    public TriggerDeclareNode(ASTNode node) {
+        super(node);
+    }
+
+    public TriggerDeclareNode(List<Token> tokens) {
+        super(tokens);
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString) {
+        queryString.append(toString() + " ");
+        for (ASTNode child : getChildren()) {
+            child.visit(child, queryString);
+        }
+    }
+}
diff --git a/sqlTranslate/src/test/java/testTrigger.java b/sqlTranslate/src/test/java/testTrigger.java
index bc7d067c..0f374501 100644
--- a/sqlTranslate/src/test/java/testTrigger.java
+++ b/sqlTranslate/src/test/java/testTrigger.java
@@ -14,11 +14,17 @@ public class testTrigger {
     @BeforeEach
     public void loadData()
     {
-        testSQL.add("CREATE OR REPLACE TRIGGER log_insert\n" +
-                "         BEFORE INSERT ON employees\n" +
+        testSQL.add("CREATE OR REPLACE TRIGGER log_insert_trigger\n" +
+                "         AFTER INSERT ON employees\n" +
                 "         FOR EACH ROW\n" +
+                "         DECLARE\n" +
+                "             l_action VARCHAR2(10) := 'INSERT';\n" +
                 "         BEGIN\n" +
-                "             INSERT INTO audit_log (action, employee_id) VALUES ('INSERT', :NEW.id);\n" +
+                "             INSERT INTO audit_log (action, employee_id) VALUES (l_action, 11);\n" +
+                "             DBMS_OUTPUT.PUT_LINE('Inserted record with ID: ' || :NEW.id);\n" +
+                "         EXCEPTION\n" +
+                "             WHEN OTHERS THEN\n" +
+                "                 DBMS_OUTPUT.PUT_LINE('An error occurred: ' || SQLERRM);\n" +
                 "         END;");
         System.out.println("===== test of Trigger =====");
         System.out.println("The source DBMS is: " + CommonConfig.getSourceDB());
-- 
Gitee


From e10c31a36c57e344a366e022555bceddc7d39e69 Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Fri, 20 Sep 2024 23:20:05 +0800
Subject: [PATCH 108/113] revise trigger

---
 .../src/main/java/generator/OpenGaussGenerator.java  | 12 ++++++++++--
 sqlTranslate/src/main/java/parser/ast/ASTNode.java   |  7 +++++++
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/sqlTranslate/src/main/java/generator/OpenGaussGenerator.java b/sqlTranslate/src/main/java/generator/OpenGaussGenerator.java
index 7d5a4661..e35bc399 100644
--- a/sqlTranslate/src/main/java/generator/OpenGaussGenerator.java
+++ b/sqlTranslate/src/main/java/generator/OpenGaussGenerator.java
@@ -395,9 +395,17 @@ public class OpenGaussGenerator {
                 DataTypeConvert((TriggerDeclareContentNode) node);
             }
         }
-        for (ASTNode child : node.getChildren()) {
-            visitTrigger(child);
+        if (!(node.getFirstChild() instanceof TriggerDeclareNode || node.getFirstChild() instanceof TriggerBeginNode)) {
+            for (ASTNode child : node.getChildren()) {
+                visitTrigger(child);
+            }
         }
+        else {
+            // TODO: need to handle trigger body
+
+
+        }
+
     }
 
     private void visitPLSQL(ASTNode node) {
diff --git a/sqlTranslate/src/main/java/parser/ast/ASTNode.java b/sqlTranslate/src/main/java/parser/ast/ASTNode.java
index 5bce8b93..5d57574d 100644
--- a/sqlTranslate/src/main/java/parser/ast/ASTNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/ASTNode.java
@@ -110,6 +110,13 @@ public abstract class ASTNode {
         return null;
     }
 
+    public ASTNode getFirstChild() {
+        if (hasChild())
+            return children.get(0);
+        else
+            return null;
+    }
+
     public List<ASTNode> getChildrenByName(String childName) {
         List<ASTNode> nodes = new ArrayList<>();
         for (ASTNode child : children) {
-- 
Gitee


From 66bf74d25b33286a1234df6ba11cd861403079b0 Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Sun, 22 Sep 2024 12:19:03 +0800
Subject: [PATCH 109/113] revise trigger

---
 sqlTranslate/.idea/workspace.xml              | 61 +++++++------
 .../src/main/java/document/Function in Oracle |  2 +
 .../main/java/document/Procedure in Oracle    |  2 +
 .../src/main/java/document/Trigger in Oracle  |  4 +-
 .../java/generator/OpenGaussGenerator.java    | 81 +++++++++++++++--
 .../src/main/java/parser/OracleParser.java    | 89 ++++++++++++++++++-
 .../function/FunctionDeclareContentNode.java  | 57 ++++++++++++
 .../ast/function/FunctionDeclareNode.java     | 30 +++++++
 .../ProcedureDeclareContentNode.java          | 57 ++++++++++++
 .../ast/procedure/ProcedureDeclareNode.java   | 30 +++++++
 sqlTranslate/src/test/java/testTrigger.java   |  2 +-
 11 files changed, 370 insertions(+), 45 deletions(-)
 create mode 100644 sqlTranslate/src/main/java/parser/ast/function/FunctionDeclareContentNode.java
 create mode 100644 sqlTranslate/src/main/java/parser/ast/function/FunctionDeclareNode.java
 create mode 100644 sqlTranslate/src/main/java/parser/ast/procedure/ProcedureDeclareContentNode.java
 create mode 100644 sqlTranslate/src/main/java/parser/ast/procedure/ProcedureDeclareNode.java

diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
index bae99b4f..71f86a50 100644
--- a/sqlTranslate/.idea/workspace.xml
+++ b/sqlTranslate/.idea/workspace.xml
@@ -4,22 +4,18 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="revise">
-      <change afterPath="$PROJECT_DIR$/src/main/java/parser/ast/trigger/TriggerDeclareContentNode.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/parser/ast/trigger/TriggerDeclareNode.java" afterDir="false" />
+    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="revise trigger">
+      <change afterPath="$PROJECT_DIR$/src/main/java/parser/ast/function/FunctionDeclareContentNode.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/parser/ast/function/FunctionDeclareNode.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/parser/ast/procedure/ProcedureDeclareContentNode.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/parser/ast/procedure/ProcedureDeclareNode.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/document/Function in Oracle" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/document/Function in Oracle" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/document/Procedure in Oracle" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/document/Procedure in Oracle" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/document/Todolist" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/document/Todolist" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/document/Trigger in Oracle" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/document/Trigger in Oracle" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/generator/OpenGaussGenerator.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/generator/OpenGaussGenerator.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/interfaces/DataType.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/interfaces/DataType.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/parser/OracleParser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/OracleParser.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/parser/ast/alterTable/AlterAddColumnNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/alterTable/AlterAddColumnNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/parser/ast/alterTable/AlterModifyColumnNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/alterTable/AlterModifyColumnNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/parser/ast/createTable/ColumnNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/createTable/ColumnNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/parser/ast/function/FunctionColumnNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/function/FunctionColumnNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/parser/ast/function/FunctionRetDefNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/function/FunctionRetDefNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/parser/ast/pl/PLDeclareNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/pl/PLDeclareNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/parser/ast/procedure/ProcedureColumnNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/procedure/ProcedureColumnNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/parser/ast/procedure/ProcedureRetDefNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/procedure/ProcedureRetDefNode.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/test/java/testTrigger.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/testTrigger.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -66,6 +62,7 @@
     "JUnit.testDropTable.test.executor": "Run",
     "JUnit.testException.executor": "Run",
     "JUnit.testException.test.executor": "Run",
+    "JUnit.testFunction.test.executor": "Run",
     "JUnit.testIfElse.test.executor": "Run",
     "JUnit.testInsert.test.executor": "Run",
     "JUnit.testJoin.executor": "Run",
@@ -76,6 +73,7 @@
     "JUnit.testSelect.executor": "Run",
     "JUnit.testSelect.test.executor": "Run",
     "JUnit.testTrigger.executor": "Run",
+    "JUnit.testTrigger.test.executor": "Run",
     "JUnit.testUpdate.executor": "Run",
     "JUnit.testView.executor": "Run",
     "RunOnceActivity.OpenProjectViewOnStart": "true",
@@ -89,16 +87,7 @@
     "settings.editor.selected.configurable": "preferences.pluginManager"
   }
 }]]></component>
-  <component name="RunManager" selected="JUnit.testTrigger">
-    <configuration name="testAlterTable" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
-      <module name="sqlTranslate" />
-      <option name="PACKAGE_NAME" value="" />
-      <option name="MAIN_CLASS_NAME" value="testAlterTable" />
-      <option name="TEST_OBJECT" value="class" />
-      <method v="2">
-        <option name="Make" enabled="true" />
-      </method>
-    </configuration>
+  <component name="RunManager" selected="JUnit.testTrigger.test">
     <configuration name="testCaseWhen.test" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="sqlTranslate" />
       <option name="PACKAGE_NAME" value="" />
@@ -109,10 +98,10 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="testProcedure.test" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="testFunction.test" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="sqlTranslate" />
       <option name="PACKAGE_NAME" value="" />
-      <option name="MAIN_CLASS_NAME" value="testProcedure" />
+      <option name="MAIN_CLASS_NAME" value="testFunction" />
       <option name="METHOD_NAME" value="test" />
       <option name="TEST_OBJECT" value="method" />
       <method v="2">
@@ -137,20 +126,30 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
+    <configuration name="testTrigger.test" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+      <module name="sqlTranslate" />
+      <option name="PACKAGE_NAME" value="" />
+      <option name="MAIN_CLASS_NAME" value="testTrigger" />
+      <option name="METHOD_NAME" value="test" />
+      <option name="TEST_OBJECT" value="method" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
     <list>
-      <item itemvalue="JUnit.testAlterTable" />
       <item itemvalue="JUnit.testCaseWhen.test" />
-      <item itemvalue="JUnit.testProcedure.test" />
+      <item itemvalue="JUnit.testFunction.test" />
       <item itemvalue="JUnit.testSelect" />
       <item itemvalue="JUnit.testTrigger" />
+      <item itemvalue="JUnit.testTrigger.test" />
     </list>
     <recent_temporary>
       <list>
+        <item itemvalue="JUnit.testTrigger.test" />
+        <item itemvalue="JUnit.testFunction.test" />
         <item itemvalue="JUnit.testTrigger" />
         <item itemvalue="JUnit.testCaseWhen.test" />
         <item itemvalue="JUnit.testSelect" />
-        <item itemvalue="JUnit.testProcedure.test" />
-        <item itemvalue="JUnit.testAlterTable" />
       </list>
     </recent_temporary>
   </component>
@@ -506,7 +505,7 @@
       <option name="project" value="LOCAL" />
       <updated>1726633703475</updated>
     </task>
-    <option name="localTasksCounter" value="104" />
+    <option name="localTasksCounter" value="106" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
@@ -521,7 +520,6 @@
     </option>
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="add if elseif else endif ast classes" />
     <MESSAGE value="add IF ELSIF" />
     <MESSAGE value="add Loop document" />
     <MESSAGE value="add Loop keywords" />
@@ -546,7 +544,8 @@
     <MESSAGE value="add unit test" />
     <MESSAGE value="fix some bugs" />
     <MESSAGE value="revise" />
-    <option name="LAST_COMMIT_MESSAGE" value="revise" />
+    <MESSAGE value="revise trigger" />
+    <option name="LAST_COMMIT_MESSAGE" value="revise trigger" />
   </component>
   <component name="XDebuggerManager">
     <watches-manager>
diff --git a/sqlTranslate/src/main/java/document/Function in Oracle b/sqlTranslate/src/main/java/document/Function in Oracle
index 875eec5e..259cf54d 100644
--- a/sqlTranslate/src/main/java/document/Function in Oracle	
+++ b/sqlTranslate/src/main/java/document/Function in Oracle	
@@ -3,6 +3,8 @@ CREATE OR REPLACE FUNCTION function_name (
     parameter2 [IN | OUT] datatype2 ,
     ...
 ) RETURN return_datatype IS
+[DECLARE]
+-- declare part
 BEGIN
     -- function body
     RETURN result;
diff --git a/sqlTranslate/src/main/java/document/Procedure in Oracle b/sqlTranslate/src/main/java/document/Procedure in Oracle
index df4408b5..d7a0a3d8 100644
--- a/sqlTranslate/src/main/java/document/Procedure in Oracle	
+++ b/sqlTranslate/src/main/java/document/Procedure in Oracle	
@@ -1,5 +1,7 @@
 CREATE [OR REPLACE] PROCEDURE procedure_name ([parameter_list])
 IS [LOCAL DECLARATIONS]
+[DECLARE]
+-- declare part
 BEGIN
     -- PL/SQL statements
 [EXCEPTION]
diff --git a/sqlTranslate/src/main/java/document/Trigger in Oracle b/sqlTranslate/src/main/java/document/Trigger in Oracle
index ac052f8b..8139b684 100644
--- a/sqlTranslate/src/main/java/document/Trigger in Oracle	
+++ b/sqlTranslate/src/main/java/document/Trigger in Oracle	
@@ -18,7 +18,7 @@ Example: CREATE OR REPLACE TRIGGER log_insert_trigger
              l_action VARCHAR2(10) := 'INSERT';
          BEGIN
              INSERT INTO audit_log (action, employee_id) VALUES (l_action, 11);
-             DBMS_OUTPUT.PUT_LINE('Inserted record with ID: ' || :NEW.id);
+             DBMS_OUTPUT.PUT_LINE('Inserted record with ID: ' || 11);
          EXCEPTION
              WHEN OTHERS THEN
                  DBMS_OUTPUT.PUT_LINE('An error occurred: ' || SQLERRM);
@@ -46,7 +46,7 @@ Equal SQL on OpenGauss:
     CREATE OR REPLACE FUNCTION log_insert_trigger()
     RETURNS TRIGGER AS $$
     DECLARE
-        l_action TEXT := 'INSERT';
+        l_action VARCHAR(10) := 'INSERT';
     BEGIN
         INSERT INTO audit_log (action, employee_id) VALUES (l_action, 11);
         RETURN NEW;
diff --git a/sqlTranslate/src/main/java/generator/OpenGaussGenerator.java b/sqlTranslate/src/main/java/generator/OpenGaussGenerator.java
index e35bc399..a98188f1 100644
--- a/sqlTranslate/src/main/java/generator/OpenGaussGenerator.java
+++ b/sqlTranslate/src/main/java/generator/OpenGaussGenerator.java
@@ -17,10 +17,7 @@ import parser.ast.drop.DropNode;
 import parser.ast.drop.DropOptionNode;
 import parser.ast.exception.ExceptionActionNode;
 import parser.ast.exception.ExceptionNode;
-import parser.ast.function.FunctionColumnNode;
-import parser.ast.function.FunctionEndNode;
-import parser.ast.function.FunctionNode;
-import parser.ast.function.FunctionRetDefNode;
+import parser.ast.function.*;
 import parser.ast.iFELSIF.IFConditionNode;
 import parser.ast.insert.InsertNode;
 import parser.ast.join.JoinConditionNode;
@@ -194,6 +191,7 @@ public class OpenGaussGenerator {
 
     private String GenTriggerSQL(ASTNode node) {
         visitTrigger(node);
+//        System.out.println(node.getASTString());
         return node.toQueryString();
     }
 
@@ -340,6 +338,9 @@ public class OpenGaussGenerator {
                 DataTypeConvert((ProcedureRetDefNode) node);
                 CommonConvert(node);
             }
+            else if (node instanceof ProcedureDeclareContentNode) {
+                DataTypeConvert((ProcedureDeclareContentNode) node);
+            }
             else if (node instanceof ProcedureColumnNode) {
                 DataTypeConvert((ProcedureColumnNode) node);
             }
@@ -364,9 +365,15 @@ public class OpenGaussGenerator {
             if (node instanceof FunctionRetDefNode) {
                 CommonConvert(node);
             }
+            else if (node instanceof FunctionDeclareContentNode) {
+                DataTypeConvert((FunctionDeclareContentNode) node);
+            }
             else if (node instanceof ExceptionNode) {
                 visitException(node);
             }
+            else if (node instanceof FunctionBodyNode) {
+                CommonConvert(node);
+            }
             else if (node instanceof FunctionColumnNode) {
                 DataTypeConvert((FunctionColumnNode) node);
             }
@@ -401,11 +408,8 @@ public class OpenGaussGenerator {
             }
         }
         else {
-            // TODO: need to handle trigger body
-
-
+            CommonConvert(node);
         }
-
     }
 
     private void visitPLSQL(ASTNode node) {
@@ -595,6 +599,67 @@ public class OpenGaussGenerator {
                 ((JoinConditionNode) node).setKeyword("ON");
             }
         }
+        if (node instanceof TriggerEndNode) {
+            List<Token> tokens = new ArrayList<>();
+            tokens.add(new Token(Token.TokenType.KEYWORD, "END"));
+            tokens.add(new Token(Token.TokenType.SYMBOL, ";"));
+            tokens.add(new Token(Token.TokenType.KEYWORD, "$$"));
+            tokens.add(new Token(Token.TokenType.KEYWORD, "LANGUAGE"));
+            tokens.add(new Token(Token.TokenType.KEYWORD, "plpgsql"));
+            tokens.add(new Token(Token.TokenType.SYMBOL, ";"));
+            node.setTokens(tokens);
+        }
+        if ((node.getFirstChild() instanceof TriggerDeclareNode || node.getFirstChild() instanceof TriggerBeginNode)) {
+            // EXEC the procedure function
+            ASTNode currentNode = null;
+            ASTNode childNode = new TriggerBodyNode();
+            childNode.addToken(new Token(Token.TokenType.KEYWORD, "EXECUTE"));
+            childNode.addToken(new Token(Token.TokenType.KEYWORD, "PROCEDURE"));
+            childNode.addToken(new Token(Token.TokenType.IDENTIFIER, "trigger_func()"));
+            childNode.addToken(new Token(Token.TokenType.SYMBOL, ";"));
+            ASTNode triggerFuncRoot = node.getFirstChild();
+            node.replaceChild(triggerFuncRoot, childNode);
+            currentNode = childNode;
+            ASTNode triggerEndNode = new TriggerEndNode();
+            currentNode.addChild(triggerEndNode);
+            currentNode = triggerEndNode;
+
+            // Define the trigger function
+            ASTNode triggerFuncNode = new FunctionNode();
+            triggerFuncNode.addToken(new Token(Token.TokenType.KEYWORD, "CREATE"));
+            triggerFuncNode.addToken(new Token(Token.TokenType.KEYWORD, "OR"));
+            triggerFuncNode.addToken(new Token(Token.TokenType.KEYWORD, "REPLACE"));
+            triggerFuncNode.addToken(new Token(Token.TokenType.KEYWORD, "FUNCTION"));
+            currentNode.addChild(triggerFuncNode);
+            currentNode = triggerFuncNode;
+            childNode = new FunctionNameNode();
+            childNode.addToken(new Token(Token.TokenType.IDENTIFIER, "trigger_func"));
+            currentNode.addChild(childNode);
+            currentNode = childNode;
+            childNode = new FunctionRetDefNode();
+            childNode.addToken(new Token(Token.TokenType.KEYWORD, "RETURNS"));
+            childNode.addToken(new Token(Token.TokenType.KEYWORD, "TRIGGER"));
+            childNode.addToken(new Token(Token.TokenType.KEYWORD, "AS"));
+            childNode.addToken(new Token(Token.TokenType.KEYWORD, "$$"));
+            currentNode.addChild(childNode);
+            currentNode = childNode;
+            //convert the other parts
+            currentNode.addChild(triggerFuncRoot);
+            currentNode = triggerFuncRoot;
+            while (true) {
+                if (currentNode instanceof TriggerDeclareContentNode) {
+                    DataTypeConvert((TriggerDeclareContentNode) currentNode);
+                }
+                else if (currentNode instanceof TriggerBodyNode) {
+                    CommonConvert(currentNode);
+                }
+                else if (currentNode instanceof TriggerEndNode) {
+                    CommonConvert(currentNode);
+                    break;
+                }
+                currentNode = currentNode.getFirstChild();
+            }
+        }
 
     }
 
diff --git a/sqlTranslate/src/main/java/parser/OracleParser.java b/sqlTranslate/src/main/java/parser/OracleParser.java
index aff759d9..d4684a13 100644
--- a/sqlTranslate/src/main/java/parser/OracleParser.java
+++ b/sqlTranslate/src/main/java/parser/OracleParser.java
@@ -1709,9 +1709,13 @@ public class OracleParser {
                 childNode.addToken(parseTokens.get(i));
                 currentNode.addChild(childNode);
                 currentNode = childNode;
+                i++;
+                if (parseTokens.get(i).hasType(Token.TokenType.SYMBOL) && parseTokens.get(i).getValue().equals(")")) {
+                    i++;
+                }
             }
             // match parameter list
-            else if (currentNode instanceof ProcedureObjNode && parseTokens.get(i).hasType(Token.TokenType.SYMBOL) && parseTokens.get(i).getValue().equals("(")) {
+            else if (currentNode instanceof ProcedureObjNode && parseTokens.get(i).hasType(Token.TokenType.IDENTIFIER)) {
                 i++;
                 for (int ii = i; ii < parseTokens.size(); ii++) {
                     if (parseTokens.get(ii).hasType(Token.TokenType.KEYWORD) && parseTokens.get(ii).getValue().equalsIgnoreCase("IS")) {
@@ -1801,6 +1805,44 @@ public class OracleParser {
                 currentNode.addChild(childNode);
                 currentNode = childNode;
             }
+            // match declare
+            else if (parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("DECLARE")) {
+                ASTNode childNode = new ProcedureDeclareNode();
+                childNode.addToken(parseTokens.get(i));
+                currentNode.addChild(childNode);
+                currentNode = childNode;
+            }
+            // match declare content
+            else if (currentNode instanceof TriggerDeclareNode && parseTokens.get(i).hasType(Token.TokenType.IDENTIFIER)) {
+                ProcedureDeclareContentNode childNode = new ProcedureDeclareContentNode();
+                for (int j = i; j < parseTokens.size(); j++) {
+                    childNode.addToken(parseTokens.get(j));
+                    if (parseTokens.get(j).hasType(Token.TokenType.SYMBOL) && parseTokens.get(j).getValue().equals(";")) {
+                        i = j;
+                        break;
+                    }
+                    if (parseTokens.get(j).hasType(Token.TokenType.KEYWORD) && !parseTokens.get(j).getValue().equalsIgnoreCase(":=")) {
+                        childNode.setType(parseTokens.get(j));
+                    }
+                }
+                currentNode.addChild(childNode);
+                currentNode = childNode;
+            }
+            else if (currentNode instanceof TriggerDeclareContentNode && parseTokens.get(i).hasType(Token.TokenType.IDENTIFIER)) {
+                ProcedureDeclareContentNode childNode = new ProcedureDeclareContentNode();
+                for (int j = i; j < parseTokens.size(); j++) {
+                    childNode.addToken(parseTokens.get(j));
+                    if (parseTokens.get(j).hasType(Token.TokenType.SYMBOL) && parseTokens.get(j).getValue().equals(";")) {
+                        i = j;
+                        break;
+                    }
+                    if (parseTokens.get(j).hasType(Token.TokenType.KEYWORD) && !parseTokens.get(j).getValue().equalsIgnoreCase(":=")) {
+                        childNode.setType(parseTokens.get(j));
+                    }
+                }
+                currentNode.addChild(childNode);
+                currentNode = childNode;
+            }
             // match procedure begin
             else if (parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("BEGIN")) {
                 ASTNode childNode = new ProcedureBeginNode();
@@ -1960,6 +2002,9 @@ public class OracleParser {
                 currentNode.addChild(childNode);
                 currentNode = childNode;
                 i++;
+                if (parseTokens.get(i).hasType(Token.TokenType.SYMBOL) && parseTokens.get(i).getValue().equals(")")) {
+                    i++;
+                }
             }
             // match parameters
             else if (currentNode instanceof FunctionNameNode && parseTokens.get(i).hasType(Token.TokenType.IDENTIFIER)) {
@@ -2036,7 +2081,7 @@ public class OracleParser {
                 }
             }
             // match return definition
-            else if (currentNode instanceof FunctionColumnNode && parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("RETURN")) {
+            else if ((currentNode instanceof FunctionColumnNode || currentNode instanceof FunctionNameNode) && parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("RETURN")) {
                 FunctionRetDefNode childNode = new FunctionRetDefNode();
                 for (int j = i; j < parseTokens.size(); j++) {
                     if (parseTokens.get(j).hasType(Token.TokenType.KEYWORD) && parseTokens.get(j).getValue().equalsIgnoreCase("RETURN")) {
@@ -2055,6 +2100,44 @@ public class OracleParser {
                 currentNode.addChild(childNode);
                 currentNode = childNode;
             }
+            // match declare
+            else if (parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("DECLARE")) {
+                ASTNode childNode = new FunctionDeclareNode();
+                childNode.addToken(parseTokens.get(i));
+                currentNode.addChild(childNode);
+                currentNode = childNode;
+            }
+            // match declare content
+            else if (currentNode instanceof TriggerDeclareNode && parseTokens.get(i).hasType(Token.TokenType.IDENTIFIER)) {
+                FunctionDeclareContentNode childNode = new FunctionDeclareContentNode();
+                for (int j = i; j < parseTokens.size(); j++) {
+                    childNode.addToken(parseTokens.get(j));
+                    if (parseTokens.get(j).hasType(Token.TokenType.SYMBOL) && parseTokens.get(j).getValue().equals(";")) {
+                        i = j;
+                        break;
+                    }
+                    if (parseTokens.get(j).hasType(Token.TokenType.KEYWORD) && !parseTokens.get(j).getValue().equalsIgnoreCase(":=")) {
+                        childNode.setType(parseTokens.get(j));
+                    }
+                }
+                currentNode.addChild(childNode);
+                currentNode = childNode;
+            }
+            else if (currentNode instanceof TriggerDeclareContentNode && parseTokens.get(i).hasType(Token.TokenType.IDENTIFIER)) {
+                FunctionDeclareContentNode childNode = new FunctionDeclareContentNode();
+                for (int j = i; j < parseTokens.size(); j++) {
+                    childNode.addToken(parseTokens.get(j));
+                    if (parseTokens.get(j).hasType(Token.TokenType.SYMBOL) && parseTokens.get(j).getValue().equals(";")) {
+                        i = j;
+                        break;
+                    }
+                    if (parseTokens.get(j).hasType(Token.TokenType.KEYWORD) && !parseTokens.get(j).getValue().equalsIgnoreCase(":=")) {
+                        childNode.setType(parseTokens.get(j));
+                    }
+                }
+                currentNode.addChild(childNode);
+                currentNode = childNode;
+            }
             // match function begin
             else if (currentNode instanceof FunctionRetDefNode && parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("BEGIN")) {
                 ASTNode childNode = new FunctionBeginNode();
@@ -2409,7 +2492,7 @@ public class OracleParser {
                     PLDeclareNode childNode = new PLDeclareNode();
                     for (int k = j; k < parseTokens.size(); k++) {
                         childNode.addToken(parseTokens.get(k));
-                        if (parseTokens.get(k).hasType(Token.TokenType.KEYWORD)) {
+                        if (parseTokens.get(k).hasType(Token.TokenType.KEYWORD) && !parseTokens.get(k).getValue().equalsIgnoreCase(":=")) {
                             childNode.setType(parseTokens.get(k));
                         }
                         if (parseTokens.get(k).hasType(Token.TokenType.SYMBOL) && parseTokens.get(k).getValue().equals(";")) {
diff --git a/sqlTranslate/src/main/java/parser/ast/function/FunctionDeclareContentNode.java b/sqlTranslate/src/main/java/parser/ast/function/FunctionDeclareContentNode.java
new file mode 100644
index 00000000..335a3753
--- /dev/null
+++ b/sqlTranslate/src/main/java/parser/ast/function/FunctionDeclareContentNode.java
@@ -0,0 +1,57 @@
+package parser.ast.function;
+
+import interfaces.DataType;
+import lexer.Token;
+import parser.ast.ASTNode;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class FunctionDeclareContentNode extends ASTNode implements DataType {
+    private Token type;
+    public FunctionDeclareContentNode() {
+        super();
+        setTokens(new ArrayList<>());
+        setType(new Token(Token.TokenType.NULL, ""));
+    }
+
+    public FunctionDeclareContentNode(List<Token> tokens) {
+        super(tokens);
+    }
+
+    public FunctionDeclareContentNode(ASTNode node) {
+        super(node);
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString) {
+        queryString.append(toString() + " ");
+        for (ASTNode child : node.getChildren()) {
+            child.visit(child, queryString);
+        }
+    }
+
+    @Override
+    public Token getType() {
+        return type;
+    }
+
+    @Override
+    public void setType(Token type) {
+        this.type = type;
+    }
+
+    @Override
+    public void ResetTokensbyType() {
+        List<Token> tokens = new ArrayList<>();
+        for (Token token : getTokens()) {
+            if (token.hasType(Token.TokenType.KEYWORD) && !token.getValue().equalsIgnoreCase(":=")) {
+                tokens.add(getType());
+            }
+            else {
+                tokens.add(token);
+            }
+        }
+        setTokens(tokens);
+    }
+}
diff --git a/sqlTranslate/src/main/java/parser/ast/function/FunctionDeclareNode.java b/sqlTranslate/src/main/java/parser/ast/function/FunctionDeclareNode.java
new file mode 100644
index 00000000..2942f4ae
--- /dev/null
+++ b/sqlTranslate/src/main/java/parser/ast/function/FunctionDeclareNode.java
@@ -0,0 +1,30 @@
+package parser.ast.function;
+
+import lexer.Token;
+import parser.ast.ASTNode;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class FunctionDeclareNode extends ASTNode {
+    public FunctionDeclareNode() {
+        super();
+        setTokens(new ArrayList<>());
+    }
+
+    public FunctionDeclareNode(ASTNode node) {
+        super(node);
+    }
+
+    public FunctionDeclareNode(List<Token> tokens) {
+        super(tokens);
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString) {
+        queryString.append(toString() + " ");
+        for (ASTNode child : node.getChildren()) {
+            child.visit(child, queryString);
+        }
+    }
+}
diff --git a/sqlTranslate/src/main/java/parser/ast/procedure/ProcedureDeclareContentNode.java b/sqlTranslate/src/main/java/parser/ast/procedure/ProcedureDeclareContentNode.java
new file mode 100644
index 00000000..cffec736
--- /dev/null
+++ b/sqlTranslate/src/main/java/parser/ast/procedure/ProcedureDeclareContentNode.java
@@ -0,0 +1,57 @@
+package parser.ast.procedure;
+
+import interfaces.DataType;
+import lexer.Token;
+import parser.ast.ASTNode;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ProcedureDeclareContentNode extends ASTNode implements DataType {
+    private Token type;
+    public ProcedureDeclareContentNode() {
+        super();
+        setTokens(new ArrayList<>());
+        setType(new Token(Token.TokenType.NULL, ""));
+    }
+
+    public ProcedureDeclareContentNode(ASTNode node) {
+        super(node);
+    }
+
+    public ProcedureDeclareContentNode(List<Token> tokens) {
+        super(tokens);
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString) {
+        queryString.append(toString() + " ");
+        for (ASTNode child : node.getChildren()) {
+            child.visit(child, queryString);
+        }
+    }
+
+    @Override
+    public Token getType() {
+        return type;
+    }
+
+    @Override
+    public void setType(Token type) {
+        this.type = type;
+    }
+
+    @Override
+    public void ResetTokensbyType() {
+        List<Token> tokens = new ArrayList<>();
+        for (Token token : getTokens()) {
+            if (token.hasType(Token.TokenType.KEYWORD) && !token.getValue().equalsIgnoreCase(":=")) {
+                tokens.add(getType());
+            }
+            else {
+                tokens.add(token);
+            }
+        }
+        setTokens(tokens);
+    }
+}
diff --git a/sqlTranslate/src/main/java/parser/ast/procedure/ProcedureDeclareNode.java b/sqlTranslate/src/main/java/parser/ast/procedure/ProcedureDeclareNode.java
new file mode 100644
index 00000000..c215c952
--- /dev/null
+++ b/sqlTranslate/src/main/java/parser/ast/procedure/ProcedureDeclareNode.java
@@ -0,0 +1,30 @@
+package parser.ast.procedure;
+
+import lexer.Token;
+import parser.ast.ASTNode;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ProcedureDeclareNode extends ASTNode {
+    public ProcedureDeclareNode() {
+        super();
+        setTokens(new ArrayList<>());
+    }
+
+    public ProcedureDeclareNode(ASTNode node) {
+        super(node);
+    }
+
+    public ProcedureDeclareNode(List<Token> tokens) {
+        super(tokens);
+    }
+
+    @Override
+    public void visit(ASTNode node, StringBuilder queryString) {
+        queryString.append(toString() + " ");
+        for (ASTNode child : node.getChildren()) {
+            child.visit(child, queryString);
+        }
+    }
+}
diff --git a/sqlTranslate/src/test/java/testTrigger.java b/sqlTranslate/src/test/java/testTrigger.java
index 0f374501..0c949f85 100644
--- a/sqlTranslate/src/test/java/testTrigger.java
+++ b/sqlTranslate/src/test/java/testTrigger.java
@@ -21,7 +21,7 @@ public class testTrigger {
                 "             l_action VARCHAR2(10) := 'INSERT';\n" +
                 "         BEGIN\n" +
                 "             INSERT INTO audit_log (action, employee_id) VALUES (l_action, 11);\n" +
-                "             DBMS_OUTPUT.PUT_LINE('Inserted record with ID: ' || :NEW.id);\n" +
+                "             DBMS_OUTPUT.PUT_LINE('Inserted record with ID: ' || 11);\n" +
                 "         EXCEPTION\n" +
                 "             WHEN OTHERS THEN\n" +
                 "                 DBMS_OUTPUT.PUT_LINE('An error occurred: ' || SQLERRM);\n" +
-- 
Gitee


From 07f747903caa114d6868285e86a360fd8b1419e7 Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Tue, 24 Sep 2024 09:33:52 +0800
Subject: [PATCH 110/113] refactor

---
 .../src/test/java/{testAlterTable.java => TestAlterTable.java}  | 2 +-
 .../src/test/java/{testCaseWhen.java => TestCaseWhen.java}      | 2 +-
 ...{testCommitRollbackExec.java => TestCommitRollbackExec.java} | 2 +-
 .../test/java/{testCreateTable.java => TestCreateTable.java}    | 2 +-
 sqlTranslate/src/test/java/{testDelete.java => TestDelete.java} | 2 +-
 .../src/test/java/{testDropTable.java => TestDropTable.java}    | 2 +-
 .../src/test/java/{testException.java => TestException.java}    | 2 +-
 .../src/test/java/{testFunction.java => TestFunction.java}      | 2 +-
 sqlTranslate/src/test/java/{testIfElse.java => TestIfElse.java} | 2 +-
 sqlTranslate/src/test/java/{testInsert.java => TestInsert.java} | 2 +-
 sqlTranslate/src/test/java/{testJoin.java => TestJoin.java}     | 2 +-
 sqlTranslate/src/test/java/{testLoop.java => TestLoop.java}     | 2 +-
 sqlTranslate/src/test/java/{testPL.java => TestPL.java}         | 2 +-
 .../src/test/java/{testProcedure.java => TestProcedure.java}    | 2 +-
 sqlTranslate/src/test/java/{testSelect.java => TestSelect.java} | 2 +-
 .../src/test/java/{testTrigger.java => TestTrigger.java}        | 2 +-
 sqlTranslate/src/test/java/{testUpdate.java => TestUpdate.java} | 2 +-
 sqlTranslate/src/test/java/{testView.java => TestView.java}     | 2 +-
 18 files changed, 18 insertions(+), 18 deletions(-)
 rename sqlTranslate/src/test/java/{testAlterTable.java => TestAlterTable.java} (98%)
 rename sqlTranslate/src/test/java/{testCaseWhen.java => TestCaseWhen.java} (98%)
 rename sqlTranslate/src/test/java/{testCommitRollbackExec.java => TestCommitRollbackExec.java} (98%)
 rename sqlTranslate/src/test/java/{testCreateTable.java => TestCreateTable.java} (98%)
 rename sqlTranslate/src/test/java/{testDelete.java => TestDelete.java} (98%)
 rename sqlTranslate/src/test/java/{testDropTable.java => TestDropTable.java} (98%)
 rename sqlTranslate/src/test/java/{testException.java => TestException.java} (98%)
 rename sqlTranslate/src/test/java/{testFunction.java => TestFunction.java} (98%)
 rename sqlTranslate/src/test/java/{testIfElse.java => TestIfElse.java} (98%)
 rename sqlTranslate/src/test/java/{testInsert.java => TestInsert.java} (98%)
 rename sqlTranslate/src/test/java/{testJoin.java => TestJoin.java} (98%)
 rename sqlTranslate/src/test/java/{testLoop.java => TestLoop.java} (98%)
 rename sqlTranslate/src/test/java/{testPL.java => TestPL.java} (98%)
 rename sqlTranslate/src/test/java/{testProcedure.java => TestProcedure.java} (99%)
 rename sqlTranslate/src/test/java/{testSelect.java => TestSelect.java} (98%)
 rename sqlTranslate/src/test/java/{testTrigger.java => TestTrigger.java} (98%)
 rename sqlTranslate/src/test/java/{testUpdate.java => TestUpdate.java} (98%)
 rename sqlTranslate/src/test/java/{testView.java => TestView.java} (98%)

diff --git a/sqlTranslate/src/test/java/testAlterTable.java b/sqlTranslate/src/test/java/TestAlterTable.java
similarity index 98%
rename from sqlTranslate/src/test/java/testAlterTable.java
rename to sqlTranslate/src/test/java/TestAlterTable.java
index 70c0efb4..66f6b507 100644
--- a/sqlTranslate/src/test/java/testAlterTable.java
+++ b/sqlTranslate/src/test/java/TestAlterTable.java
@@ -9,7 +9,7 @@ import parser.ast.ASTNode;
 import java.util.ArrayList;
 import java.util.List;
 
-public class testAlterTable {
+public class TestAlterTable {
     List<String> testSQL = new ArrayList<>();
     @BeforeEach
     public void loadData()
diff --git a/sqlTranslate/src/test/java/testCaseWhen.java b/sqlTranslate/src/test/java/TestCaseWhen.java
similarity index 98%
rename from sqlTranslate/src/test/java/testCaseWhen.java
rename to sqlTranslate/src/test/java/TestCaseWhen.java
index a2dca08a..fbdca0eb 100644
--- a/sqlTranslate/src/test/java/testCaseWhen.java
+++ b/sqlTranslate/src/test/java/TestCaseWhen.java
@@ -9,7 +9,7 @@ import parser.ast.ASTNode;
 import java.util.ArrayList;
 import java.util.List;
 
-public class testCaseWhen {
+public class TestCaseWhen {
     List<String> testSQL = new ArrayList<>();
     @BeforeEach
     public void loadData()
diff --git a/sqlTranslate/src/test/java/testCommitRollbackExec.java b/sqlTranslate/src/test/java/TestCommitRollbackExec.java
similarity index 98%
rename from sqlTranslate/src/test/java/testCommitRollbackExec.java
rename to sqlTranslate/src/test/java/TestCommitRollbackExec.java
index 96f4b193..f6b3ac8a 100644
--- a/sqlTranslate/src/test/java/testCommitRollbackExec.java
+++ b/sqlTranslate/src/test/java/TestCommitRollbackExec.java
@@ -9,7 +9,7 @@ import parser.ast.ASTNode;
 import java.util.ArrayList;
 import java.util.List;
 
-public class testCommitRollbackExec {
+public class TestCommitRollbackExec {
     List<String> testSQL = new ArrayList<>();
     @BeforeEach
     public void loadData()
diff --git a/sqlTranslate/src/test/java/testCreateTable.java b/sqlTranslate/src/test/java/TestCreateTable.java
similarity index 98%
rename from sqlTranslate/src/test/java/testCreateTable.java
rename to sqlTranslate/src/test/java/TestCreateTable.java
index 11f8e90e..4dba8f0b 100644
--- a/sqlTranslate/src/test/java/testCreateTable.java
+++ b/sqlTranslate/src/test/java/TestCreateTable.java
@@ -9,7 +9,7 @@ import parser.ast.ASTNode;
 import java.util.ArrayList;
 import java.util.List;
 
-public class testCreateTable {
+public class TestCreateTable {
     List<String> testSQL = new ArrayList<>();
     @BeforeEach
     public void loadData()
diff --git a/sqlTranslate/src/test/java/testDelete.java b/sqlTranslate/src/test/java/TestDelete.java
similarity index 98%
rename from sqlTranslate/src/test/java/testDelete.java
rename to sqlTranslate/src/test/java/TestDelete.java
index a8f13610..1a7b8487 100644
--- a/sqlTranslate/src/test/java/testDelete.java
+++ b/sqlTranslate/src/test/java/TestDelete.java
@@ -9,7 +9,7 @@ import parser.ast.ASTNode;
 import java.util.ArrayList;
 import java.util.List;
 
-public class testDelete {
+public class TestDelete {
     List<String> testSQL = new ArrayList<>();
     @BeforeEach
     public void loadData()
diff --git a/sqlTranslate/src/test/java/testDropTable.java b/sqlTranslate/src/test/java/TestDropTable.java
similarity index 98%
rename from sqlTranslate/src/test/java/testDropTable.java
rename to sqlTranslate/src/test/java/TestDropTable.java
index f3618c85..40c6cfbb 100644
--- a/sqlTranslate/src/test/java/testDropTable.java
+++ b/sqlTranslate/src/test/java/TestDropTable.java
@@ -9,7 +9,7 @@ import parser.ast.ASTNode;
 import java.util.ArrayList;
 import java.util.List;
 
-public class testDropTable {
+public class TestDropTable {
     List<String> testSQL = new ArrayList<>();
     @BeforeEach
     public void loadData()
diff --git a/sqlTranslate/src/test/java/testException.java b/sqlTranslate/src/test/java/TestException.java
similarity index 98%
rename from sqlTranslate/src/test/java/testException.java
rename to sqlTranslate/src/test/java/TestException.java
index a3e66c96..c19bda7e 100644
--- a/sqlTranslate/src/test/java/testException.java
+++ b/sqlTranslate/src/test/java/TestException.java
@@ -9,7 +9,7 @@ import parser.ast.ASTNode;
 import java.util.ArrayList;
 import java.util.List;
 
-public class testException {
+public class TestException {
     List<String> testSQL = new ArrayList<>();
     @BeforeEach
     public void loadData()
diff --git a/sqlTranslate/src/test/java/testFunction.java b/sqlTranslate/src/test/java/TestFunction.java
similarity index 98%
rename from sqlTranslate/src/test/java/testFunction.java
rename to sqlTranslate/src/test/java/TestFunction.java
index 94a63d42..0c9a7947 100644
--- a/sqlTranslate/src/test/java/testFunction.java
+++ b/sqlTranslate/src/test/java/TestFunction.java
@@ -9,7 +9,7 @@ import parser.ast.ASTNode;
 import java.util.ArrayList;
 import java.util.List;
 
-public class testFunction {
+public class TestFunction {
     List<String> testSQL = new ArrayList<>();
     @BeforeEach
     public void loadData()
diff --git a/sqlTranslate/src/test/java/testIfElse.java b/sqlTranslate/src/test/java/TestIfElse.java
similarity index 98%
rename from sqlTranslate/src/test/java/testIfElse.java
rename to sqlTranslate/src/test/java/TestIfElse.java
index 39c930b9..4948c7d0 100644
--- a/sqlTranslate/src/test/java/testIfElse.java
+++ b/sqlTranslate/src/test/java/TestIfElse.java
@@ -9,7 +9,7 @@ import parser.ast.ASTNode;
 import java.util.ArrayList;
 import java.util.List;
 
-public class testIfElse {
+public class TestIfElse {
     List<String> testSQL = new ArrayList<>();
     @BeforeEach
     public void loadData()
diff --git a/sqlTranslate/src/test/java/testInsert.java b/sqlTranslate/src/test/java/TestInsert.java
similarity index 98%
rename from sqlTranslate/src/test/java/testInsert.java
rename to sqlTranslate/src/test/java/TestInsert.java
index 673cbbfd..9abd7f8d 100644
--- a/sqlTranslate/src/test/java/testInsert.java
+++ b/sqlTranslate/src/test/java/TestInsert.java
@@ -9,7 +9,7 @@ import parser.ast.ASTNode;
 import java.util.ArrayList;
 import java.util.List;
 
-public class testInsert {
+public class TestInsert {
     List<String> testSQL = new ArrayList<>();
     @BeforeEach
     public void loadData()
diff --git a/sqlTranslate/src/test/java/testJoin.java b/sqlTranslate/src/test/java/TestJoin.java
similarity index 98%
rename from sqlTranslate/src/test/java/testJoin.java
rename to sqlTranslate/src/test/java/TestJoin.java
index 87f6e8a3..c3de0fef 100644
--- a/sqlTranslate/src/test/java/testJoin.java
+++ b/sqlTranslate/src/test/java/TestJoin.java
@@ -9,7 +9,7 @@ import parser.ast.ASTNode;
 import java.util.ArrayList;
 import java.util.List;
 
-public class testJoin {
+public class TestJoin {
     List<String> testSQL = new ArrayList<>();
     @BeforeEach
     public void loadData()
diff --git a/sqlTranslate/src/test/java/testLoop.java b/sqlTranslate/src/test/java/TestLoop.java
similarity index 98%
rename from sqlTranslate/src/test/java/testLoop.java
rename to sqlTranslate/src/test/java/TestLoop.java
index a31e3888..f34f5eb6 100644
--- a/sqlTranslate/src/test/java/testLoop.java
+++ b/sqlTranslate/src/test/java/TestLoop.java
@@ -9,7 +9,7 @@ import parser.ast.ASTNode;
 import java.util.ArrayList;
 import java.util.List;
 
-public class testLoop {
+public class TestLoop {
     List<String> testSQL = new ArrayList<>();
     @BeforeEach
     public void loadData()
diff --git a/sqlTranslate/src/test/java/testPL.java b/sqlTranslate/src/test/java/TestPL.java
similarity index 98%
rename from sqlTranslate/src/test/java/testPL.java
rename to sqlTranslate/src/test/java/TestPL.java
index ddeeb6f8..11cb562d 100644
--- a/sqlTranslate/src/test/java/testPL.java
+++ b/sqlTranslate/src/test/java/TestPL.java
@@ -9,7 +9,7 @@ import parser.ast.ASTNode;
 import java.util.ArrayList;
 import java.util.List;
 
-public class testPL {
+public class TestPL {
     List<String> testSQL = new ArrayList<>();
     @BeforeEach
     public void loadData()
diff --git a/sqlTranslate/src/test/java/testProcedure.java b/sqlTranslate/src/test/java/TestProcedure.java
similarity index 99%
rename from sqlTranslate/src/test/java/testProcedure.java
rename to sqlTranslate/src/test/java/TestProcedure.java
index 798a345b..25d623dd 100644
--- a/sqlTranslate/src/test/java/testProcedure.java
+++ b/sqlTranslate/src/test/java/TestProcedure.java
@@ -9,7 +9,7 @@ import parser.ast.ASTNode;
 import java.util.ArrayList;
 import java.util.List;
 
-public class testProcedure {
+public class TestProcedure {
     List<String> testSQL = new ArrayList<>();
     @BeforeEach
     public void loadData()
diff --git a/sqlTranslate/src/test/java/testSelect.java b/sqlTranslate/src/test/java/TestSelect.java
similarity index 98%
rename from sqlTranslate/src/test/java/testSelect.java
rename to sqlTranslate/src/test/java/TestSelect.java
index acb6baee..d300b038 100644
--- a/sqlTranslate/src/test/java/testSelect.java
+++ b/sqlTranslate/src/test/java/TestSelect.java
@@ -9,7 +9,7 @@ import parser.ast.ASTNode;
 import java.util.ArrayList;
 import java.util.List;
 
-public class testSelect {
+public class TestSelect {
     List<String> testSQL = new ArrayList<>();
     @BeforeEach
     public void loadData()
diff --git a/sqlTranslate/src/test/java/testTrigger.java b/sqlTranslate/src/test/java/TestTrigger.java
similarity index 98%
rename from sqlTranslate/src/test/java/testTrigger.java
rename to sqlTranslate/src/test/java/TestTrigger.java
index 0c949f85..a8f2e90c 100644
--- a/sqlTranslate/src/test/java/testTrigger.java
+++ b/sqlTranslate/src/test/java/TestTrigger.java
@@ -9,7 +9,7 @@ import parser.ast.ASTNode;
 import java.util.ArrayList;
 import java.util.List;
 
-public class testTrigger {
+public class TestTrigger {
     List<String> testSQL = new ArrayList<>();
     @BeforeEach
     public void loadData()
diff --git a/sqlTranslate/src/test/java/testUpdate.java b/sqlTranslate/src/test/java/TestUpdate.java
similarity index 98%
rename from sqlTranslate/src/test/java/testUpdate.java
rename to sqlTranslate/src/test/java/TestUpdate.java
index 3fe863e6..17ada616 100644
--- a/sqlTranslate/src/test/java/testUpdate.java
+++ b/sqlTranslate/src/test/java/TestUpdate.java
@@ -9,7 +9,7 @@ import parser.ast.ASTNode;
 import java.util.ArrayList;
 import java.util.List;
 
-public class testUpdate {
+public class TestUpdate {
     List<String> testSQL = new ArrayList<>();
     @BeforeEach
     public void loadData()
diff --git a/sqlTranslate/src/test/java/testView.java b/sqlTranslate/src/test/java/TestView.java
similarity index 98%
rename from sqlTranslate/src/test/java/testView.java
rename to sqlTranslate/src/test/java/TestView.java
index b3b36afb..ecae338a 100644
--- a/sqlTranslate/src/test/java/testView.java
+++ b/sqlTranslate/src/test/java/TestView.java
@@ -9,7 +9,7 @@ import parser.ast.ASTNode;
 import java.util.ArrayList;
 import java.util.List;
 
-public class testView {
+public class TestView {
     List<String> testSQL = new ArrayList<>();
     @BeforeEach
     public void loadData()
-- 
Gitee


From f833e13c945c232788122dd7bfe3799806972c40 Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Tue, 24 Sep 2024 09:34:29 +0800
Subject: [PATCH 111/113] refactor

---
 sqlTranslate/src/main/java/Main.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/sqlTranslate/src/main/java/Main.java b/sqlTranslate/src/main/java/Main.java
index 0c684fa8..028d1bc2 100644
--- a/sqlTranslate/src/main/java/Main.java
+++ b/sqlTranslate/src/main/java/Main.java
@@ -1,4 +1,3 @@
-
 import generator.OpenGaussGenerator;
 import lexer.OracleLexer;
 import parser.ast.ASTNode;
-- 
Gitee


From 98a3b240a13bb950c1ca30a36059420f2303a640 Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Thu, 26 Sep 2024 19:55:20 +0800
Subject: [PATCH 112/113] refactor the package name

---
 sqlTranslate/.idea/workspace.xml              | 167 ++++++++++--------
 .../java/generator/OpenGaussGenerator.java    |  14 +-
 .../src/main/java/parser/OracleParser.java    |  14 +-
 .../AlterAddColumnNode.java                   |   2 +-
 .../AlterAddConstraintNode.java               |   2 +-
 .../AlterDropColumnNode.java                  |   2 +-
 .../AlterDropConstraintNode.java              |   2 +-
 .../AlterEndNode.java                         |   2 +-
 .../AlterModifyColumnNode.java                |   2 +-
 .../{alterTable => altertable}/AlterNode.java |   2 +-
 .../AlterObjNode.java                         |   2 +-
 .../AlterRenameColumnNode.java                |   2 +-
 .../AlterRenameTableNode.java                 |   2 +-
 .../CaseConditionNode.java                    |   2 +-
 .../{caseWhen => casewhen}/CaseElseNode.java  |   2 +-
 .../{caseWhen => casewhen}/CaseEndNode.java   |   2 +-
 .../{caseWhen => casewhen}/CaseThenNode.java  |   2 +-
 .../CRTEndNode.java                           |   2 +-
 .../ColumnNode.java                           |   2 +-
 .../CreateTabNode.java                        |   2 +-
 .../TableConstraintNode.java                  |   2 +-
 .../TableNode.java                            |   2 +-
 .../TableTypeNode.java                        |   2 +-
 .../ast/{iFELSIF => ifelsif}/ELSENode.java    |   2 +-
 .../{iFELSIF => ifelsif}/ELSIFActionNode.java |   2 +-
 .../ELSIFConditionNode.java                   |   2 +-
 .../ast/{iFELSIF => ifelsif}/EndIFNode.java   |   2 +-
 .../{iFELSIF => ifelsif}/IFActionNode.java    |   2 +-
 .../{iFELSIF => ifelsif}/IFConditionNode.java |   2 +-
 29 files changed, 131 insertions(+), 116 deletions(-)
 rename sqlTranslate/src/main/java/parser/ast/{alterTable => altertable}/AlterAddColumnNode.java (98%)
 rename sqlTranslate/src/main/java/parser/ast/{alterTable => altertable}/AlterAddConstraintNode.java (94%)
 rename sqlTranslate/src/main/java/parser/ast/{alterTable => altertable}/AlterDropColumnNode.java (94%)
 rename sqlTranslate/src/main/java/parser/ast/{alterTable => altertable}/AlterDropConstraintNode.java (94%)
 rename sqlTranslate/src/main/java/parser/ast/{alterTable => altertable}/AlterEndNode.java (94%)
 rename sqlTranslate/src/main/java/parser/ast/{alterTable => altertable}/AlterModifyColumnNode.java (97%)
 rename sqlTranslate/src/main/java/parser/ast/{alterTable => altertable}/AlterNode.java (94%)
 rename sqlTranslate/src/main/java/parser/ast/{alterTable => altertable}/AlterObjNode.java (94%)
 rename sqlTranslate/src/main/java/parser/ast/{alterTable => altertable}/AlterRenameColumnNode.java (94%)
 rename sqlTranslate/src/main/java/parser/ast/{alterTable => altertable}/AlterRenameTableNode.java (94%)
 rename sqlTranslate/src/main/java/parser/ast/{caseWhen => casewhen}/CaseConditionNode.java (94%)
 rename sqlTranslate/src/main/java/parser/ast/{caseWhen => casewhen}/CaseElseNode.java (94%)
 rename sqlTranslate/src/main/java/parser/ast/{caseWhen => casewhen}/CaseEndNode.java (94%)
 rename sqlTranslate/src/main/java/parser/ast/{caseWhen => casewhen}/CaseThenNode.java (94%)
 rename sqlTranslate/src/main/java/parser/ast/{createTable => createtable}/CRTEndNode.java (93%)
 rename sqlTranslate/src/main/java/parser/ast/{createTable => createtable}/ColumnNode.java (98%)
 rename sqlTranslate/src/main/java/parser/ast/{createTable => createtable}/CreateTabNode.java (94%)
 rename sqlTranslate/src/main/java/parser/ast/{createTable => createtable}/TableConstraintNode.java (95%)
 rename sqlTranslate/src/main/java/parser/ast/{createTable => createtable}/TableNode.java (93%)
 rename sqlTranslate/src/main/java/parser/ast/{createTable => createtable}/TableTypeNode.java (94%)
 rename sqlTranslate/src/main/java/parser/ast/{iFELSIF => ifelsif}/ELSENode.java (95%)
 rename sqlTranslate/src/main/java/parser/ast/{iFELSIF => ifelsif}/ELSIFActionNode.java (95%)
 rename sqlTranslate/src/main/java/parser/ast/{iFELSIF => ifelsif}/ELSIFConditionNode.java (95%)
 rename sqlTranslate/src/main/java/parser/ast/{iFELSIF => ifelsif}/EndIFNode.java (95%)
 rename sqlTranslate/src/main/java/parser/ast/{iFELSIF => ifelsif}/IFActionNode.java (95%)
 rename sqlTranslate/src/main/java/parser/ast/{iFELSIF => ifelsif}/IFConditionNode.java (95%)

diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
index 71f86a50..5cca5ada 100644
--- a/sqlTranslate/.idea/workspace.xml
+++ b/sqlTranslate/.idea/workspace.xml
@@ -4,19 +4,36 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="revise trigger">
-      <change afterPath="$PROJECT_DIR$/src/main/java/parser/ast/function/FunctionDeclareContentNode.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/parser/ast/function/FunctionDeclareNode.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/parser/ast/procedure/ProcedureDeclareContentNode.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/parser/ast/procedure/ProcedureDeclareNode.java" afterDir="false" />
+    <list default="true" id="d8d12963-4777-48e3-9669-309cf5e41d60" name="更改" comment="refactor the package name">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/document/Function in Oracle" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/document/Function in Oracle" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/document/Procedure in Oracle" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/document/Procedure in Oracle" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/document/Todolist" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/document/Todolist" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/document/Trigger in Oracle" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/document/Trigger in Oracle" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/generator/OpenGaussGenerator.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/generator/OpenGaussGenerator.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/parser/OracleParser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/OracleParser.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/test/java/testTrigger.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/testTrigger.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/parser/ast/alterTable/AlterAddColumnNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/altertable/AlterAddColumnNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/parser/ast/alterTable/AlterAddConstraintNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/altertable/AlterAddConstraintNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/parser/ast/alterTable/AlterDropColumnNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/altertable/AlterDropColumnNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/parser/ast/alterTable/AlterDropConstraintNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/altertable/AlterDropConstraintNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/parser/ast/alterTable/AlterEndNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/altertable/AlterEndNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/parser/ast/alterTable/AlterModifyColumnNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/altertable/AlterModifyColumnNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/parser/ast/alterTable/AlterNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/altertable/AlterNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/parser/ast/alterTable/AlterObjNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/altertable/AlterObjNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/parser/ast/alterTable/AlterRenameColumnNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/altertable/AlterRenameColumnNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/parser/ast/alterTable/AlterRenameTableNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/altertable/AlterRenameTableNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/parser/ast/caseWhen/CaseConditionNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/casewhen/CaseConditionNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/parser/ast/caseWhen/CaseElseNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/casewhen/CaseElseNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/parser/ast/caseWhen/CaseEndNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/casewhen/CaseEndNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/parser/ast/caseWhen/CaseThenNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/casewhen/CaseThenNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/parser/ast/createTable/CRTEndNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/createtable/CRTEndNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/parser/ast/createTable/ColumnNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/createtable/ColumnNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/parser/ast/createTable/CreateTabNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/createtable/CreateTabNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/parser/ast/createTable/TableConstraintNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/createtable/TableConstraintNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/parser/ast/createTable/TableNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/createtable/TableNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/parser/ast/createTable/TableTypeNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/createtable/TableTypeNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/parser/ast/iFELSIF/ELSENode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/ifelsif/ELSENode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/parser/ast/iFELSIF/ELSIFActionNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/ifelsif/ELSIFActionNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/parser/ast/iFELSIF/ELSIFConditionNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/ifelsif/ELSIFConditionNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/parser/ast/iFELSIF/EndIFNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/ifelsif/EndIFNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/parser/ast/iFELSIF/IFActionNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/ifelsif/IFActionNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/parser/ast/iFELSIF/IFConditionNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/ifelsif/IFConditionNode.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -49,87 +66,85 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "Application.Main.executor": "Run",
-    "JUnit.testAlterTable.executor": "Run",
-    "JUnit.testAlterTable.testAlterTable.executor": "Run",
-    "JUnit.testCaseWhen.test.executor": "Run",
-    "JUnit.testCommitRollbackExec.test.executor": "Run",
-    "JUnit.testCreateTable.executor": "Run",
-    "JUnit.testCreateTable.test.executor": "Run",
-    "JUnit.testDelete.test.executor": "Run",
-    "JUnit.testDropTable.test.executor": "Run",
-    "JUnit.testException.executor": "Run",
-    "JUnit.testException.test.executor": "Run",
-    "JUnit.testFunction.test.executor": "Run",
-    "JUnit.testIfElse.test.executor": "Run",
-    "JUnit.testInsert.test.executor": "Run",
-    "JUnit.testJoin.executor": "Run",
-    "JUnit.testJoin.test.executor": "Run",
-    "JUnit.testLoop.test.executor": "Run",
-    "JUnit.testPL.executor": "Run",
-    "JUnit.testProcedure.test.executor": "Run",
-    "JUnit.testSelect.executor": "Run",
-    "JUnit.testSelect.test.executor": "Run",
-    "JUnit.testTrigger.executor": "Run",
-    "JUnit.testTrigger.test.executor": "Run",
-    "JUnit.testUpdate.executor": "Run",
-    "JUnit.testView.executor": "Run",
-    "RunOnceActivity.OpenProjectViewOnStart": "true",
-    "RunOnceActivity.ShowReadmeOnStart": "true",
-    "git-widget-placeholder": "master",
-    "kotlin-language-version-configured": "true",
-    "last_opened_file_path": "F:/oracle2opengauss/examples/sqlTranslate",
-    "project.structure.last.edited": "Project",
-    "project.structure.proportion": "0.0",
-    "project.structure.side.proportion": "0.0",
-    "settings.editor.selected.configurable": "preferences.pluginManager"
+  <component name="PropertiesComponent">{
+  &quot;keyToString&quot;: {
+    &quot;Application.Main.executor&quot;: &quot;Run&quot;,
+    &quot;JUnit.testAlterTable.executor&quot;: &quot;Run&quot;,
+    &quot;JUnit.testAlterTable.testAlterTable.executor&quot;: &quot;Run&quot;,
+    &quot;JUnit.testCaseWhen.test.executor&quot;: &quot;Run&quot;,
+    &quot;JUnit.testCommitRollbackExec.test.executor&quot;: &quot;Run&quot;,
+    &quot;JUnit.testCreateTable.executor&quot;: &quot;Run&quot;,
+    &quot;JUnit.testCreateTable.test.executor&quot;: &quot;Run&quot;,
+    &quot;JUnit.testDelete.test.executor&quot;: &quot;Run&quot;,
+    &quot;JUnit.testDropTable.test.executor&quot;: &quot;Run&quot;,
+    &quot;JUnit.testException.executor&quot;: &quot;Run&quot;,
+    &quot;JUnit.testException.test.executor&quot;: &quot;Run&quot;,
+    &quot;JUnit.testFunction.test.executor&quot;: &quot;Run&quot;,
+    &quot;JUnit.testIfElse.test.executor&quot;: &quot;Run&quot;,
+    &quot;JUnit.testInsert.test.executor&quot;: &quot;Run&quot;,
+    &quot;JUnit.testJoin.executor&quot;: &quot;Run&quot;,
+    &quot;JUnit.testJoin.test.executor&quot;: &quot;Run&quot;,
+    &quot;JUnit.testLoop.test.executor&quot;: &quot;Run&quot;,
+    &quot;JUnit.testPL.executor&quot;: &quot;Run&quot;,
+    &quot;JUnit.testProcedure.test.executor&quot;: &quot;Run&quot;,
+    &quot;JUnit.testSelect.executor&quot;: &quot;Run&quot;,
+    &quot;JUnit.testSelect.test.executor&quot;: &quot;Run&quot;,
+    &quot;JUnit.testTrigger.executor&quot;: &quot;Run&quot;,
+    &quot;JUnit.testTrigger.test.executor&quot;: &quot;Run&quot;,
+    &quot;JUnit.testUpdate.executor&quot;: &quot;Run&quot;,
+    &quot;JUnit.testView.executor&quot;: &quot;Run&quot;,
+    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    &quot;git-widget-placeholder&quot;: &quot;master&quot;,
+    &quot;kotlin-language-version-configured&quot;: &quot;true&quot;,
+    &quot;last_opened_file_path&quot;: &quot;F:/oracle2opengauss/examples/sqlTranslate&quot;,
+    &quot;project.structure.last.edited&quot;: &quot;Project&quot;,
+    &quot;project.structure.proportion&quot;: &quot;0.0&quot;,
+    &quot;project.structure.side.proportion&quot;: &quot;0.0&quot;,
+    &quot;settings.editor.selected.configurable&quot;: &quot;preferences.pluginManager&quot;
   }
-}]]></component>
-  <component name="RunManager" selected="JUnit.testTrigger.test">
-    <configuration name="testCaseWhen.test" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+}</component>
+  <component name="RunManager" selected="Application.Main">
+    <configuration name="Main" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
+      <option name="MAIN_CLASS_NAME" value="Main" />
       <module name="sqlTranslate" />
-      <option name="PACKAGE_NAME" value="" />
-      <option name="MAIN_CLASS_NAME" value="testCaseWhen" />
-      <option name="METHOD_NAME" value="test" />
-      <option name="TEST_OBJECT" value="method" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="testFunction.test" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="TestCaseWhen.test" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="sqlTranslate" />
       <option name="PACKAGE_NAME" value="" />
-      <option name="MAIN_CLASS_NAME" value="testFunction" />
+      <option name="MAIN_CLASS_NAME" value="TestCaseWhen" />
       <option name="METHOD_NAME" value="test" />
       <option name="TEST_OBJECT" value="method" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="testSelect" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="TestFunction.test" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="sqlTranslate" />
       <option name="PACKAGE_NAME" value="" />
-      <option name="MAIN_CLASS_NAME" value="testSelect" />
-      <option name="TEST_OBJECT" value="class" />
+      <option name="MAIN_CLASS_NAME" value="TestFunction" />
+      <option name="METHOD_NAME" value="test" />
+      <option name="TEST_OBJECT" value="method" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="testTrigger" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="TestTrigger" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="sqlTranslate" />
       <option name="PACKAGE_NAME" value="" />
-      <option name="MAIN_CLASS_NAME" value="testTrigger" />
+      <option name="MAIN_CLASS_NAME" value="TestTrigger" />
       <option name="TEST_OBJECT" value="class" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="testTrigger.test" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="TestTrigger.test" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="sqlTranslate" />
       <option name="PACKAGE_NAME" value="" />
-      <option name="MAIN_CLASS_NAME" value="testTrigger" />
+      <option name="MAIN_CLASS_NAME" value="TestTrigger" />
       <option name="METHOD_NAME" value="test" />
       <option name="TEST_OBJECT" value="method" />
       <method v="2">
@@ -137,19 +152,19 @@
       </method>
     </configuration>
     <list>
-      <item itemvalue="JUnit.testCaseWhen.test" />
-      <item itemvalue="JUnit.testFunction.test" />
-      <item itemvalue="JUnit.testSelect" />
-      <item itemvalue="JUnit.testTrigger" />
-      <item itemvalue="JUnit.testTrigger.test" />
+      <item itemvalue="Application.Main" />
+      <item itemvalue="JUnit.TestCaseWhen.test" />
+      <item itemvalue="JUnit.TestFunction.test" />
+      <item itemvalue="JUnit.TestTrigger" />
+      <item itemvalue="JUnit.TestTrigger.test" />
     </list>
     <recent_temporary>
       <list>
-        <item itemvalue="JUnit.testTrigger.test" />
-        <item itemvalue="JUnit.testFunction.test" />
-        <item itemvalue="JUnit.testTrigger" />
-        <item itemvalue="JUnit.testCaseWhen.test" />
-        <item itemvalue="JUnit.testSelect" />
+        <item itemvalue="Application.Main" />
+        <item itemvalue="JUnit.TestTrigger.test" />
+        <item itemvalue="JUnit.TestFunction.test" />
+        <item itemvalue="JUnit.TestTrigger" />
+        <item itemvalue="JUnit.TestCaseWhen.test" />
       </list>
     </recent_temporary>
   </component>
@@ -505,7 +520,7 @@
       <option name="project" value="LOCAL" />
       <updated>1726633703475</updated>
     </task>
-    <option name="localTasksCounter" value="106" />
+    <option name="localTasksCounter" value="109" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
@@ -520,8 +535,6 @@
     </option>
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="add IF ELSIF" />
-    <MESSAGE value="add Loop document" />
     <MESSAGE value="add Loop keywords" />
     <MESSAGE value="add Loop ast classes" />
     <MESSAGE value="add Loop" />
@@ -545,7 +558,9 @@
     <MESSAGE value="fix some bugs" />
     <MESSAGE value="revise" />
     <MESSAGE value="revise trigger" />
-    <option name="LAST_COMMIT_MESSAGE" value="revise trigger" />
+    <MESSAGE value="refactor" />
+    <MESSAGE value="refactor the package name" />
+    <option name="LAST_COMMIT_MESSAGE" value="refactor the package name" />
   </component>
   <component name="XDebuggerManager">
     <watches-manager>
diff --git a/sqlTranslate/src/main/java/generator/OpenGaussGenerator.java b/sqlTranslate/src/main/java/generator/OpenGaussGenerator.java
index a98188f1..88c2a562 100644
--- a/sqlTranslate/src/main/java/generator/OpenGaussGenerator.java
+++ b/sqlTranslate/src/main/java/generator/OpenGaussGenerator.java
@@ -5,12 +5,12 @@ import interfaces.DataType;
 import lexer.OracleLexer;
 import lexer.Token;
 import parser.ast.ASTNode;
-import parser.ast.alterTable.AlterAddColumnNode;
-import parser.ast.alterTable.AlterModifyColumnNode;
-import parser.ast.alterTable.AlterNode;
-import parser.ast.caseWhen.CaseConditionNode;
-import parser.ast.createTable.ColumnNode;
-import parser.ast.createTable.CreateTabNode;
+import parser.ast.altertable.AlterAddColumnNode;
+import parser.ast.altertable.AlterModifyColumnNode;
+import parser.ast.altertable.AlterNode;
+import parser.ast.casewhen.CaseConditionNode;
+import parser.ast.createtable.ColumnNode;
+import parser.ast.createtable.CreateTabNode;
 import exception.GenerateFailedException;
 import parser.ast.delete.DeleteNode;
 import parser.ast.drop.DropNode;
@@ -18,7 +18,7 @@ import parser.ast.drop.DropOptionNode;
 import parser.ast.exception.ExceptionActionNode;
 import parser.ast.exception.ExceptionNode;
 import parser.ast.function.*;
-import parser.ast.iFELSIF.IFConditionNode;
+import parser.ast.ifelsif.IFConditionNode;
 import parser.ast.insert.InsertNode;
 import parser.ast.join.JoinConditionNode;
 import parser.ast.join.JoinSourceTabNode;
diff --git a/sqlTranslate/src/main/java/parser/OracleParser.java b/sqlTranslate/src/main/java/parser/OracleParser.java
index d4684a13..fe3797a6 100644
--- a/sqlTranslate/src/main/java/parser/OracleParser.java
+++ b/sqlTranslate/src/main/java/parser/OracleParser.java
@@ -4,12 +4,12 @@ import lexer.OracleLexer;
 import lexer.Token;
 import parser.ast.ASTNode;
 import exception.ParseFailedException;
-import parser.ast.alterTable.*;
-import parser.ast.caseWhen.CaseConditionNode;
-import parser.ast.caseWhen.CaseElseNode;
-import parser.ast.caseWhen.CaseEndNode;
-import parser.ast.caseWhen.CaseThenNode;
-import parser.ast.createTable.*;
+import parser.ast.altertable.*;
+import parser.ast.casewhen.CaseConditionNode;
+import parser.ast.casewhen.CaseElseNode;
+import parser.ast.casewhen.CaseEndNode;
+import parser.ast.casewhen.CaseThenNode;
+import parser.ast.createtable.*;
 import parser.ast.delete.DeleteConditionNode;
 import parser.ast.delete.DeleteEndNode;
 import parser.ast.delete.DeleteNode;
@@ -20,7 +20,7 @@ import parser.ast.drop.DropNode;
 import parser.ast.drop.DropOptionNode;
 import parser.ast.exception.*;
 import parser.ast.function.*;
-import parser.ast.iFELSIF.*;
+import parser.ast.ifelsif.*;
 import parser.ast.insert.InsertDataNode;
 import parser.ast.insert.InsertEndNode;
 import parser.ast.insert.InsertNode;
diff --git a/sqlTranslate/src/main/java/parser/ast/alterTable/AlterAddColumnNode.java b/sqlTranslate/src/main/java/parser/ast/altertable/AlterAddColumnNode.java
similarity index 98%
rename from sqlTranslate/src/main/java/parser/ast/alterTable/AlterAddColumnNode.java
rename to sqlTranslate/src/main/java/parser/ast/altertable/AlterAddColumnNode.java
index 60f4a0b3..7da13de9 100644
--- a/sqlTranslate/src/main/java/parser/ast/alterTable/AlterAddColumnNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/altertable/AlterAddColumnNode.java
@@ -1,4 +1,4 @@
-package parser.ast.alterTable;
+package parser.ast.altertable;
 
 import interfaces.DataType;
 import lexer.Token;
diff --git a/sqlTranslate/src/main/java/parser/ast/alterTable/AlterAddConstraintNode.java b/sqlTranslate/src/main/java/parser/ast/altertable/AlterAddConstraintNode.java
similarity index 94%
rename from sqlTranslate/src/main/java/parser/ast/alterTable/AlterAddConstraintNode.java
rename to sqlTranslate/src/main/java/parser/ast/altertable/AlterAddConstraintNode.java
index 3e068191..16dd594f 100644
--- a/sqlTranslate/src/main/java/parser/ast/alterTable/AlterAddConstraintNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/altertable/AlterAddConstraintNode.java
@@ -1,4 +1,4 @@
-package parser.ast.alterTable;
+package parser.ast.altertable;
 
 import lexer.Token;
 import parser.ast.ASTNode;
diff --git a/sqlTranslate/src/main/java/parser/ast/alterTable/AlterDropColumnNode.java b/sqlTranslate/src/main/java/parser/ast/altertable/AlterDropColumnNode.java
similarity index 94%
rename from sqlTranslate/src/main/java/parser/ast/alterTable/AlterDropColumnNode.java
rename to sqlTranslate/src/main/java/parser/ast/altertable/AlterDropColumnNode.java
index dd3020f5..d1cc81f1 100644
--- a/sqlTranslate/src/main/java/parser/ast/alterTable/AlterDropColumnNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/altertable/AlterDropColumnNode.java
@@ -1,4 +1,4 @@
-package parser.ast.alterTable;
+package parser.ast.altertable;
 
 import lexer.Token;
 import parser.ast.ASTNode;
diff --git a/sqlTranslate/src/main/java/parser/ast/alterTable/AlterDropConstraintNode.java b/sqlTranslate/src/main/java/parser/ast/altertable/AlterDropConstraintNode.java
similarity index 94%
rename from sqlTranslate/src/main/java/parser/ast/alterTable/AlterDropConstraintNode.java
rename to sqlTranslate/src/main/java/parser/ast/altertable/AlterDropConstraintNode.java
index d5cbb768..079daa92 100644
--- a/sqlTranslate/src/main/java/parser/ast/alterTable/AlterDropConstraintNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/altertable/AlterDropConstraintNode.java
@@ -1,4 +1,4 @@
-package parser.ast.alterTable;
+package parser.ast.altertable;
 
 import lexer.Token;
 import parser.ast.ASTNode;
diff --git a/sqlTranslate/src/main/java/parser/ast/alterTable/AlterEndNode.java b/sqlTranslate/src/main/java/parser/ast/altertable/AlterEndNode.java
similarity index 94%
rename from sqlTranslate/src/main/java/parser/ast/alterTable/AlterEndNode.java
rename to sqlTranslate/src/main/java/parser/ast/altertable/AlterEndNode.java
index 02ee010e..0daf45c3 100644
--- a/sqlTranslate/src/main/java/parser/ast/alterTable/AlterEndNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/altertable/AlterEndNode.java
@@ -1,4 +1,4 @@
-package parser.ast.alterTable;
+package parser.ast.altertable;
 
 import lexer.Token;
 import parser.ast.ASTNode;
diff --git a/sqlTranslate/src/main/java/parser/ast/alterTable/AlterModifyColumnNode.java b/sqlTranslate/src/main/java/parser/ast/altertable/AlterModifyColumnNode.java
similarity index 97%
rename from sqlTranslate/src/main/java/parser/ast/alterTable/AlterModifyColumnNode.java
rename to sqlTranslate/src/main/java/parser/ast/altertable/AlterModifyColumnNode.java
index aaa7e3be..6903af48 100644
--- a/sqlTranslate/src/main/java/parser/ast/alterTable/AlterModifyColumnNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/altertable/AlterModifyColumnNode.java
@@ -1,4 +1,4 @@
-package parser.ast.alterTable;
+package parser.ast.altertable;
 
 import interfaces.DataType;
 import lexer.Token;
diff --git a/sqlTranslate/src/main/java/parser/ast/alterTable/AlterNode.java b/sqlTranslate/src/main/java/parser/ast/altertable/AlterNode.java
similarity index 94%
rename from sqlTranslate/src/main/java/parser/ast/alterTable/AlterNode.java
rename to sqlTranslate/src/main/java/parser/ast/altertable/AlterNode.java
index 192e178c..c7a2b13f 100644
--- a/sqlTranslate/src/main/java/parser/ast/alterTable/AlterNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/altertable/AlterNode.java
@@ -1,4 +1,4 @@
-package parser.ast.alterTable;
+package parser.ast.altertable;
 
 import lexer.Token;
 import parser.ast.ASTNode;
diff --git a/sqlTranslate/src/main/java/parser/ast/alterTable/AlterObjNode.java b/sqlTranslate/src/main/java/parser/ast/altertable/AlterObjNode.java
similarity index 94%
rename from sqlTranslate/src/main/java/parser/ast/alterTable/AlterObjNode.java
rename to sqlTranslate/src/main/java/parser/ast/altertable/AlterObjNode.java
index a9d5169f..7b44124c 100644
--- a/sqlTranslate/src/main/java/parser/ast/alterTable/AlterObjNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/altertable/AlterObjNode.java
@@ -1,4 +1,4 @@
-package parser.ast.alterTable;
+package parser.ast.altertable;
 
 import lexer.Token;
 import parser.ast.ASTNode;
diff --git a/sqlTranslate/src/main/java/parser/ast/alterTable/AlterRenameColumnNode.java b/sqlTranslate/src/main/java/parser/ast/altertable/AlterRenameColumnNode.java
similarity index 94%
rename from sqlTranslate/src/main/java/parser/ast/alterTable/AlterRenameColumnNode.java
rename to sqlTranslate/src/main/java/parser/ast/altertable/AlterRenameColumnNode.java
index 27e6b9af..e407cc22 100644
--- a/sqlTranslate/src/main/java/parser/ast/alterTable/AlterRenameColumnNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/altertable/AlterRenameColumnNode.java
@@ -1,4 +1,4 @@
-package parser.ast.alterTable;
+package parser.ast.altertable;
 
 import lexer.Token;
 import parser.ast.ASTNode;
diff --git a/sqlTranslate/src/main/java/parser/ast/alterTable/AlterRenameTableNode.java b/sqlTranslate/src/main/java/parser/ast/altertable/AlterRenameTableNode.java
similarity index 94%
rename from sqlTranslate/src/main/java/parser/ast/alterTable/AlterRenameTableNode.java
rename to sqlTranslate/src/main/java/parser/ast/altertable/AlterRenameTableNode.java
index 24242aec..3e4f1759 100644
--- a/sqlTranslate/src/main/java/parser/ast/alterTable/AlterRenameTableNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/altertable/AlterRenameTableNode.java
@@ -1,4 +1,4 @@
-package parser.ast.alterTable;
+package parser.ast.altertable;
 
 import lexer.Token;
 import parser.ast.ASTNode;
diff --git a/sqlTranslate/src/main/java/parser/ast/caseWhen/CaseConditionNode.java b/sqlTranslate/src/main/java/parser/ast/casewhen/CaseConditionNode.java
similarity index 94%
rename from sqlTranslate/src/main/java/parser/ast/caseWhen/CaseConditionNode.java
rename to sqlTranslate/src/main/java/parser/ast/casewhen/CaseConditionNode.java
index 1ef2e66c..a97ff738 100644
--- a/sqlTranslate/src/main/java/parser/ast/caseWhen/CaseConditionNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/casewhen/CaseConditionNode.java
@@ -1,4 +1,4 @@
-package parser.ast.caseWhen;
+package parser.ast.casewhen;
 
 import lexer.Token;
 import parser.ast.ASTNode;
diff --git a/sqlTranslate/src/main/java/parser/ast/caseWhen/CaseElseNode.java b/sqlTranslate/src/main/java/parser/ast/casewhen/CaseElseNode.java
similarity index 94%
rename from sqlTranslate/src/main/java/parser/ast/caseWhen/CaseElseNode.java
rename to sqlTranslate/src/main/java/parser/ast/casewhen/CaseElseNode.java
index 26930498..fcbf1110 100644
--- a/sqlTranslate/src/main/java/parser/ast/caseWhen/CaseElseNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/casewhen/CaseElseNode.java
@@ -1,4 +1,4 @@
-package parser.ast.caseWhen;
+package parser.ast.casewhen;
 
 import lexer.Token;
 import parser.ast.ASTNode;
diff --git a/sqlTranslate/src/main/java/parser/ast/caseWhen/CaseEndNode.java b/sqlTranslate/src/main/java/parser/ast/casewhen/CaseEndNode.java
similarity index 94%
rename from sqlTranslate/src/main/java/parser/ast/caseWhen/CaseEndNode.java
rename to sqlTranslate/src/main/java/parser/ast/casewhen/CaseEndNode.java
index cb1ec2f5..7b92c8a5 100644
--- a/sqlTranslate/src/main/java/parser/ast/caseWhen/CaseEndNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/casewhen/CaseEndNode.java
@@ -1,4 +1,4 @@
-package parser.ast.caseWhen;
+package parser.ast.casewhen;
 
 import lexer.Token;
 import parser.ast.ASTNode;
diff --git a/sqlTranslate/src/main/java/parser/ast/caseWhen/CaseThenNode.java b/sqlTranslate/src/main/java/parser/ast/casewhen/CaseThenNode.java
similarity index 94%
rename from sqlTranslate/src/main/java/parser/ast/caseWhen/CaseThenNode.java
rename to sqlTranslate/src/main/java/parser/ast/casewhen/CaseThenNode.java
index 3690cf64..17f86846 100644
--- a/sqlTranslate/src/main/java/parser/ast/caseWhen/CaseThenNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/casewhen/CaseThenNode.java
@@ -1,4 +1,4 @@
-package parser.ast.caseWhen;
+package parser.ast.casewhen;
 
 import lexer.Token;
 import parser.ast.ASTNode;
diff --git a/sqlTranslate/src/main/java/parser/ast/createTable/CRTEndNode.java b/sqlTranslate/src/main/java/parser/ast/createtable/CRTEndNode.java
similarity index 93%
rename from sqlTranslate/src/main/java/parser/ast/createTable/CRTEndNode.java
rename to sqlTranslate/src/main/java/parser/ast/createtable/CRTEndNode.java
index 4822fe10..aa8220e3 100644
--- a/sqlTranslate/src/main/java/parser/ast/createTable/CRTEndNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/createtable/CRTEndNode.java
@@ -1,4 +1,4 @@
-package parser.ast.createTable;
+package parser.ast.createtable;
 import lexer.Token;
 import parser.ast.ASTNode;
 
diff --git a/sqlTranslate/src/main/java/parser/ast/createTable/ColumnNode.java b/sqlTranslate/src/main/java/parser/ast/createtable/ColumnNode.java
similarity index 98%
rename from sqlTranslate/src/main/java/parser/ast/createTable/ColumnNode.java
rename to sqlTranslate/src/main/java/parser/ast/createtable/ColumnNode.java
index db6ecbde..77f254af 100644
--- a/sqlTranslate/src/main/java/parser/ast/createTable/ColumnNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/createtable/ColumnNode.java
@@ -1,4 +1,4 @@
-package parser.ast.createTable;
+package parser.ast.createtable;
 
 import interfaces.DataType;
 import lexer.Token;
diff --git a/sqlTranslate/src/main/java/parser/ast/createTable/CreateTabNode.java b/sqlTranslate/src/main/java/parser/ast/createtable/CreateTabNode.java
similarity index 94%
rename from sqlTranslate/src/main/java/parser/ast/createTable/CreateTabNode.java
rename to sqlTranslate/src/main/java/parser/ast/createtable/CreateTabNode.java
index 796dae72..d3926722 100644
--- a/sqlTranslate/src/main/java/parser/ast/createTable/CreateTabNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/createtable/CreateTabNode.java
@@ -1,4 +1,4 @@
-package parser.ast.createTable;
+package parser.ast.createtable;
 
 import lexer.Token;
 import parser.ast.ASTNode;
diff --git a/sqlTranslate/src/main/java/parser/ast/createTable/TableConstraintNode.java b/sqlTranslate/src/main/java/parser/ast/createtable/TableConstraintNode.java
similarity index 95%
rename from sqlTranslate/src/main/java/parser/ast/createTable/TableConstraintNode.java
rename to sqlTranslate/src/main/java/parser/ast/createtable/TableConstraintNode.java
index b077c050..4072f420 100644
--- a/sqlTranslate/src/main/java/parser/ast/createTable/TableConstraintNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/createtable/TableConstraintNode.java
@@ -1,4 +1,4 @@
-package parser.ast.createTable;
+package parser.ast.createtable;
 
 import lexer.Token;
 import parser.ast.ASTNode;
diff --git a/sqlTranslate/src/main/java/parser/ast/createTable/TableNode.java b/sqlTranslate/src/main/java/parser/ast/createtable/TableNode.java
similarity index 93%
rename from sqlTranslate/src/main/java/parser/ast/createTable/TableNode.java
rename to sqlTranslate/src/main/java/parser/ast/createtable/TableNode.java
index a6c6644c..d4b5fead 100644
--- a/sqlTranslate/src/main/java/parser/ast/createTable/TableNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/createtable/TableNode.java
@@ -1,4 +1,4 @@
-package parser.ast.createTable;
+package parser.ast.createtable;
 
 import lexer.Token;
 import parser.ast.ASTNode;
diff --git a/sqlTranslate/src/main/java/parser/ast/createTable/TableTypeNode.java b/sqlTranslate/src/main/java/parser/ast/createtable/TableTypeNode.java
similarity index 94%
rename from sqlTranslate/src/main/java/parser/ast/createTable/TableTypeNode.java
rename to sqlTranslate/src/main/java/parser/ast/createtable/TableTypeNode.java
index 5188539f..87e0f54e 100644
--- a/sqlTranslate/src/main/java/parser/ast/createTable/TableTypeNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/createtable/TableTypeNode.java
@@ -1,4 +1,4 @@
-package parser.ast.createTable;
+package parser.ast.createtable;
 
 import lexer.Token;
 import parser.ast.ASTNode;
diff --git a/sqlTranslate/src/main/java/parser/ast/iFELSIF/ELSENode.java b/sqlTranslate/src/main/java/parser/ast/ifelsif/ELSENode.java
similarity index 95%
rename from sqlTranslate/src/main/java/parser/ast/iFELSIF/ELSENode.java
rename to sqlTranslate/src/main/java/parser/ast/ifelsif/ELSENode.java
index 92e97068..96653268 100644
--- a/sqlTranslate/src/main/java/parser/ast/iFELSIF/ELSENode.java
+++ b/sqlTranslate/src/main/java/parser/ast/ifelsif/ELSENode.java
@@ -1,4 +1,4 @@
-package parser.ast.iFELSIF;
+package parser.ast.ifelsif;
 
 import lexer.Token;
 import parser.ast.ASTNode;
diff --git a/sqlTranslate/src/main/java/parser/ast/iFELSIF/ELSIFActionNode.java b/sqlTranslate/src/main/java/parser/ast/ifelsif/ELSIFActionNode.java
similarity index 95%
rename from sqlTranslate/src/main/java/parser/ast/iFELSIF/ELSIFActionNode.java
rename to sqlTranslate/src/main/java/parser/ast/ifelsif/ELSIFActionNode.java
index 006ecba5..c8a0ff82 100644
--- a/sqlTranslate/src/main/java/parser/ast/iFELSIF/ELSIFActionNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/ifelsif/ELSIFActionNode.java
@@ -1,4 +1,4 @@
-package parser.ast.iFELSIF;
+package parser.ast.ifelsif;
 
 import lexer.Token;
 import parser.ast.ASTNode;
diff --git a/sqlTranslate/src/main/java/parser/ast/iFELSIF/ELSIFConditionNode.java b/sqlTranslate/src/main/java/parser/ast/ifelsif/ELSIFConditionNode.java
similarity index 95%
rename from sqlTranslate/src/main/java/parser/ast/iFELSIF/ELSIFConditionNode.java
rename to sqlTranslate/src/main/java/parser/ast/ifelsif/ELSIFConditionNode.java
index 0eb26dba..819bafb3 100644
--- a/sqlTranslate/src/main/java/parser/ast/iFELSIF/ELSIFConditionNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/ifelsif/ELSIFConditionNode.java
@@ -1,4 +1,4 @@
-package parser.ast.iFELSIF;
+package parser.ast.ifelsif;
 
 import lexer.Token;
 import parser.ast.ASTNode;
diff --git a/sqlTranslate/src/main/java/parser/ast/iFELSIF/EndIFNode.java b/sqlTranslate/src/main/java/parser/ast/ifelsif/EndIFNode.java
similarity index 95%
rename from sqlTranslate/src/main/java/parser/ast/iFELSIF/EndIFNode.java
rename to sqlTranslate/src/main/java/parser/ast/ifelsif/EndIFNode.java
index ee19eec1..a1ecb9b2 100644
--- a/sqlTranslate/src/main/java/parser/ast/iFELSIF/EndIFNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/ifelsif/EndIFNode.java
@@ -1,4 +1,4 @@
-package parser.ast.iFELSIF;
+package parser.ast.ifelsif;
 
 import lexer.Token;
 import parser.ast.ASTNode;
diff --git a/sqlTranslate/src/main/java/parser/ast/iFELSIF/IFActionNode.java b/sqlTranslate/src/main/java/parser/ast/ifelsif/IFActionNode.java
similarity index 95%
rename from sqlTranslate/src/main/java/parser/ast/iFELSIF/IFActionNode.java
rename to sqlTranslate/src/main/java/parser/ast/ifelsif/IFActionNode.java
index ffa3e5d2..1d834382 100644
--- a/sqlTranslate/src/main/java/parser/ast/iFELSIF/IFActionNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/ifelsif/IFActionNode.java
@@ -1,4 +1,4 @@
-package parser.ast.iFELSIF;
+package parser.ast.ifelsif;
 
 import lexer.Token;
 import parser.ast.ASTNode;
diff --git a/sqlTranslate/src/main/java/parser/ast/iFELSIF/IFConditionNode.java b/sqlTranslate/src/main/java/parser/ast/ifelsif/IFConditionNode.java
similarity index 95%
rename from sqlTranslate/src/main/java/parser/ast/iFELSIF/IFConditionNode.java
rename to sqlTranslate/src/main/java/parser/ast/ifelsif/IFConditionNode.java
index 2d9a2a34..aba574fb 100644
--- a/sqlTranslate/src/main/java/parser/ast/iFELSIF/IFConditionNode.java
+++ b/sqlTranslate/src/main/java/parser/ast/ifelsif/IFConditionNode.java
@@ -1,4 +1,4 @@
-package parser.ast.iFELSIF;
+package parser.ast.ifelsif;
 
 import lexer.Token;
 import parser.ast.ASTNode;
-- 
Gitee


From 54bef7c8642627c8587bfa108a52a82c140a66fe Mon Sep 17 00:00:00 2001
From: XudongXie <xiexudong23@otcaix.iscas.ac.cn>
Date: Thu, 26 Sep 2024 22:30:07 +0800
Subject: [PATCH 113/113] Add recursive parsing function

---
 sqlTranslate/.idea/workspace.xml              | 145 ++++++++----------
 .../java/generator/OpenGaussGenerator.java    |   5 +-
 .../src/main/java/parser/OracleParser.java    | 120 ++++++++++++++-
 sqlTranslate/src/test/java/TestFunction.java  |   4 +
 4 files changed, 184 insertions(+), 90 deletions(-)

diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
index 5cca5ada..13d75535 100644
--- a/sqlTranslate/.idea/workspace.xml
+++ b/sqlTranslate/.idea/workspace.xml
@@ -8,32 +8,7 @@
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/generator/OpenGaussGenerator.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/generator/OpenGaussGenerator.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/parser/OracleParser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/OracleParser.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/parser/ast/alterTable/AlterAddColumnNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/altertable/AlterAddColumnNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/parser/ast/alterTable/AlterAddConstraintNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/altertable/AlterAddConstraintNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/parser/ast/alterTable/AlterDropColumnNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/altertable/AlterDropColumnNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/parser/ast/alterTable/AlterDropConstraintNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/altertable/AlterDropConstraintNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/parser/ast/alterTable/AlterEndNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/altertable/AlterEndNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/parser/ast/alterTable/AlterModifyColumnNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/altertable/AlterModifyColumnNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/parser/ast/alterTable/AlterNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/altertable/AlterNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/parser/ast/alterTable/AlterObjNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/altertable/AlterObjNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/parser/ast/alterTable/AlterRenameColumnNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/altertable/AlterRenameColumnNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/parser/ast/alterTable/AlterRenameTableNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/altertable/AlterRenameTableNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/parser/ast/caseWhen/CaseConditionNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/casewhen/CaseConditionNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/parser/ast/caseWhen/CaseElseNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/casewhen/CaseElseNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/parser/ast/caseWhen/CaseEndNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/casewhen/CaseEndNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/parser/ast/caseWhen/CaseThenNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/casewhen/CaseThenNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/parser/ast/createTable/CRTEndNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/createtable/CRTEndNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/parser/ast/createTable/ColumnNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/createtable/ColumnNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/parser/ast/createTable/CreateTabNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/createtable/CreateTabNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/parser/ast/createTable/TableConstraintNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/createtable/TableConstraintNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/parser/ast/createTable/TableNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/createtable/TableNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/parser/ast/createTable/TableTypeNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/createtable/TableTypeNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/parser/ast/iFELSIF/ELSENode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/ifelsif/ELSENode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/parser/ast/iFELSIF/ELSIFActionNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/ifelsif/ELSIFActionNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/parser/ast/iFELSIF/ELSIFConditionNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/ifelsif/ELSIFConditionNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/parser/ast/iFELSIF/EndIFNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/ifelsif/EndIFNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/parser/ast/iFELSIF/IFActionNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/ifelsif/IFActionNode.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/parser/ast/iFELSIF/IFConditionNode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/parser/ast/ifelsif/IFConditionNode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/test/java/TestFunction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/TestFunction.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -66,77 +41,85 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent">{
-  &quot;keyToString&quot;: {
-    &quot;Application.Main.executor&quot;: &quot;Run&quot;,
-    &quot;JUnit.testAlterTable.executor&quot;: &quot;Run&quot;,
-    &quot;JUnit.testAlterTable.testAlterTable.executor&quot;: &quot;Run&quot;,
-    &quot;JUnit.testCaseWhen.test.executor&quot;: &quot;Run&quot;,
-    &quot;JUnit.testCommitRollbackExec.test.executor&quot;: &quot;Run&quot;,
-    &quot;JUnit.testCreateTable.executor&quot;: &quot;Run&quot;,
-    &quot;JUnit.testCreateTable.test.executor&quot;: &quot;Run&quot;,
-    &quot;JUnit.testDelete.test.executor&quot;: &quot;Run&quot;,
-    &quot;JUnit.testDropTable.test.executor&quot;: &quot;Run&quot;,
-    &quot;JUnit.testException.executor&quot;: &quot;Run&quot;,
-    &quot;JUnit.testException.test.executor&quot;: &quot;Run&quot;,
-    &quot;JUnit.testFunction.test.executor&quot;: &quot;Run&quot;,
-    &quot;JUnit.testIfElse.test.executor&quot;: &quot;Run&quot;,
-    &quot;JUnit.testInsert.test.executor&quot;: &quot;Run&quot;,
-    &quot;JUnit.testJoin.executor&quot;: &quot;Run&quot;,
-    &quot;JUnit.testJoin.test.executor&quot;: &quot;Run&quot;,
-    &quot;JUnit.testLoop.test.executor&quot;: &quot;Run&quot;,
-    &quot;JUnit.testPL.executor&quot;: &quot;Run&quot;,
-    &quot;JUnit.testProcedure.test.executor&quot;: &quot;Run&quot;,
-    &quot;JUnit.testSelect.executor&quot;: &quot;Run&quot;,
-    &quot;JUnit.testSelect.test.executor&quot;: &quot;Run&quot;,
-    &quot;JUnit.testTrigger.executor&quot;: &quot;Run&quot;,
-    &quot;JUnit.testTrigger.test.executor&quot;: &quot;Run&quot;,
-    &quot;JUnit.testUpdate.executor&quot;: &quot;Run&quot;,
-    &quot;JUnit.testView.executor&quot;: &quot;Run&quot;,
-    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
-    &quot;git-widget-placeholder&quot;: &quot;master&quot;,
-    &quot;kotlin-language-version-configured&quot;: &quot;true&quot;,
-    &quot;last_opened_file_path&quot;: &quot;F:/oracle2opengauss/examples/sqlTranslate&quot;,
-    &quot;project.structure.last.edited&quot;: &quot;Project&quot;,
-    &quot;project.structure.proportion&quot;: &quot;0.0&quot;,
-    &quot;project.structure.side.proportion&quot;: &quot;0.0&quot;,
-    &quot;settings.editor.selected.configurable&quot;: &quot;preferences.pluginManager&quot;
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "Application.Main.executor": "Run",
+    "JUnit.TestFunction.executor": "Run",
+    "JUnit.TestFunction.test.executor": "Run",
+    "JUnit.TestPL.test.executor": "Run",
+    "JUnit.TestProcedure.test.executor": "Run",
+    "JUnit.TestTrigger.test.executor": "Run",
+    "JUnit.testAlterTable.executor": "Run",
+    "JUnit.testAlterTable.testAlterTable.executor": "Run",
+    "JUnit.testCaseWhen.test.executor": "Run",
+    "JUnit.testCommitRollbackExec.test.executor": "Run",
+    "JUnit.testCreateTable.executor": "Run",
+    "JUnit.testCreateTable.test.executor": "Run",
+    "JUnit.testDelete.test.executor": "Run",
+    "JUnit.testDropTable.test.executor": "Run",
+    "JUnit.testException.executor": "Run",
+    "JUnit.testException.test.executor": "Run",
+    "JUnit.testFunction.test.executor": "Run",
+    "JUnit.testIfElse.test.executor": "Run",
+    "JUnit.testInsert.test.executor": "Run",
+    "JUnit.testJoin.executor": "Run",
+    "JUnit.testJoin.test.executor": "Run",
+    "JUnit.testLoop.test.executor": "Run",
+    "JUnit.testPL.executor": "Run",
+    "JUnit.testProcedure.test.executor": "Run",
+    "JUnit.testSelect.executor": "Run",
+    "JUnit.testSelect.test.executor": "Run",
+    "JUnit.testTrigger.executor": "Run",
+    "JUnit.testTrigger.test.executor": "Run",
+    "JUnit.testUpdate.executor": "Run",
+    "JUnit.testView.executor": "Run",
+    "RunOnceActivity.OpenProjectViewOnStart": "true",
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "git-widget-placeholder": "master",
+    "kotlin-language-version-configured": "true",
+    "last_opened_file_path": "F:/oracle2opengauss/examples/sqlTranslate",
+    "project.structure.last.edited": "Project",
+    "project.structure.proportion": "0.0",
+    "project.structure.side.proportion": "0.0",
+    "settings.editor.selected.configurable": "preferences.pluginManager"
   }
-}</component>
-  <component name="RunManager" selected="Application.Main">
-    <configuration name="Main" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
-      <option name="MAIN_CLASS_NAME" value="Main" />
+}]]></component>
+  <component name="RunManager" selected="JUnit.TestProcedure.test">
+    <configuration name="TestFunction" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="sqlTranslate" />
+      <option name="PACKAGE_NAME" value="" />
+      <option name="MAIN_CLASS_NAME" value="TestFunction" />
+      <option name="TEST_OBJECT" value="class" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="TestCaseWhen.test" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="TestFunction.test" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="sqlTranslate" />
       <option name="PACKAGE_NAME" value="" />
-      <option name="MAIN_CLASS_NAME" value="TestCaseWhen" />
+      <option name="MAIN_CLASS_NAME" value="TestFunction" />
       <option name="METHOD_NAME" value="test" />
       <option name="TEST_OBJECT" value="method" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="TestFunction.test" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="TestPL.test" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="sqlTranslate" />
       <option name="PACKAGE_NAME" value="" />
-      <option name="MAIN_CLASS_NAME" value="TestFunction" />
+      <option name="MAIN_CLASS_NAME" value="TestPL" />
       <option name="METHOD_NAME" value="test" />
       <option name="TEST_OBJECT" value="method" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration name="TestTrigger" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="TestProcedure.test" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="sqlTranslate" />
       <option name="PACKAGE_NAME" value="" />
-      <option name="MAIN_CLASS_NAME" value="TestTrigger" />
-      <option name="TEST_OBJECT" value="class" />
+      <option name="MAIN_CLASS_NAME" value="TestProcedure" />
+      <option name="METHOD_NAME" value="test" />
+      <option name="TEST_OBJECT" value="method" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
@@ -152,19 +135,19 @@
       </method>
     </configuration>
     <list>
-      <item itemvalue="Application.Main" />
-      <item itemvalue="JUnit.TestCaseWhen.test" />
+      <item itemvalue="JUnit.TestFunction" />
+      <item itemvalue="JUnit.TestPL.test" />
+      <item itemvalue="JUnit.TestProcedure.test" />
       <item itemvalue="JUnit.TestFunction.test" />
-      <item itemvalue="JUnit.TestTrigger" />
       <item itemvalue="JUnit.TestTrigger.test" />
     </list>
     <recent_temporary>
       <list>
-        <item itemvalue="Application.Main" />
-        <item itemvalue="JUnit.TestTrigger.test" />
+        <item itemvalue="JUnit.TestProcedure.test" />
         <item itemvalue="JUnit.TestFunction.test" />
-        <item itemvalue="JUnit.TestTrigger" />
-        <item itemvalue="JUnit.TestCaseWhen.test" />
+        <item itemvalue="JUnit.TestFunction" />
+        <item itemvalue="JUnit.TestTrigger.test" />
+        <item itemvalue="JUnit.TestPL.test" />
       </list>
     </recent_temporary>
   </component>
@@ -520,7 +503,7 @@
       <option name="project" value="LOCAL" />
       <updated>1726633703475</updated>
     </task>
-    <option name="localTasksCounter" value="109" />
+    <option name="localTasksCounter" value="110" />
     <servers />
   </component>
   <component name="Vcs.Log.Tabs.Properties">
diff --git a/sqlTranslate/src/main/java/generator/OpenGaussGenerator.java b/sqlTranslate/src/main/java/generator/OpenGaussGenerator.java
index 88c2a562..a43bc50f 100644
--- a/sqlTranslate/src/main/java/generator/OpenGaussGenerator.java
+++ b/sqlTranslate/src/main/java/generator/OpenGaussGenerator.java
@@ -463,7 +463,7 @@ public class OpenGaussGenerator {
                 String output = "";
                 List<Token> outputObj = new ArrayList<>();
                 for (Token token: lexer.getTokens()) {
-                    if (token.hasType(Token.TokenType.STRING)) {
+                    if (token.hasType(Token.TokenType.STRING) || token.hasType(Token.TokenType.NUMBER)) {
                         output += token.getValue().replace("'", "");
                     }
                     else if (token.hasType(Token.TokenType.IDENTIFIER) || token.hasType(Token.TokenType.KEYWORD)) {
@@ -657,6 +657,9 @@ public class OpenGaussGenerator {
                     CommonConvert(currentNode);
                     break;
                 }
+                else {
+                    CommonConvert(currentNode);
+                }
                 currentNode = currentNode.getFirstChild();
             }
         }
diff --git a/sqlTranslate/src/main/java/parser/OracleParser.java b/sqlTranslate/src/main/java/parser/OracleParser.java
index fe3797a6..5ecd5602 100644
--- a/sqlTranslate/src/main/java/parser/OracleParser.java
+++ b/sqlTranslate/src/main/java/parser/OracleParser.java
@@ -44,9 +44,13 @@ import java.util.List;
 
 public class OracleParser {
     private OracleLexer lexer;
+    public OracleParser() {}
     public OracleParser(OracleLexer lexer) {
         this.lexer = lexer;
     }
+    public void setLexer(OracleLexer lexer) {
+        this.lexer = lexer;
+    }
     public ASTNode parse()
     {
         try {
@@ -113,6 +117,35 @@ public class OracleParser {
         return null;
     }
 
+    public ASTNode parseTokens(List<Token> parseTokens) {
+        try {
+            if ((parseTokens.get(0).getValue().equalsIgnoreCase("CREATE") && parseTokens.get(1).getValue().equalsIgnoreCase("TABLE")) ||
+                    (parseTokens.get(0).getValue().equalsIgnoreCase("CREATE") && parseTokens.get(2).getValue().equalsIgnoreCase("TEMPORARY") && parseTokens.get(3).getValue().equalsIgnoreCase("TABLE"))) {
+                return parseCreateTab(parseTokens);
+            } else if (parseTokens.get(0).getValue().equalsIgnoreCase("INSERT")) {
+                return parseInsert(parseTokens);
+            } else if (parseTokens.get(0).getValue().equalsIgnoreCase("DROP")) {
+                return parseDrop(parseTokens);
+            } else if (parseTokens.get(0).getValue().equalsIgnoreCase("SELECT")) {
+                return parseSelect(parseTokens);
+            } else if (parseTokens.get(0).getValue().equalsIgnoreCase("UPDATE")) {
+                return parseUpdate(parseTokens);
+            } else if (parseTokens.get(0).getValue().equalsIgnoreCase("DELETE")) {
+                return parseDelete(parseTokens);
+            } else if (parseTokens.get(0).getValue().equalsIgnoreCase("ALTER")) {
+                return parseAlterTable(parseTokens);
+            } else if (
+                    (parseTokens.get(0).getValue().equalsIgnoreCase("CREATE") && parseTokens.get(1).getValue().equalsIgnoreCase("OR") && parseTokens.get(2).getValue().equalsIgnoreCase("REPLACE") && parseTokens.get(3).getValue().equalsIgnoreCase("VIEW"))
+                            || (parseTokens.get(0).getValue().equalsIgnoreCase("CREATE") && parseTokens.get(1).getValue().equalsIgnoreCase("VIEW"))
+            ) {
+                return parseCreateView(parseTokens);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
     /**
      * CREATE TEMPORARY? TABLE _table ( (_column _type column_constraint), (_column _type column_constraint)* table_constraint?)
      */
@@ -1894,8 +1927,18 @@ public class OracleParser {
                                 break;
                             }
                         }
-                        currentNode.addChild(childNode);
-                        currentNode = childNode;
+                        ASTNode bodystatementNode = parseTokens(childNode.getTokens());
+                        if (bodystatementNode != null) {
+                            currentNode.addChild(bodystatementNode);
+                            currentNode = bodystatementNode.getDeepestChild();
+                            ASTNode bodystatementEndNode = new ProcedurePLStatementNode();
+                            currentNode.addChild(bodystatementEndNode);
+                            currentNode = bodystatementEndNode;
+                        }
+                        else {
+                            currentNode.addChild(childNode);
+                            currentNode = childNode;
+                        }
                     }
                 }
             }
@@ -2201,11 +2244,52 @@ public class OracleParser {
                                 break;
                             }
                         }
-                        currentNode.addChild(childNode);
-                        currentNode = childNode;
+                        ASTNode bodystatementNode = parseTokens(childNode.getTokens());
+                        if (bodystatementNode != null) {
+                            currentNode.addChild(bodystatementNode);
+                            currentNode = bodystatementNode.getDeepestChild();
+                            ASTNode bodystatementEndNode = new FunctionBodyNode();
+                            currentNode.addChild(bodystatementEndNode);
+                            currentNode = bodystatementEndNode;
+                        }
+                        else {
+                            currentNode.addChild(childNode);
+                            currentNode = childNode;
+                        }
                     }
                 }
             }
+            // match exception
+            else if (parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("EXCEPTION")) {
+                int index = -1;
+                for (int j = i; j < parseTokens.size(); j++) {
+                    if (parseTokens.get(j).hasType(Token.TokenType.KEYWORD) && parseTokens.get(j).getValue().equalsIgnoreCase("END")) {
+                        index = j;
+                        break;
+                    }
+                }
+                if (index == -1) {
+                    try {
+                        throw new ParseFailedException("There exists syntax error and no END block is found!");
+                    } catch (ParseFailedException e) {
+                        e.printStackTrace();
+                    }
+                }
+                ASTNode childNode = parseException(parseTokens.subList(i, index + 1));
+                currentNode.addChild(childNode);
+                currentNode = childNode.getDeepestChild();
+                childNode = new FunctionEndNode();
+                for (int j = index; j < parseTokens.size(); j++) {
+                    childNode.addToken(parseTokens.get(j));
+                    if (parseTokens.get(j).hasType(Token.TokenType.SYMBOL) && parseTokens.get(j).getValue().equals(";")) {
+                        i = j;
+                        break;
+                    }
+                }
+                currentNode.addChild(childNode);
+                currentNode = childNode;
+                break;
+            }
             // match function end
             else if (parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("END")) {
                 ASTNode childNode = new FunctionEndNode();
@@ -2427,8 +2511,18 @@ public class OracleParser {
                     }
                     childNode.addToken(parseTokens.get(j));
                 }
-                currentNode.addChild(childNode);
-                currentNode = childNode;
+                ASTNode bodystatementNode = parseTokens(childNode.getTokens());
+                if (bodystatementNode != null) {
+                    currentNode.addChild(bodystatementNode);
+                    currentNode = bodystatementNode.getDeepestChild();
+                    ASTNode bodystatementEndNode = new TriggerBodyNode();
+                    currentNode.addChild(bodystatementEndNode);
+                    currentNode = bodystatementEndNode;
+                }
+                else {
+                    currentNode.addChild(childNode);
+                    currentNode = childNode;
+                }
             }
             else if (parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("END")) {
                 ASTNode childNode = new TriggerEndNode();
@@ -2529,8 +2623,18 @@ public class OracleParser {
                     }
                     childNode.addToken(parseTokens.get(j));
                 }
-                currentNode.addChild(childNode);
-                currentNode = childNode;
+                ASTNode bodystatementNode = parseTokens(childNode.getTokens());
+                if (bodystatementNode != null) {
+                    currentNode.addChild(bodystatementNode);
+                    currentNode = bodystatementNode.getDeepestChild();
+                    ASTNode bodystatementEndNode = new PLBodyNode();
+                    currentNode.addChild(bodystatementEndNode);
+                    currentNode = bodystatementEndNode;
+                }
+                else {
+                    currentNode.addChild(childNode);
+                    currentNode = childNode;
+                }
             }
             // match end
             else if (parseTokens.get(i).hasType(Token.TokenType.KEYWORD) && parseTokens.get(i).getValue().equalsIgnoreCase("END")) {
diff --git a/sqlTranslate/src/test/java/TestFunction.java b/sqlTranslate/src/test/java/TestFunction.java
index 0c9a7947..001e1a07 100644
--- a/sqlTranslate/src/test/java/TestFunction.java
+++ b/sqlTranslate/src/test/java/TestFunction.java
@@ -18,7 +18,11 @@ public class TestFunction {
                 "             input_string VARCHAR2\n" +
                 "         ) RETURN NUMBER IS\n" +
                 "         BEGIN\n" +
+                "             SELECT name, salary INTO v_name, v_salary FROM employees WHERE employee_id = 100;\n" +
                 "             RETURN LENGTH(input_string);\n" +
+                "         EXCEPTION\n" +
+                "             WHEN OTHERS THEN\n" +
+                "                 DBMS_OUTPUT.PUT_LINE('An error occurred: ' || SQLERRM);\n" +
                 "         END;");
         System.out.println("===== test of Function =====");
         System.out.println("The source DBMS is: " + CommonConfig.getSourceDB());
-- 
Gitee