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