fixes #684

Author: wumpz

src/main/java/net/sf/jsqlparser/statement/execute/Execute.java

@@ -21,6 +21,7 @@
  */
 package net.sf.jsqlparser.statement.execute;
 
+import java.util.List;
 import net.sf.jsqlparser.expression.operators.relational.ExpressionList;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.StatementVisitor;
@@ -44,6 +45,16 @@ public void setName(String name) {
         this.name = name;
     }
 
+    public void setName(List<String> names) {
+        for (String item : names) {
+            if (this.name != null) {
+                this.name = this.name + "." + item;
+            } else {
+                this.name = item;
+            }
+        }
+    }
+
     public ExpressionList getExprList() {
         return exprList;
     }
@@ -67,10 +78,11 @@ public void accept(StatementVisitor statementVisitor) {
 
     @Override
     public String toString() {
-        return execType.name() + " " + name + " " + PlainSelect.
-                getStringList(exprList.getExpressions(), true, false);
+        return execType.name() + " " + name
+                + (exprList != null && exprList.getExpressions() != null ? " "
+                + PlainSelect.getStringList(exprList.getExpressions(), true, false) : "");
     }
-    
+
     public static enum EXEC_TYPE {
         EXECUTE,
         EXEC,

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

@@ -22,7 +22,6 @@
 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;
@@ -53,13 +52,15 @@ public void setBuffer(StringBuilder buffer) {
 
     public void deParse(Execute execute) {
         buffer.append(execute.getExecType().name()).append(" ").append(execute.getName());
-        List<Expression> expressions = execute.getExprList().getExpressions();
-        for (int i = 0; i < expressions.size(); i++) {
-            if (i > 0) {
-                buffer.append(",");
+        if (execute.getExprList() != null) {
+            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);
             }
-            buffer.append(" ");
-            expressions.get(i).accept(expressionVisitor);
         }
     }
 

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

@@ -954,17 +954,29 @@ MergeInsert MergeInsertClause() : {
     }
 }
 
+List<String> RelObjectNameList() : {
+    String token = null;
+    List<String> data = new ArrayList<String>();
+} {
+    token = RelObjectName() { data.add(token); }
+    ( LOOKAHEAD (2) "." ("." { data.add(null); })* token = RelObjectName() { data.add(token); } ) *
+
+    { return data; }
+}
+
 // See: http://technet.microsoft.com/en-us/library/ms187879%28v=sql.105%29.aspx
 
 Column Column() #Column :
 {
     //String databaseName = null, schemaName = null, tableName = null, columnName = null;
-    String token = null;
+    //String token = null;
     List<String> data = new ArrayList<String>();
 }
 {
-    token = RelObjectName() { data.add(token); }
+    /* token = RelObjectName() { data.add(token); }
     ( LOOKAHEAD (2) "." ("." { data.add(null); })* token = RelObjectName() { data.add(token); } ) *
+    */
+    data = RelObjectNameList()
 
 	/*columnName = RelObjectName()
     ( "." [LOOKAHEAD(2) token = RelObjectName()] { tableName = columnName; columnName = token; token = null;} 
@@ -2882,7 +2894,7 @@ RowConstructor RowConstructor(): {
 }
 
 Execute Execute(): {
-    String funcName = null;
+    List<String> funcName;
     ExpressionList expressionList = null;
     Execute execute = new Execute();
 }
@@ -2891,7 +2903,7 @@ Execute Execute(): {
         | <K_EXECUTE> { execute.setExecType(Execute.EXEC_TYPE.EXECUTE); } 
         | <K_CALL> { execute.setExecType(Execute.EXEC_TYPE.CALL); } )
 
-    funcName=RelObjectName() { execute.setName(funcName); }
+    funcName=RelObjectNameList() { execute.setName(funcName); }
 
     [ expressionList=SimpleExpressionList() ]
 

src/test/java/net/sf/jsqlparser/statement/execute/ExecuteTest.java

@@ -19,12 +19,12 @@
 package net.sf.jsqlparser.statement.execute;
 
 import net.sf.jsqlparser.JSQLParserException;
+import static net.sf.jsqlparser.test.TestUtils.*;
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import static net.sf.jsqlparser.test.TestUtils.*;
 
 /**
  *
@@ -60,14 +60,19 @@ public void tearDown() {
     public void testAcceptExecute() throws JSQLParserException {
         assertSqlCanBeParsedAndDeparsed("EXECUTE myproc 'a', 2, 'b'");
     }
-    
+
     @Test
     public void testAcceptExec() throws JSQLParserException {
         assertSqlCanBeParsedAndDeparsed("EXEC myproc 'a', 2, 'b'");
     }
-    
+
     @Test
     public void testAcceptCall() throws JSQLParserException {
         assertSqlCanBeParsedAndDeparsed("CALL myproc 'a', 2, 'b'");
     }
+
+    @Test
+    public void testCallWithMultiname() throws JSQLParserException {
+        assertSqlCanBeParsedAndDeparsed("CALL BAR.FOO");
+    }
 }