fixes #146

Author: wumpz

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

@@ -171,8 +171,11 @@ public void visit(GreaterThanEquals expr) {
 
     @Override
     public void visit(InExpression expr) {
-        expr.getLeftExpression().accept(this);
-        expr.getLeftItemsList().accept(this);
+        if (expr.getLeftExpression() != null) {
+            expr.getLeftExpression().accept(this);
+        } else if (expr.getLeftItemsList() != null) {
+            expr.getLeftItemsList().accept(this);
+        }
         expr.getRightItemsList().accept(this);
     }
 
@@ -212,8 +215,8 @@ public void visit(SubSelect subSelect) {
             for (WithItem item : subSelect.getWithItemsList()) {
                 item.accept(selectVisitor);
             }
+            subSelect.getSelectBody().accept(selectVisitor);
         }
-        subSelect.getSelectBody().accept(selectVisitor);
         if (subSelect.getPivot() != null) {
             subSelect.getPivot().accept(this);
         }
@@ -395,15 +398,17 @@ public void visit(Pivot pivot) {
         for (Column col : pivot.getForColumns()) {
             col.accept(this);
         }
-        if (pivot.getSingleInItems()!=null)
+        if (pivot.getSingleInItems() != null) {
             for (SelectExpressionItem item : pivot.getSingleInItems()) {
                 item.accept(this);
             }
-        
-        if (pivot.getMultiInItems()!=null) 
+        }
+
+        if (pivot.getMultiInItems() != null) {
             for (ExpressionListItem item : pivot.getMultiInItems()) {
                 item.getExpressionList().accept(this);
             }
+        }
     }
 
     @Override
@@ -414,18 +419,21 @@ public void visit(PivotXml pivot) {
         for (Column col : pivot.getForColumns()) {
             col.accept(this);
         }
-        if (pivot.getInSelect()!=null)
-            pivot.getInSelect().accept(selectVisitor);
+        if (pivot.getInSelect() != null) {
+            if (selectVisitor != null) {
+                pivot.getInSelect().accept(selectVisitor);
+            }
+        }
     }
 
     @Override
     public void visit(AllColumns allColumns) {
-        
+
     }
 
     @Override
     public void visit(AllTableColumns allTableColumns) {
-        
+
     }
 
     @Override

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

@@ -0,0 +1,105 @@
+/*
+ * Copyright (C) 2015 JSQLParser.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package net.sf.jsqlparser.expression;
+
+import java.util.ArrayList;
+import java.util.List;
+import net.sf.jsqlparser.JSQLParserException;
+import net.sf.jsqlparser.expression.operators.relational.InExpression;
+import net.sf.jsqlparser.expression.operators.relational.ItemsList;
+import net.sf.jsqlparser.parser.CCJSqlParserUtil;
+import net.sf.jsqlparser.statement.select.PlainSelect;
+import net.sf.jsqlparser.statement.select.Select;
+import org.junit.After;
+import org.junit.AfterClass;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+/**
+ *
+ * @author tw
+ */
+public class ExpressionVisitorAdapterTest {
+    
+    public ExpressionVisitorAdapterTest() {
+    }
+    
+    @BeforeClass
+    public static void setUpClass() {
+    }
+    
+    @AfterClass
+    public static void tearDownClass() {
+    }
+    
+    @Before
+    public void setUp() {
+    }
+    
+    @After
+    public void tearDown() {
+    }
+
+    @Test
+    public void testInExpressionProblem() throws JSQLParserException {
+        final List exprList = new ArrayList();
+        Select select = (Select) CCJSqlParserUtil.parse( "select * from foo where x in (?,?,?)" );
+        PlainSelect plainSelect = (PlainSelect) select.getSelectBody();
+        Expression where = plainSelect.getWhere();
+        where.accept( new ExpressionVisitorAdapter() {
+
+            @Override
+            public void visit(InExpression expr) {
+                super.visit(expr);
+                exprList.add(expr.getLeftExpression());
+                exprList.add(expr.getLeftItemsList());
+                exprList.add(expr.getRightItemsList());
+            }
+        });
+        
+        assertTrue(exprList.get(0) instanceof Expression);
+        assertNull(exprList.get(1));
+        assertTrue(exprList.get(2) instanceof ItemsList);
+    }
+    
+    @Test
+    public void testInExpression() throws JSQLParserException {
+        final List exprList = new ArrayList();
+        Select select = (Select) CCJSqlParserUtil.parse( "select * from foo where (a,b) in (select a,b from foo2)" );
+        PlainSelect plainSelect = (PlainSelect) select.getSelectBody();
+        Expression where = plainSelect.getWhere();
+        where.accept(new ExpressionVisitorAdapter() {
+
+            @Override
+            public void visit(InExpression expr) {
+                super.visit(expr);
+                exprList.add(expr.getLeftExpression());
+                exprList.add(expr.getLeftItemsList());
+                exprList.add(expr.getRightItemsList());
+            }
+        });
+        
+        assertNull(exprList.get(0));
+        assertTrue(exprList.get(1) instanceof ItemsList);
+        assertTrue(exprList.get(2) instanceof ItemsList);
+    }
+}