fixes #484

Author: wumpz

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

@@ -32,6 +32,7 @@
  */
 public class Execute implements Statement {
 
+    private EXEC_TYPE execType = EXEC_TYPE.EXECUTE;
     private String name;
     private ExpressionList exprList;
 
@@ -51,15 +52,29 @@ public void setExprList(ExpressionList exprList) {
         this.exprList = exprList;
     }
 
+    public EXEC_TYPE getExecType() {
+        return execType;
+    }
+
+    public void setExecType(EXEC_TYPE execType) {
+        this.execType = execType;
+    }
+
     @Override
     public void accept(StatementVisitor statementVisitor) {
         statementVisitor.visit(this);
     }
 
     @Override
     public String toString() {
-        return "EXECUTE " + name + " " + PlainSelect.
+        return execType.name() + " " + name + " " + PlainSelect.
                 getStringList(exprList.getExpressions(), true, false);
     }
+    
+    public static enum EXEC_TYPE {
+        EXECUTE,
+        EXEC,
+        CALL
+    }
 
 }

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

@@ -52,7 +52,7 @@ public void setBuffer(StringBuilder buffer) {
     }
 
     public void deParse(Execute execute) {
-        buffer.append("EXECUTE ").append(execute.getName());
+        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) {

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

@@ -285,6 +285,7 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */
 |   <K_DISABLE : "DISABLE">
 |   <K_USE : "USE">
 |   <K_FORCE : "FORCE">
+|   <K_CALL : "CALL">
 }
 
 TOKEN : /* Stuff */
@@ -2704,7 +2705,9 @@ Execute Execute(): {
     Execute execute = new Execute();
 }
 {
-    (<K_EXEC> | <K_EXECUTE>)
+    (<K_EXEC> { execute.setExecType(Execute.EXEC_TYPE.EXEC); } 
+        | <K_EXECUTE> { execute.setExecType(Execute.EXEC_TYPE.EXECUTE); } 
+        | <K_CALL> { execute.setExecType(Execute.EXEC_TYPE.CALL); } )
 
     funcName=RelObjectName() { execute.setName(funcName); }
 

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

@@ -57,7 +57,17 @@ public void tearDown() {
      * @throws net.sf.jsqlparser.JSQLParserException
      */
     @Test
-    public void testAccept() throws JSQLParserException {
+    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'");
+    }
 }