multi value IN expression introduced (a,b,c) in ...

fixes #30

Author: wumpz

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

@@ -27,27 +27,28 @@
 public class InExpression implements Expression {
 
 	private Expression leftExpression;
-	private ItemsList itemsList;
+	private ItemsList leftItemsList;
+	private ItemsList rightItemsList;
 	private boolean not = false;
 
 	public InExpression() {
 	}
 
 	public InExpression(Expression leftExpression, ItemsList itemsList) {
 		setLeftExpression(leftExpression);
-		setItemsList(itemsList);
+		setRightItemsList(itemsList);
 	}
 
-	public ItemsList getItemsList() {
-		return itemsList;
+	public ItemsList getRightItemsList() {
+		return rightItemsList;
 	}
 
 	public Expression getLeftExpression() {
 		return leftExpression;
 	}
 
-	public void setItemsList(ItemsList list) {
-		itemsList = list;
+	public void setRightItemsList(ItemsList list) {
+		rightItemsList = list;
 	}
 
 	public void setLeftExpression(Expression expression) {
@@ -62,13 +63,21 @@ public void setNot(boolean b) {
 		not = b;
 	}
 
+	public ItemsList getLeftItemsList() {
+		return leftItemsList;
+	}
+
+	public void setLeftItemsList(ItemsList leftItemsList) {
+		this.leftItemsList = leftItemsList;
+	}
+
 	@Override
 	public void accept(ExpressionVisitor expressionVisitor) {
 		expressionVisitor.visit(this);
 	}
 
 	@Override
 	public String toString() {
-		return leftExpression + " " + ((not) ? "NOT " : "") + "IN " + itemsList + "";
+		return (leftExpression == null ? leftItemsList : leftExpression) + " " + ((not) ? "NOT " : "") + "IN " + rightItemsList + "";
 	}
 }

src/main/java/net/sf/jsqlparser/util/TablesNamesFinder.java

@@ -292,7 +292,7 @@ public void visit(GreaterThanEquals greaterThanEquals) {
 	@Override
 	public void visit(InExpression inExpression) {
 		inExpression.getLeftExpression().accept(this);
-		inExpression.getItemsList().accept(this);
+		inExpression.getRightItemsList().accept(this);
 	}
 
 	@Override

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

@@ -180,14 +180,17 @@ public void visit(GreaterThanEquals greaterThanEquals) {
 
 	@Override
 	public void visit(InExpression inExpression) {
-
-		inExpression.getLeftExpression().accept(this);
+		if (inExpression.getLeftExpression() == null) {
+			inExpression.getLeftItemsList().accept(this);
+		} else {
+			inExpression.getLeftExpression().accept(this);
+		}
 		if (inExpression.isNot()) {
 			buffer.append(" NOT");
 		}
 		buffer.append(" IN ");
 
-		inExpression.getItemsList().accept(this);
+		inExpression.getRightItemsList().accept(this);
 	}
 
 	@Override

src/main/javacc/net/sf/jsqlparser/parser/JSqlParserCC.jj

@@ -1185,15 +1185,18 @@ Expression SQLCondition():
 Expression InExpression() :
 {
 	InExpression result = new InExpression();
-	ItemsList itemsList = null;
+	ItemsList leftItemsList = null;
+	ItemsList rightItemsList = null;
 	Expression leftExpression = null;
+	
 }
 {
-	leftExpression=SimpleExpression()
-    [<K_NOT> { result.setNot(true); } ] <K_IN> "(" (LOOKAHEAD(SubSelect()) itemsList=SubSelect() | itemsList=SimpleExpressionList() ) ")"
+	( LOOKAHEAD(3) leftExpression=SimpleExpression() { result.setLeftExpression(leftExpression); }
+		| "(" leftItemsList = SimpleExpressionList() { result.setLeftItemsList(leftItemsList); } ")"
+	)	
+    [<K_NOT> { result.setNot(true); } ] <K_IN> "(" (LOOKAHEAD(SubSelect()) rightItemsList=SubSelect() | rightItemsList=SimpleExpressionList() ) ")"
 	{ 
-		result.setLeftExpression(leftExpression);
-		result.setItemsList(itemsList);
+		result.setRightItemsList(rightItemsList);
 		return result; 
 	}
 }

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

@@ -984,4 +984,9 @@ public void testInterval2() throws JSQLParserException {
 
 		assertEquals("'45 MINUTE'", iexpr.getParameter());
 	}
+	
+	public void testMultiValueIn() throws JSQLParserException {
+		String stmt = "SELECT * FROM mytable WHERE (a, b, c) IN (SELECT a, b, c FROM mytable2)";
+		assertSqlCanBeParsedAndDeparsed(stmt);
+	}
 }