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] refractor

---
 sqlTranslate/.idea/workspace.xml              | 16 ++++---
 sqlTranslate/src/main/java/Main.java          | 10 ++---
 .../Parser/AST/Select/SelectContentNode.java  | 45 +++++++++++++++++++
 .../java/Parser/AST/Select/SelectObjNode.java | 20 +--------
 .../Parser/AST/Select/SelectTableNode.java    | 27 -----------
 .../src/main/java/Parser/OracleParser.java    |  8 ++--
 6 files changed, 66 insertions(+), 60 deletions(-)
 create mode 100644 sqlTranslate/src/main/java/Parser/AST/Select/SelectContentNode.java
 delete mode 100644 sqlTranslate/src/main/java/Parser/AST/Select/SelectTableNode.java

diff --git a/sqlTranslate/.idea/workspace.xml b/sqlTranslate/.idea/workspace.xml
index 13d21d8f4..f4f354466 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 875f3ac78..33ce176aa 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/SelectContentNode.java b/sqlTranslate/src/main/java/Parser/AST/Select/SelectContentNode.java
new file mode 100644
index 000000000..d81838358
--- /dev/null
+++ b/sqlTranslate/src/main/java/Parser/AST/Select/SelectContentNode.java
@@ -0,0 +1,45 @@
+package Parser.AST.Select;
+
+import Lexer.Token;
+import Parser.AST.ASTNode;
+
+import java.util.List;
+
+public class SelectContentNode extends ASTNode {
+    public SelectContentNode(List<Token> tokens)
+    {
+        super(tokens);
+        this.isDistinct = "";
+    }
+
+    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(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 7ab20b345..1164e571c 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/AST/Select/SelectTableNode.java b/sqlTranslate/src/main/java/Parser/AST/Select/SelectTableNode.java
deleted file mode 100644
index 86c7ae51e..000000000
--- a/sqlTranslate/src/main/java/Parser/AST/Select/SelectTableNode.java
+++ /dev/null
@@ -1,27 +0,0 @@
-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/OracleParser.java b/sqlTranslate/src/main/java/Parser/OracleParser.java
index 68a78a065..4cdac2a86 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;
             }