Fix issue #446 (#447)

* Test current behavior of ExecuteDeParser

* Fix issue #446

Author: chrycheng

pom.xml

@@ -37,6 +37,12 @@
             <version>4.12</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <version>2.7.22</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <developers>

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

@@ -21,9 +21,11 @@
  */
 package net.sf.jsqlparser.util.deparser;
 
+import java.util.List;
+
+import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.ExpressionVisitor;
 import net.sf.jsqlparser.statement.execute.Execute;
-import net.sf.jsqlparser.statement.select.PlainSelect;
 
 public class ExecuteDeParser {
 
@@ -51,8 +53,14 @@ public void setBuffer(StringBuilder buffer) {
 
     public void deParse(Execute execute) {
         buffer.append("EXECUTE ").append(execute.getName());
-        buffer.append(" ").append(PlainSelect.
-                getStringList(execute.getExprList().getExpressions(), true, false));
+        List<Expression> expressions = execute.getExprList().getExpressions();
+        for (int i = 0; i < expressions.size(); i++) {
+            if (i > 0) {
+                buffer.append(",");
+            }
+            buffer.append(" ");
+            expressions.get(i).accept(expressionVisitor);
+        }
     }
 
     public ExpressionVisitor getExpressionVisitor() {

src/test/java/net/sf/jsqlparser/util/deparser/ExecuteDeParserTest.java

@@ -0,0 +1,74 @@
+package net.sf.jsqlparser.util.deparser;
+
+import static org.junit.Assert.assertTrue;
+import static org.mockito.BDDMockito.then;
+import static org.mockito.Mockito.mock;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mock;
+
+import net.sf.jsqlparser.expression.Expression;
+import net.sf.jsqlparser.expression.ExpressionVisitor;
+import net.sf.jsqlparser.expression.operators.relational.ExpressionList;
+import net.sf.jsqlparser.statement.execute.Execute;
+
+public class ExecuteDeParserTest {
+    private ExecuteDeParser executeDeParser;
+
+    @Mock
+    private ExpressionVisitor expressionVisitor;
+
+    private StringBuilder buffer;
+
+    @Before
+    public void setUp() {
+        buffer = new StringBuilder();
+        executeDeParser = new ExecuteDeParser(expressionVisitor, buffer);
+    }
+
+    @Test
+    public void shouldDeParseExecute() {
+        Execute execute = new Execute();
+        String name = "name";
+        ExpressionList exprList = new ExpressionList();
+        List<Expression> expressions = new ArrayList<Expression>();
+        Expression expression1 = mock(Expression.class);
+        Expression expression2 = mock(Expression.class);
+
+        execute.setName(name);
+        execute.setExprList(exprList);
+        exprList.setExpressions(expressions);
+        expressions.add(expression1);
+        expressions.add(expression2);
+
+        executeDeParser.deParse(execute);
+
+        String actual = buffer.toString();
+        assertTrue(actual.matches("EXECUTE " + name + " .*?, .*"));
+    }
+
+    @Test
+    public void shouldUseProvidedExpressionVisitorWhenDeParsingExecute() {
+        Execute execute = new Execute();
+        String name = "name";
+        ExpressionList exprList = new ExpressionList();
+        List<Expression> expressions = new ArrayList<Expression>();
+        Expression expression1 = mock(Expression.class);
+        Expression expression2 = mock(Expression.class);
+
+        execute.setName(name);
+        execute.setExprList(exprList);
+        exprList.setExpressions(expressions);
+        expressions.add(expression1);
+        expressions.add(expression2);
+
+        executeDeParser.deParse(execute);
+
+        then(expression1).should().accept(expressionVisitor);
+        then(expression2).should().accept(expressionVisitor);
+    }
+}