fix: Oracle Hierarchical Expression shall allow XOR (not AND only)

- fixes #2231

Signed-off-by: Andreas Reichel <[email protected]>

Author: manticore-projects

src/main/java/net/sf/jsqlparser/expression/OracleHierarchicalExpression.java

@@ -65,11 +65,11 @@ public String toString() {
             }
             b.append(connectExpression.toString());
             if (startExpression != null) {
-                b.append(" START WITH ").append(startExpression.toString());
+                b.append(" START WITH ").append(startExpression);
             }
         } else {
             if (startExpression != null) {
-                b.append(" START WITH ").append(startExpression.toString());
+                b.append(" START WITH ").append(startExpression);
             }
             b.append(" CONNECT BY ");
             if (isNoCycle()) {

src/main/jjtree/net/sf/jsqlparser/parser/JSqlParserCC.jjt

@@ -3865,20 +3865,20 @@ OracleHierarchicalExpression OracleHierarchicalQueryClause():
 {
     (
         (
-            <K_START> <K_WITH>  expr=AndExpression() {result.setStartExpression(expr);}
-            <K_CONNECT> <K_BY> [ <K_NOCYCLE> { result.setNoCycle(true); } ] expr=AndExpression()
+            <K_START> <K_WITH>  expr=XorExpression() {result.setStartExpression(expr);}
+            <K_CONNECT> <K_BY> [ <K_NOCYCLE> { result.setNoCycle(true); } ] expr=XorExpression()
             {
                 result.setConnectExpression(expr);
             }
         )
         |
         (
-            <K_CONNECT> <K_BY> [ <K_NOCYCLE> { result.setNoCycle(true); } ] expr=AndExpression()
+            <K_CONNECT> <K_BY> [ <K_NOCYCLE> { result.setNoCycle(true); } ] expr=XorExpression()
             {
                 result.setConnectExpression(expr);
                 result.setConnectFirst(true);
             }
-            [ LOOKAHEAD(2) <K_START> <K_WITH>  expr=AndExpression() {result.setStartExpression(expr);} ]
+            [ LOOKAHEAD(2) <K_START> <K_WITH>  expr=XorExpression() {result.setStartExpression(expr);} ]
         )
     )
     {
@@ -6643,7 +6643,7 @@ TableFunction TableFunction():
 {
     [ prefix = <K_LATERAL> ]
     function=Function()
-    [ <K_WITH> ( withClause = <K_OFFSET> | withClause = <K_ORDINALITY> ) ]
+    [ LOOKAHEAD(2) <K_WITH> ( withClause = <K_OFFSET> | withClause = <K_ORDINALITY> ) ]
     {
         return  prefix!=null
             ? withClause!=null

src/test/java/net/sf/jsqlparser/expression/OracleHierarchicalExpressionTest.java

@@ -0,0 +1,15 @@
+package net.sf.jsqlparser.expression;
+
+import net.sf.jsqlparser.JSQLParserException;
+import net.sf.jsqlparser.test.TestUtils;
+import org.junit.jupiter.api.Test;
+
+class OracleHierarchicalExpressionTest {
+
+    @Test
+    void testIssue2231() throws JSQLParserException {
+        String sqlString =
+                "select name from product where level > 1 start with 1 = 1 or 1 = 2 connect by nextversion = prior activeversion";
+        TestUtils.assertSqlCanBeParsedAndDeparsed(sqlString, true);
+    }
+}