fix: Like Expression accepts Complex Expressions including BY PRIOR

- fixes #2158

Signed-off-by: Andreas Reichel <andreas@manticore-projects.com>

Author: manticore-projects

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

@@ -4661,7 +4661,7 @@ Expression LikeExpression(Expression leftExpression) #LikeExpression:
         | token = <K_MATCH_REGEXP>
     ) { result.setLikeKeyWord( LikeExpression.KeyWord.from(token.image)); }
     [ LOOKAHEAD(2) <K_BINARY> {result.setUseBinary(true); } ]
-    rightExpression=SimpleExpression()
+    rightExpression=Expression()
     [ LOOKAHEAD(2) <K_ESCAPE>
         (
             LOOKAHEAD(2)  token = <S_CHAR_LITERAL> { result.setEscape( new StringValue( token.image ) ); }
@@ -5270,6 +5270,8 @@ Expression PrimaryExpression() #PrimaryExpression:
 
         | retval=ConnectByRootOperator()
 
+        | retval=ConnectByPriorOperator()
+
         | LOOKAHEAD(2, {!interrupted}) <K_ALL> { retval = new AllValue(); }
 
         | LOOKAHEAD(2, {!interrupted}) retval=Column()

src/test/java/net/sf/jsqlparser/util/cnfexpression/CNFTest.java

@@ -67,8 +67,7 @@ public void test2() throws Exception {
                 "((NOT (NOT 1.1 >= 2.3 OR 3.3 < 4.5)) OR "
                         + "(S.A LIKE '\"%%%\"' AND S.B = '\"orz\"'))");
         Expression expected = CCJSqlParserUtil.parseCondExpression(
-                "(1.1 >= 2.3 OR S.A LIKE '\"%%%\"') AND (1.1 >= 2.3 OR S.B = '\"orz\"')"
-                        + " AND (NOT 3.3 < 4.5 OR S.A LIKE '\"%%%\"') AND (NOT 3.3 < 4.5 OR S.B = '\"orz\"')");
+                "(S.A LIKE '\"%%%\"' AND S.B = '\"orz\"' OR 1.1 >= 2.3) AND (S.A LIKE '\"%%%\"' AND S.B = '\"orz\"' OR NOT 3.3 < 4.5)");
         Expression result = CNFConverter.convertToCNF(expr);
         assertEquals(expected.toString(), result.toString());
     }
@@ -206,8 +205,7 @@ public void test5() throws Exception {
                 "NOT ((NOT (S.A > 3.5 AND S.B < 4)) OR "
                         + "(S.C LIKE '\"%%\"' OR S.D = {t '12:04:34'}))");
         Expression expected = CCJSqlParserUtil.parseCondExpression(
-                "S.A > 3.5 AND S.B < 4 AND NOT S.C LIKE '\"%%\"' "
-                        + "AND NOT S.D = {t '12:04:34'}");
+                "S.A > 3.5 AND S.B < 4 AND NOT S.C LIKE '\"%%\"' OR S.D = {t '12:04:34'}");
         Expression result = CNFConverter.convertToCNF(expr);
         assertEquals(expected.toString(), result.toString());
     }