feat: ParenthesedSelectBody and ParenthesedFromItem

- parse `SetOperation` only after a (first plain) SelectBody has found, this fixes the performance issue - one more special Oracle Test succeeds - 5 remaining test failures
JSQLParser · wumpz · Apr 27, 2023 · Dec 11, 2022 · Dec 22, 2022 · Jan 8, 2023
commit 616bf23ed91b5d1c9ee9c08fe991db403e2f86b4
diff --git a/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt b/src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt
@@ -11,7 +11,7 @@
 options {
     IGNORE_CASE = true;
     STATIC = false;
-    DEBUG_PARSER = true;
+    DEBUG_PARSER = false;
     DEBUG_LOOKAHEAD = false;
     DEBUG_TOKEN_MANAGER = false;
     CACHE_TOKENS = false;
@@ -1984,14 +1984,14 @@ SelectBody SelectBody():
 { SelectBody selectBody = null; }
 {
     (
-
-        LOOKAHEAD( SetOperationList() ) selectBody = SetOperationList()
-        |
-        selectBody = PlainSelect()
-        |
-        selectBody = Values()
-        |
-        selectBody = ParenthesedSelectBody()
+        (
+            LOOKAHEAD(3) selectBody = PlainSelect()
+            |
+            LOOKAHEAD(3) selectBody = Values()
+            |
+            LOOKAHEAD(3) selectBody = ParenthesedSelectBody()
+        )
+        [ selectBody = SetOperationList(selectBody) ]
     )
 
     { return selectBody; }
@@ -2119,26 +2119,19 @@ PlainSelect PlainSelect() #PlainSelect:
     }
 }
 
-SelectBody SetOperationList() #SetOperationList: {
+SelectBody SetOperationList(SelectBody select) #SetOperationList: {
     SetOperationList list = new SetOperationList();
     List<OrderByElement> orderByElements = null;
     Limit limit = null;
     Offset offset = null;
     Fetch fetch = null;
     WithIsolation withIsolation = null;
-    SelectBody select = null;
+    //SelectBody select = null;
     List<SelectBody> selects = new ArrayList<SelectBody>();
     List<SetOperation> operations = new ArrayList<SetOperation>();
 }
 {
 
-    (
-        select = PlainSelect()
-        |
-        select = Values()
-        |
-        select = ParenthesedSelectBody()
-    )
     {
         selects.add(select);
     }

diff --git a/src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java b/src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java
@@ -3434,8 +3434,30 @@ public void testIssue217_keywordSeparator() throws JSQLParserException {
 
     @Test
     public void testIssue215_possibleEndlessParsing() throws JSQLParserException {
-        assertSqlCanBeParsedAndDeparsed(
-                "SELECT (CASE WHEN ((value LIKE '%t1%') OR (value LIKE '%t2%')) THEN 't1s' WHEN ((((((((((((((((((((((((((((value LIKE '%t3%') OR (value LIKE '%t3%')) OR (value LIKE '%t3%')) OR (value LIKE '%t4%')) OR (value LIKE '%t4%')) OR (value LIKE '%t5%')) OR (value LIKE '%t6%')) OR (value LIKE '%t6%')) OR (value LIKE '%t7%')) OR (value LIKE '%t7%')) OR (value LIKE '%t7%')) OR (value LIKE '%t8%')) OR (value LIKE '%t8%')) OR (value LIKE '%CTO%')) OR (value LIKE '%cto%')) OR (value LIKE '%Cto%')) OR (value LIKE '%t9%')) OR (value LIKE '%t9%')) OR (value LIKE '%COO%')) OR (value LIKE '%coo%')) OR (value LIKE '%Coo%')) OR (value LIKE '%t10%')) OR (value LIKE '%t10%')) OR (value LIKE '%CIO%')) OR (value LIKE '%cio%')) OR (value LIKE '%Cio%')) OR (value LIKE '%t11%')) OR (value LIKE '%t11%')) THEN 't' WHEN ((((value LIKE '%t12%') OR (value LIKE '%t12%')) OR (value LIKE '%VP%')) OR (value LIKE '%vp%')) THEN 'Vice t12s' WHEN ((((((value LIKE '% IT %') OR (value LIKE '%t13%')) OR (value LIKE '%t13%')) OR (value LIKE '% it %')) OR (value LIKE '%tech%')) OR (value LIKE '%Tech%')) THEN 'IT' WHEN ((((value LIKE '%Analyst%') OR (value LIKE '%t14%')) OR (value LIKE '%Analytic%')) OR (value LIKE '%analytic%')) THEN 'Analysts' WHEN ((value LIKE '%Manager%') OR (value LIKE '%manager%')) THEN 't15' ELSE 'Other' END) FROM tab1");
+        String sqlStr =
+                "SELECT (CASE WHEN ((value LIKE '%t1%') OR (value LIKE '%t2%')) THEN 't1s' WHEN ((((((((((((((((((((((((((((value LIKE '%t3%') OR (value LIKE '%t3%')) OR (value LIKE '%t3%')) OR (value LIKE '%t4%')) OR (value LIKE '%t4%')) OR (value LIKE '%t5%')) OR (value LIKE '%t6%')) OR (value LIKE '%t6%')) OR (value LIKE '%t7%')) OR (value LIKE '%t7%')) OR (value LIKE '%t7%')) OR (value LIKE '%t8%')) OR (value LIKE '%t8%')) OR (value LIKE '%CTO%')) OR (value LIKE '%cto%')) OR (value LIKE '%Cto%')) OR (value LIKE '%t9%')) OR (value LIKE '%t9%')) OR (value LIKE '%COO%')) OR (value LIKE '%coo%')) OR (value LIKE '%Coo%')) OR (value LIKE '%t10%')) OR (value LIKE '%t10%')) OR (value LIKE '%CIO%')) OR (value LIKE '%cio%')) OR (value LIKE '%Cio%')) OR (value LIKE '%t11%')) OR (value LIKE '%t11%')) THEN 't' WHEN ((((value LIKE '%t12%') OR (value LIKE '%t12%')) OR (value LIKE '%VP%')) OR (value LIKE '%vp%')) THEN 'Vice t12s' WHEN ((((((value LIKE '% IT %') OR (value LIKE '%t13%')) OR (value LIKE '%t13%')) OR (value LIKE '% it %')) OR (value LIKE '%tech%')) OR (value LIKE '%Tech%')) THEN 'IT' WHEN ((((value LIKE '%Analyst%') OR (value LIKE '%t14%')) OR (value LIKE '%Analytic%')) OR (value LIKE '%analytic%')) THEN 'Analysts' WHEN ((value LIKE '%Manager%') OR (value LIKE '%manager%')) THEN 't15' ELSE 'Other' END) FROM tab1";
+
+//        String sqlStr = "SELECT ( CASE\n" +
+//                "                    WHEN ( ( value LIKE '%t1%' )\n" +
+//                "                                OR ( value LIKE '%t2%' ) )\n" +
+//                "                        THEN 't1s'\n" +
+//                "                    WHEN ( ( ( ( ( ( value LIKE '% IT %' )\n" +
+//                "                                                OR ( value LIKE '%t13%' ) )\n" +
+//                "                                            OR ( value LIKE '%t13%' ) )\n" +
+//                "                                        OR ( value LIKE '% it %' ) )\n" +
+//                "                                    OR ( value LIKE '%tech%' ) )\n" +
+//                "                                OR ( value LIKE '%Tech%' ) )\n" +
+//                "                        THEN 'IT'\n" +
+//                "                    ELSE 'Other'\n" +
+//                "                END )\n" +
+//                "FROM tab1";
+
+        Statement stmt2 = CCJSqlParserUtil.parse(
+                sqlStr
+                , parser -> parser
+                        .withAllowComplexParsing(false)
+                        .withTimeOut(20000)
+        );
     }
 
     @Test

diff --git a/src/test/java/net/sf/jsqlparser/statement/select/SpecialOracleTest.java b/src/test/java/net/sf/jsqlparser/statement/select/SpecialOracleTest.java
@@ -115,6 +115,7 @@ public class SpecialOracleTest {
             "condition10.sql",
             "condition12.sql",
             "condition14.sql",
+            "condition15.sql",
             "condition19.sql",
             "condition20.sql",
             "connect_by01.sql",