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] fix some bugs

---
 sqlTranslate/.idea/workspace.xml              | 71 ++++++++-----------
 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, 108 insertions(+), 77 deletions(-)
 create mode 100644 sqlTranslate/src/test/java/testJoin.java

diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
index 72c990a7b..6adffbc19 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,7 +75,25 @@
     "settings.editor.selected.configurable": "preferences.pluginManager"
   }
 }]]></component>
-  <component name="RunManager" selected="JUnit.testView">
+  <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="testAlterTable" />
+      <option name="TEST_OBJECT" value="class" />
+      <method v="2">
+        <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="" />
@@ -105,15 +114,6 @@
         <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>
     <configuration name="testUpdate" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="sqlTranslate" />
       <option name="PACKAGE_NAME" value="" />
@@ -123,29 +123,20 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <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="testView" />
-      <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 b17eed35b..840bf2173 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 21d0e0174..fa85ba0c7 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 000000000..87f6e8a3f
--- /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 7069351ad..798a345ba 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" +