fix: precedence of the InExpression

- fixes #2244

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

Author: manticore-projects

build.gradle

@@ -104,14 +104,14 @@ dependencies {
     testImplementation 'org.junit.jupiter:junit-jupiter-params:5.11.4'
 
     // https://mvnrepository.com/artifact/org.mockito/mockito-junit-jupiter
-    testImplementation 'org.mockito:mockito-junit-jupiter:+'
+    testImplementation 'org.mockito:mockito-junit-jupiter:5.18.0'
 
     // Performance Benchmark
     testImplementation 'org.openjdk.jmh:jmh-core:+'
     testImplementation 'org.openjdk.jmh:jmh-generator-annprocess:+'
 
     // Java Doc in XML Format
-    xmlDoclet 'com.manticore-projects.tools:xml-doclet:+'
+    xmlDoclet 'com.manticore-projects.tools:xml-doclet:2.+'
 
     // enforce latest version of JavaCC
     testImplementation 'net.java.dev.javacc:javacc:+'

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

@@ -4366,13 +4366,9 @@ WithIsolation WithIsolation():
     JdbcParameter jdbc;
 }
 {
-    (
-            //with (ur | cs | rs | rr)
-             <K_WITH>
-             token=<K_ISOLATION> { withIsolation.setIsolation(token.image); }
-
-        )
-    {
+    <K_WITH>
+    token=<K_ISOLATION>
+    { withIsolation.setIsolation(token.image);
         return withIsolation;
     }
 }
@@ -4434,10 +4430,11 @@ Skip Skip():
 {
     <K_SKIP>
     (
-         token=<S_LONG>                      { skip.setRowCount(Long.parseLong(token.image)); }
-                | token=<S_IDENTIFIER>              { skip.setVariable(token.image); }
-                | jdbc = JdbcParameter() { skip.setJdbcParameter(jdbc); }
-                   /* "?" { skip.setJdbcParameter(new JdbcParameter(++jdbcParameterIndex, false)); } [ LOOKAHEAD(2) token = <S_LONG> { skip.getJdbcParameter().setUseFixedIndex(true); skip.getJdbcParameter().setIndex(Integer.valueOf(token.image)); } ] */
+        token=<S_LONG> { skip.setRowCount(Long.parseLong(token.image)); }
+        |
+        token=<S_IDENTIFIER> { skip.setVariable(token.image); }
+        |
+        jdbc = JdbcParameter() { skip.setJdbcParameter(jdbc); }
     )
     {
         return skip;
@@ -4733,7 +4730,7 @@ Expression InExpression(Expression leftExpression) #InExpression :
     (
         LOOKAHEAD(2) token=<S_CHAR_LITERAL> {  rightExpression = new StringValue(token.image); }
         |
-        rightExpression = Expression()
+        rightExpression = PrimaryExpression()
     )
     {
         InExpression inExpression =  new InExpression(leftExpression, rightExpression)

src/test/java/net/sf/jsqlparser/expression/operators/relational/InExpressionTest.java

@@ -10,7 +10,10 @@
 package net.sf.jsqlparser.expression.operators.relational;
 
 import net.sf.jsqlparser.JSQLParserException;
+import net.sf.jsqlparser.expression.operators.conditional.OrExpression;
+import net.sf.jsqlparser.statement.select.PlainSelect;
 import net.sf.jsqlparser.test.TestUtils;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.*;
@@ -30,4 +33,12 @@ void testOracleInWithBrackets() throws JSQLParserException {
         TestUtils.assertSqlCanBeParsedAndDeparsed(sqlStr, true);
     }
 
+    @Test
+    void testPrecedenceIssue2244() throws JSQLParserException {
+        String sqlStr = "select * from `T_DEMO` where a in (1,3,2) or b = 2";
+        PlainSelect select = (PlainSelect) TestUtils.assertSqlCanBeParsedAndDeparsed(sqlStr, true);
+
+        Assertions.assertInstanceOf(OrExpression.class, select.getWhere());
+    }
+
 }