JSQLPARSER-584: adds support for MySQL (a,b,...)OP(c,d,...) expression (#585)

* JSQLPARSER-584: adds support for MySQL (a,b,...)OP(c,d,...) expression

* JSQLPARSER-584: adds some tests and rename MySQLValueListExpression to ValueListExpression

Author: adriil

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

@@ -167,6 +167,8 @@ public interface ExpressionVisitor {
     void visit(KeepExpression aexpr);
 
     void visit(MySQLGroupConcat groupConcat);
+    
+    void visit(ValueListExpression valueList);
 
     void visit(RowConstructor rowConstructor);
 

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

@@ -416,6 +416,13 @@ public void visit(MySQLGroupConcat groupConcat) {
             }
         }
     }
+    
+    @Override
+    public void visit(ValueListExpression valueListExpression) {
+        for (Expression expr : valueListExpression.getExpressionList().getExpressions()) {
+            expr.accept(this);
+        }
+    }
 
     @Override
     public void visit(Pivot pivot) {

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

@@ -0,0 +1,60 @@
+/*
+ * #%L
+ * JSQLParser library
+ * %%
+ * Copyright (C) 2004 - 2018 JSQLParser
+ * %%
+ * This program 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 program 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 General Lesser Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Lesser Public
+ * License along with this program.  If not, see
+ * <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ * #L%
+ */
+/**
+ * 
+ */
+package net.sf.jsqlparser.expression;
+
+import net.sf.jsqlparser.expression.operators.relational.ExpressionList;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
+
+/**
+ * Models a list of expressions usable as condition.<br>
+ * This allows for instance the following expression : 
+ * <code>"[WHERE] (a, b) [OPERATOR] (c, d)"</code>
+ * where "(a, b)" and "(c, d)" are instances of this class.
+ * 
+ * @author adriil
+ */
+public class ValueListExpression extends ASTNodeAccessImpl implements Expression {
+
+    private ExpressionList expressionList;
+    
+    public ExpressionList getExpressionList() {
+        return expressionList;
+    }
+
+    public void setExpressionList(ExpressionList expressionList) {
+        this.expressionList = expressionList;
+    }
+
+    @Override
+    public void accept(ExpressionVisitor expressionVisitor) {
+        expressionVisitor.visit(this);
+    }
+    
+    @Override
+    public String toString() {
+        return expressionList.toString();
+    }
+
+}

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

@@ -45,6 +45,7 @@
 import net.sf.jsqlparser.expression.KeepExpression;
 import net.sf.jsqlparser.expression.LongValue;
 import net.sf.jsqlparser.expression.MySQLGroupConcat;
+import net.sf.jsqlparser.expression.ValueListExpression;
 import net.sf.jsqlparser.expression.NotExpression;
 import net.sf.jsqlparser.expression.NullValue;
 import net.sf.jsqlparser.expression.NumericBind;
@@ -608,6 +609,11 @@ public void visit(KeepExpression aexpr) {
     @Override
     public void visit(MySQLGroupConcat groupConcat) {
     }
+    
+    @Override
+    public void visit(ValueListExpression valueList) {
+        valueList.getExpressionList().accept(this);
+    }
 
     @Override
     public void visit(Delete delete) {

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

@@ -45,6 +45,7 @@
 import net.sf.jsqlparser.expression.KeepExpression;
 import net.sf.jsqlparser.expression.LongValue;
 import net.sf.jsqlparser.expression.MySQLGroupConcat;
+import net.sf.jsqlparser.expression.ValueListExpression;
 import net.sf.jsqlparser.expression.NotExpression;
 import net.sf.jsqlparser.expression.NullValue;
 import net.sf.jsqlparser.expression.NumericBind;
@@ -726,6 +727,11 @@ public void visit(KeepExpression aexpr) {
     public void visit(MySQLGroupConcat groupConcat) {
         buffer.append(groupConcat.toString());
     }
+    
+    @Override
+    public void visit(ValueListExpression valueList) {
+        buffer.append(valueList.toString());
+    }
 
     @Override
     public void visit(RowConstructor rowConstructor) {

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

@@ -2243,6 +2243,7 @@ Expression ComparisonItem() :
   (
     retval=AllComparisonExpression()
     | LOOKAHEAD(3) retval=AnyComparisonExpression()
+    | LOOKAHEAD(ValueListExpression()) retval=ValueListExpression()
     | LOOKAHEAD(3) retval=SimpleExpression()
     | retval=RowConstructor()
   )
@@ -2860,6 +2861,19 @@ MySQLGroupConcat MySQLGroupConcat():{
     }
 }
 
+ValueListExpression ValueListExpression():
+{
+    ValueListExpression retval = new ValueListExpression();
+    ExpressionList expressionList = null;
+}
+{
+    "(" expressionList = SimpleExpressionListAtLeastTwoItems() ")"
+    {
+        retval.setExpressionList(expressionList);
+        return retval;
+    }
+}
+
 TableFunction TableFunction():
 {
     Alias alias = null;

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

@@ -2759,4 +2759,9 @@ public void testIssue266KeywordTop() throws JSQLParserException {
         assertSqlCanBeParsedAndDeparsed("SELECT @top");
         assertSqlCanBeParsedAndDeparsed("SELECT @TOP");
     }
+    
+    public void testIssue584MySQLValueListExpression() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed("SELECT a, b FROM T WHERE (T.a, T.b) = (c, d)");
+        assertSqlCanBeParsedAndDeparsed("SELECT a FROM T WHERE (T.a) = (SELECT b FROM T, c, d)");
+    }
 }

src/test/java/net/sf/jsqlparser/util/TablesNamesFinderTest.java

@@ -484,6 +484,7 @@ public void testExpressionIssue515() throws JSQLParserException {
         assertTrue(tableList.contains("SOME_TABLE"));
     }
 
+    @Test
     public void testSelectHavingSubquery() throws Exception {
         String sql = "SELECT * FROM TABLE1 GROUP BY COL1 HAVING SUM(COL2) > (SELECT COUNT(*) FROM TABLE2)";
         net.sf.jsqlparser.statement.Statement statement = pm.parse(new StringReader(sql));
@@ -495,4 +496,14 @@ public void testSelectHavingSubquery() throws Exception {
         assertTrue(tableList.contains("TABLE1"));
         assertTrue(tableList.contains("TABLE2"));
     }
+    
+    @Test
+    public void testMySQLValueListExpression() throws JSQLParserException {
+        String sql = "SELECT * FROM TABLE1 WHERE (a, b) = (c, d)";
+        TablesNamesFinder finder = new TablesNamesFinder();
+        List<String> tableList = finder.getTableList(CCJSqlParserUtil.parse(sql));
+        assertEquals(1, tableList.size());
+        assertTrue(tableList.contains("TABLE1"));
+    }
+    
 }