started fixing #923

Author: wumpz

README.md

@@ -72,6 +72,7 @@ Also I would like to know about needed examples or documentation stuff.
 * allow datatype **binary** for column definitions
 * support for **ALTER TABLE COLUMN DROP NOT NULL**
 * allow **order** as column name
+* support for table function in **IN** expression
 
 ## Extensions of JSqlParser releases
 

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

@@ -170,7 +170,11 @@ public void visit(InExpression expr) {
         } else if (expr.getLeftItemsList() != null) {
             expr.getLeftItemsList().accept(this);
         }
-        expr.getRightItemsList().accept(this);
+        if (expr.getRightExpression() != null) {
+            expr.getRightExpression().accept(this);
+        } else {
+            expr.getRightItemsList().accept(this);
+        }
     }
 
     @Override

src/main/java/net/sf/jsqlparser/expression/operators/relational/InExpression.java

@@ -19,6 +19,7 @@ public class InExpression extends ASTNodeAccessImpl implements Expression, Suppo
     private ItemsList leftItemsList;
     private ItemsList rightItemsList;
     private boolean not = false;
+    private Expression rightExpression;
 
     private int oldOracleJoinSyntax = NO_ORACLE_JOIN;
 
@@ -75,6 +76,14 @@ public void setLeftItemsList(ItemsList leftItemsList) {
         this.leftItemsList = leftItemsList;
     }
 
+    public Expression getRightExpression() {
+        return rightExpression;
+    }
+
+    public void setRightExpression(Expression rightExpression) {
+        this.rightExpression = rightExpression;
+    }
+
     @Override
     public void accept(ExpressionVisitor expressionVisitor) {
         expressionVisitor.visit(this);
@@ -86,7 +95,8 @@ private String getLeftExpressionString() {
 
     @Override
     public String toString() {
-        return (leftExpression == null ? leftItemsList : getLeftExpressionString()) + " " + (not ? "NOT " : "") + "IN " + rightItemsList + "";
+        return (leftExpression == null ? leftItemsList : getLeftExpressionString()) + " " 
+                + (not ? "NOT " : "") + "IN " + (rightExpression == null ? rightItemsList : rightExpression) + "";
     }
 
     @Override

src/main/java/net/sf/jsqlparser/util/deparser/ExpressionDeParser.java

@@ -201,7 +201,11 @@ public void visit(InExpression inExpression) {
         }
         buffer.append(" IN ");
 
-        inExpression.getRightItemsList().accept(this);
+        if (inExpression.getRightExpression() != null) {
+            inExpression.getRightExpression().accept(this);
+        } else {
+            inExpression.getRightItemsList().accept(this);
+        }
     }
 
     @Override

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

@@ -2478,6 +2478,7 @@ Expression InExpression() #InExpression :
     ItemsList leftItemsList = null;
     ItemsList rightItemsList = null;
     Expression leftExpression = null;
+    Expression rightExpression = null;
 }
 {
     ( LOOKAHEAD(3) "(" (
@@ -2491,9 +2492,12 @@ Expression InExpression() #InExpression :
         leftExpression=SimpleExpression() { result.setLeftExpression(leftExpression); }
         [ "(" "+" ")" { result.setOldOracleJoinSyntax(EqualsTo.ORACLE_JOIN_RIGHT); } ]
     )
-    [<K_NOT> { result.setNot(true); } ] <K_IN> "(" (LOOKAHEAD(3) rightItemsList=SubSelect() | rightItemsList=SimpleExpressionList() ) ")"
+    [<K_NOT> { result.setNot(true); } ] <K_IN> 
+        ( rightExpression = Function() 
+            | "(" (LOOKAHEAD(3) rightItemsList=SubSelect() | rightItemsList=SimpleExpressionList() ) ")")
     {
         result.setRightItemsList(rightItemsList);
+        result.setRightExpression(rightExpression);
         linkAST(result,jjtThis);
         return result;
     }

src/test/java/net/sf/jsqlparser/statement/select/SelectTest.java

@@ -3998,8 +3998,44 @@ public void testCaseWithComplexWhenExpression() throws JSQLParserException {
     }
 
     @Test
-    public void testSessionKeywordIssue932() throws JSQLParserException {
+    public void testOrderKeywordIssue932() throws JSQLParserException {
         assertSqlCanBeParsedAndDeparsed("SELECT order FROM tmp3");
         assertSqlCanBeParsedAndDeparsed("SELECT tmp3.order FROM tmp3");
     }
+    
+    @Test
+    public void testTableFunctionInExprIssue923() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed("SELECT * FROM mytable WHERE func(a) IN func(b)");
+    }
+    
+    @Test
+    public void testTableFunctionInExprIssue923_2() throws JSQLParserException, IOException {
+        String stmt = IOUtils.toString(
+                SelectTest.class.getResourceAsStream("large-sql-issue-923.txt"), "UTF-8");
+        assertSqlCanBeParsedAndDeparsed(stmt, true);
+    }
+    
+    @Test
+    public void testTableFunctionInExprIssue923_3() throws JSQLParserException, IOException {
+        String stmt = IOUtils.toString(
+                SelectTest.class.getResourceAsStream("large-sql-issue-923-2.txt"), "UTF-8");
+        assertSqlCanBeParsedAndDeparsed(stmt, true);
+    }
+    
+    @Test
+    public void testTableFunctionInExprIssue923_4() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed("SELECT MAX(CASE WHEN DUPLICATE_CLAIM_NUMBER IN  '1' THEN COALESCE(CLAIM_STATUS2,CLAIM_STATUS1) ELSE NULL END) AS DUPE_1_KINAL_CLAIM_STATUS");
+    }
+    
+    @Test
+    public void testTableFunctionInExprIssue923_5() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed("SELECT CASE WHEN DUPLICATE_CLAIM_NUMBER IN  '1' THEN COALESCE(CLAIM_STATUS2,CLAIM_STATUS1) ELSE NULL END");
+    }
+    
+    @Test
+    public void testTableFunctionInExprIssue923_6() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed("SELECT * FROM mytable WHERE func(a) IN '1'");
+    }
+    
+    
 }