Merge lp:~mmcm/akiban-sql-parser/dynamic-statements into lp:~akiban-technologies/akiban-sql-parser/trunk

[Mike McMahon]

Add new prepared statement and cursor statements.

These are compatible with a subset of Postgres.

DECLARE <name> CURSOR FOR <statement>
FETCH [NEXT | ALL | <count>] [FROM] <name>
CLOSE <name>

PREPARE <name> AS <statement>
EXECUTE <name>[(<param>,...)]
DEALLOCATE <name>

Although this is compatible with the current server, the version number is increased in anticipation of a server branch that will depend on it.

[Jack Orenstein (jack-akiban)]

Why are PREPARE, EXECUTE and DEALLOCATE needed?

review: Needs Information

[Mike McMahon (mmcm)]

It's the whole family of statements corresponding to network protocol level capabilities. There was a request for DEALLOCATE, since some ORMs use it. The request was only to ignore it, but there seemed no real reason not to support it correctly.

=== modified file 'pom.xml'
--- pom.xml	2012-11-30 15:38:33 +0000
+++ pom.xml	2012-12-14 23:54:20 +0000
@@ -4,7 +4,7 @@
     <groupId>com.akiban</groupId>
     <artifactId>akiban-sql-parser</artifactId>
     <packaging>jar</packaging>
-    <version>1.0.12-SNAPSHOT</version>
+    <version>1.0.13-SNAPSHOT</version>
     <name>akiban-sql-parser</name>
     <url>http://maven.apache.org</url>
     <properties>

=== added file 'src/main/java/com/akiban/sql/parser/CloseStatementNode.java'
--- src/main/java/com/akiban/sql/parser/CloseStatementNode.java	1970-01-01 00:00:00 +0000
+++ src/main/java/com/akiban/sql/parser/CloseStatementNode.java	2012-12-14 23:54:20 +0000
@@ -0,0 +1,70 @@
+/**
+ * Copyright © 2012 Akiban Technologies, Inc.  All rights
+ * reserved.
+ *
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * This program may also be available under different license terms.
+ * For more information, see www.akiban.com or contact
+ * [e-mail].
+ *
+ * Contributors:
+ * Akiban Technologies, Inc.
+ */
+
+package com.akiban.sql.parser;
+
+import com.akiban.sql.StandardException;
+
+/**
+ * CLOSE an open cursor.
+ */
+
+public class CloseStatementNode extends StatementNode
+{
+    private String name;
+
+    /**
+     * Initializer for an CloseStatementNode
+     *
+     * @param name The name of the cursor
+     */
+
+    public void init(Object name) {
+        this.name = (String)name;
+    }
+    
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * Fill this node with a deep copy of the given node.
+     */
+    public void copyFrom(QueryTreeNode node) throws StandardException {
+        super.copyFrom(node);
+        
+        CloseStatementNode other = (CloseStatementNode)node;
+        this.name = other.name;
+    }
+
+    /**
+     * Convert this object to a String.  See comments in QueryTreeNode.java
+     * for how this should be done for tree printing.
+     *
+     * @return This object as a String
+     */
+
+    public String toString() {
+        return "name: " + name + "\n" +
+            super.toString();
+    }
+
+    public String statementToString() {
+        return "CLOSE";
+    }
+
+}

=== added file 'src/main/java/com/akiban/sql/parser/DeallocateStatementNode.java'
--- src/main/java/com/akiban/sql/parser/DeallocateStatementNode.java	1970-01-01 00:00:00 +0000
+++ src/main/java/com/akiban/sql/parser/DeallocateStatementNode.java	2012-12-14 23:54:20 +0000
@@ -0,0 +1,70 @@
+/**
+ * Copyright © 2012 Akiban Technologies, Inc.  All rights
+ * reserved.
+ *
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * This program may also be available under different license terms.
+ * For more information, see www.akiban.com or contact
+ * [e-mail].
+ *
+ * Contributors:
+ * Akiban Technologies, Inc.
+ */
+
+package com.akiban.sql.parser;
+
+import com.akiban.sql.StandardException;
+
+/**
+ * DEALLOCATE a prepared statement.
+ */
+
+public class DeallocateStatementNode extends StatementNode
+{
+    private String name;
+
+    /**
+     * Initializer for an DeallocateStatementNode
+     *
+     * @param name The name of the cursor
+     */
+
+    public void init(Object name) {
+        this.name = (String)name;
+    }
+    
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * Fill this node with a deep copy of the given node.
+     */
+    public void copyFrom(QueryTreeNode node) throws StandardException {
+        super.copyFrom(node);
+        
+        DeallocateStatementNode other = (DeallocateStatementNode)node;
+        this.name = other.name;
+    }
+
+    /**
+     * Convert this object to a String.  See comments in QueryTreeNode.java
+     * for how this should be done for tree printing.
+     *
+     * @return This object as a String
+     */
+
+    public String toString() {
+        return "name: " + name + "\n" +
+            super.toString();
+    }
+
+    public String statementToString() {
+        return "DEALLOCATE";
+    }
+
+}

=== added file 'src/main/java/com/akiban/sql/parser/DeclareStatementNode.java'
--- src/main/java/com/akiban/sql/parser/DeclareStatementNode.java	1970-01-01 00:00:00 +0000
+++ src/main/java/com/akiban/sql/parser/DeclareStatementNode.java	2012-12-14 23:54:20 +0000
@@ -0,0 +1,106 @@
+/**
+ * Copyright © 2012 Akiban Technologies, Inc.  All rights
+ * reserved.
+ *
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * This program may also be available under different license terms.
+ * For more information, see www.akiban.com or contact
+ * [e-mail].
+ *
+ * Contributors:
+ * Akiban Technologies, Inc.
+ */
+
+package com.akiban.sql.parser;
+
+import com.akiban.sql.StandardException;
+
+/**
+ * DECLARE a CURSOR on some statement.
+ */
+
+public class DeclareStatementNode extends StatementNode
+{
+    private String name;
+    private StatementNode statement;
+
+    /**
+     * Initializer for an DeclareStatementNode
+     *
+     * @param name The name of the statement
+     * @param statement The statement to be executed
+     */
+
+    public void init(Object name,
+                     Object statement) {
+        this.name = (String)name;
+        this.statement = (StatementNode)statement;
+    }
+    
+    public String getName() {
+        return name;
+    }
+
+    public StatementNode getStatement() {
+        return statement;
+    }
+
+    /**
+     * Fill this node with a deep copy of the given node.
+     */
+    public void copyFrom(QueryTreeNode node) throws StandardException {
+        super.copyFrom(node);
+        
+        DeclareStatementNode other = (DeclareStatementNode)node;
+        this.statement = (StatementNode)getNodeFactory().copyNode(other.statement,
+                                                                  getParserContext());
+    }
+
+    /**
+     * Convert this object to a String.  See comments in QueryTreeNode.java
+     * for how this should be done for tree printing.
+     *
+     * @return This object as a String
+     */
+
+    public String toString() {
+        return "name: " + name + "\n" +
+            super.toString();
+    }
+
+    public String statementToString() {
+        return "DECLARE";
+    }
+
+    /**
+     * Prints the sub-nodes of this object.  See QueryTreeNode.java for
+     * how tree printing is supposed to work.
+     *
+     * @param depth The depth of this node in the tree
+     */
+
+    public void printSubNodes(int depth) {
+        super.printSubNodes(depth);
+
+        printLabel(depth, "statement: ");
+        statement.treePrint(depth + 1);
+    }
+
+    /**
+     * Accept the visitor for all visitable children of this node.
+     * 
+     * @param v the visitor
+     *
+     * @exception StandardException on error
+     */
+    void acceptChildren(Visitor v) throws StandardException {
+        super.acceptChildren(v);
+
+        statement = (StatementNode)statement.accept(v);
+    }
+
+}

=== removed file 'src/main/java/com/akiban/sql/parser/ExecSPSNode.java'
--- src/main/java/com/akiban/sql/parser/ExecSPSNode.java	2012-11-07 17:49:31 +0000
+++ src/main/java/com/akiban/sql/parser/ExecSPSNode.java	1970-01-01 00:00:00 +0000
@@ -1,98 +0,0 @@
-/**
- * Copyright © 2012 Akiban Technologies, Inc.  All rights
- * reserved.
- *
- * This program and the accompanying materials are made available
- * under the terms of the Eclipse Public License v1.0 which
- * accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * This program may also be available under different license terms.
- * For more information, see www.akiban.com or contact
- * [e-mail].
- *
- * Contributors:
- * Akiban Technologies, Inc.
- */
-
-/* The original from which this derives bore the following: */
-
-/*
-
-   Derby - Class org.apache.derby.impl.sql.compile.ExecSPSNode
-
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to you under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
- */
-
-package com.akiban.sql.parser;
-
-import com.akiban.sql.StandardException;
-
-/**
- * A ExecSPSNode is the root of a QueryTree 
- * that represents an EXECUTE STATEMENT
- * statement.    It is a tad abnormal.  Duringa
- * bind, it locates and retrieves the SPSDescriptor
- * for the particular statement.    At generate time,
- * it generates the prepared statement for the 
- * stored prepared statement and returns it (i.e.
- * it effectively replaces itself with the appropriate
- * prepared statement).
- *
- */
-
-public class ExecSPSNode extends StatementNode 
-{
-    private TableName name;
-
-    /**
-     * Initializer for a ExecSPSNode
-     *
-     * @param newObjectName The name of the table to be created
-     *
-     */
-
-    public void init(Object newObjectName) {
-        this.name = (TableName)newObjectName;
-    }
-
-    /**
-     * Fill this node with a deep copy of the given node.
-     */
-    public void copyFrom(QueryTreeNode node) throws StandardException {
-        super.copyFrom(node);
-
-        ExecSPSNode other = (ExecSPSNode)node;
-        this.name = (TableName)getNodeFactory().copyNode(other.name,
-                                                         getParserContext());
-    }
-
-    /** @see StatementNode#executeStatementName */
-    public String executeStatementName() {
-        return name.getTableName();
-    }
-
-    /** @see StatementNode#executeSchemaName */
-    public String executeSchemaName() {
-        return name.getSchemaName();
-    }
-
-    public String statementToString() {
-        return "EXECUTE STATEMENT";
-    }
-
-}

=== added file 'src/main/java/com/akiban/sql/parser/ExecuteStatementNode.java'
--- src/main/java/com/akiban/sql/parser/ExecuteStatementNode.java	1970-01-01 00:00:00 +0000
+++ src/main/java/com/akiban/sql/parser/ExecuteStatementNode.java	2012-12-14 23:54:20 +0000
@@ -0,0 +1,106 @@
+/**
+ * Copyright © 2012 Akiban Technologies, Inc.  All rights
+ * reserved.
+ *
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * This program may also be available under different license terms.
+ * For more information, see www.akiban.com or contact
+ * [e-mail].
+ *
+ * Contributors:
+ * Akiban Technologies, Inc.
+ */
+
+package com.akiban.sql.parser;
+
+import com.akiban.sql.StandardException;
+
+/**
+ * EXECUTE a previously prepare statement.
+ */
+
+public class ExecuteStatementNode extends StatementNode
+{
+    private String name;
+    private ValueNodeList parameterList;
+
+    /**
+     * Initializer for an ExecuteStatementNode
+     *
+     * @param name The name of the prepared statement.
+     * @param parameterList Any parameter values to be bound.
+     */
+
+    public void init(Object name,
+                     Object parameterList) {
+        this.name = (String)name;
+        this.parameterList = (ValueNodeList)parameterList;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public ValueNodeList getParameterList() {
+        return parameterList;
+    }
+
+    /**
+     * Fill this node with a deep copy of the given node.
+     */
+    public void copyFrom(QueryTreeNode node) throws StandardException {
+        super.copyFrom(node);
+        
+        ExecuteStatementNode other = (ExecuteStatementNode)node;
+        this.name = other.name;
+        this.parameterList = (ValueNodeList)
+            getNodeFactory().copyNode(other.parameterList, getParserContext());
+    }
+
+    /**
+     * Convert this object to a String.  See comments in QueryTreeNode.java
+     * for how this should be done for tree printing.
+     *
+     * @return This object as a String
+     */
+
+    public String toString() {
+        return "name: " + name + "\n" +
+            super.toString();
+    }
+
+    public String statementToString() {
+        return "EXECUTE";
+    }
+
+    /**
+     * Prints the sub-nodes of this object.  See QueryTreeNode.java for
+     * how tree printing is supposed to work.
+     *
+     * @param depth The depth of this node in the tree
+     */
+
+    public void printSubNodes(int depth) {
+        super.printSubNodes(depth);
+
+        printLabel(depth, "parameterList: ");
+        parameterList.treePrint(depth + 1);
+    }
+
+    /**
+     * Accept the visitor for all visitable children of this node.
+     *
+     * @param v the visitor
+     * @throws StandardException on error in the visitor
+     */
+    void acceptChildren(Visitor v) throws StandardException {
+        super.acceptChildren(v);
+
+        parameterList = (ValueNodeList)parameterList.accept(v);
+    }
+
+}

=== modified file 'src/main/java/com/akiban/sql/parser/ExplainStatementNode.java'
--- src/main/java/com/akiban/sql/parser/ExplainStatementNode.java	2012-11-07 17:49:31 +0000
+++ src/main/java/com/akiban/sql/parser/ExplainStatementNode.java	2012-12-14 23:54:20 +0000
@@ -31,7 +31,7 @@
     /**
      * Initializer for an ExplainStatementNode
      *
-     * @param statemen The statement to be explained.
+     * @param statement The statement to be explained.
      */
 
     public void init(Object statement) {

=== added file 'src/main/java/com/akiban/sql/parser/FetchStatementNode.java'
--- src/main/java/com/akiban/sql/parser/FetchStatementNode.java	1970-01-01 00:00:00 +0000
+++ src/main/java/com/akiban/sql/parser/FetchStatementNode.java	2012-12-14 23:54:20 +0000
@@ -0,0 +1,80 @@
+/**
+ * Copyright © 2012 Akiban Technologies, Inc.  All rights
+ * reserved.
+ *
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * This program may also be available under different license terms.
+ * For more information, see www.akiban.com or contact
+ * [e-mail].
+ *
+ * Contributors:
+ * Akiban Technologies, Inc.
+ */
+
+package com.akiban.sql.parser;
+
+import com.akiban.sql.StandardException;
+
+/**
+ * FETCH rows from declared cursor.
+ */
+
+public class FetchStatementNode extends StatementNode
+{
+    private String name;
+    private int count;
+
+    /**
+     * Initializer for an FetchStatementNode
+     *
+     * @param name The name of the cursor
+     * @param count The number of rows to fetch
+     */
+
+    public void init(Object name,
+                     Object count) {
+        this.name = (String)name;
+        this.count = (Integer)count;
+    }
+    
+    public String getName() {
+        return name;
+    }
+
+    public int getCount() {
+        return count;
+    }
+
+    /**
+     * Fill this node with a deep copy of the given node.
+     */
+    public void copyFrom(QueryTreeNode node) throws StandardException {
+        super.copyFrom(node);
+        
+        FetchStatementNode other = (FetchStatementNode)node;
+        this.name = other.name;
+        this.count = other.count;
+    }
+
+    /**
+     * Convert this object to a String.  See comments in QueryTreeNode.java
+     * for how this should be done for tree printing.
+     *
+     * @return This object as a String
+     */
+
+    public String toString() {
+        return "name: " + name + "\n" +
+            "count: " + ((count < 0) ? "ALL" : Integer.toString(count)) + "\n" +
+            super.toString();
+    }
+
+    public String statementToString() {
+        return "FETCH";
+    }
+
+}

=== modified file 'src/main/java/com/akiban/sql/parser/NodeFactoryImpl.java'
--- src/main/java/com/akiban/sql/parser/NodeFactoryImpl.java	2012-11-07 17:49:31 +0000
+++ src/main/java/com/akiban/sql/parser/NodeFactoryImpl.java	2012-12-14 23:54:20 +0000
@@ -403,9 +403,6 @@
         case NodeTypes.COLUMN_DEFINITION_NODE:
             return NodeNames.COLUMN_DEFINITION_NODE_NAME;
 
-        case NodeTypes.EXEC_SPS_NODE:
-            return NodeNames.EXEC_SPS_NODE_NAME;
-
         case NodeTypes.FK_CONSTRAINT_DEFINITION_NODE:
             return NodeNames.FK_CONSTRAINT_DEFINITION_NODE_NAME;
 
@@ -629,6 +626,25 @@
 
         case NodeTypes.AT_RENAME_NODE:
             return NodeNames.AT_RENAME_NODE_NAME;
+
+        case NodeTypes.DECLARE_STATEMENT_NODE:
+            return NodeNames.DECLARE_STATEMENT_NODE_NAME;
+
+        case NodeTypes.FETCH_STATEMENT_NODE:
+            return NodeNames.FETCH_STATEMENT_NODE_NAME;
+
+        case NodeTypes.CLOSE_STATEMENT_NODE:
+            return NodeNames.CLOSE_STATEMENT_NODE_NAME;
+
+        case NodeTypes.PREPARE_STATEMENT_NODE:
+            return NodeNames.PREPARE_STATEMENT_NODE_NAME;
+
+        case NodeTypes.EXECUTE_STATEMENT_NODE:
+            return NodeNames.EXECUTE_STATEMENT_NODE_NAME;
+
+        case NodeTypes.DEALLOCATE_STATEMENT_NODE:
+            return NodeNames.DEALLOCATE_STATEMENT_NODE_NAME;
+
         default:
             throw new StandardException("Not implemented");
         }

=== modified file 'src/main/java/com/akiban/sql/parser/NodeNames.java'
--- src/main/java/com/akiban/sql/parser/NodeNames.java	2012-11-07 17:49:31 +0000
+++ src/main/java/com/akiban/sql/parser/NodeNames.java	2012-12-14 23:54:20 +0000
@@ -104,6 +104,8 @@
 
     static final String CHAR_CONSTANT_NODE_NAME = "com.akiban.sql.parser.CharConstantNode";
 
+    static final String CLOSE_STATEMENT_NODE_NAME = "com.akiban.sql.parser.CloseStatementNode";
+
     static final String COALESCE_FUNCTION_NODE_NAME = "com.akiban.sql.parser.CoalesceFunctionNode";
 
     static final String COLUMN_DEFINITION_NODE_NAME = "com.akiban.sql.parser.ColumnDefinitionNode";
@@ -142,6 +144,10 @@
 
     static final String OCTET_LENGTH_OPERATOR_NODE_NAME = "com.akiban.sql.parser.OctetLengthOperatorNode";
 
+    static final String DEALLOCATE_STATEMENT_NODE_NAME = "com.akiban.sql.parser.DeallocateStatementNode";
+
+    static final String DECLARE_STATEMENT_NODE_NAME = "com.akiban.sql.parser.DeclareStatementNode";
+
     static final String DEFAULT_NODE_NAME = "com.akiban.sql.parser.DefaultNode";
 
     static final String DELETE_NODE_NAME = "com.akiban.sql.parser.DeleteNode";
@@ -168,7 +174,7 @@
 
     static final String DROP_VIEW_NODE_NAME = "com.akiban.sql.parser.DropViewNode";
 
-    static final String EXEC_SPS_NODE_NAME = "com.akiban.sql.parser.ExecSPSNode";
+    static final String EXECUTE_STATEMENT_NODE_NAME = "com.akiban.sql.parser.ExecuteStatementNode";
 
     static final String EXPLAIN_STATEMENT_NODE_NAME = "com.akiban.sql.parser.ExplainStatementNode";
 
@@ -176,6 +182,8 @@
 
     static final String EXTRACT_OPERATOR_NODE_NAME = "com.akiban.sql.parser.ExtractOperatorNode";
 
+    static final String FETCH_STATEMENT_NODE_NAME = "com.akiban.sql.parser.FetchStatementNode";
+
     static final String FK_CONSTRAINT_DEFINITION_NODE_NAME = "com.akiban.sql.parser.FKConstraintDefinitionNode";
 
     static final String FROM_BASE_TABLE_NAME = "com.akiban.sql.parser.FromBaseTable";
@@ -270,6 +278,8 @@
 
     static final String PREDICATE_NAME = "com.akiban.sql.parser.Predicate";
 
+    static final String PREPARE_STATEMENT_NODE_NAME = "com.akiban.sql.parser.PrepareStatementNode";
+
     static final String PRIVILEGE_NAME = "com.akiban.sql.parser.PrivilegeNode";
 
     static final String PROJECT_RESTRICT_NODE_NAME = "com.akiban.sql.parser.ProjectRestrictNode";

=== modified file 'src/main/java/com/akiban/sql/parser/NodeTypes.java'
--- src/main/java/com/akiban/sql/parser/NodeTypes.java	2012-11-07 17:49:31 +0000
+++ src/main/java/com/akiban/sql/parser/NodeTypes.java	2012-12-14 23:54:20 +0000
@@ -166,7 +166,7 @@
     public static final int AGGREGATE_NODE = 115;
     public static final int COLUMN_DEFINITION_NODE = 116;
     public static final int EXPLAIN_STATEMENT_NODE = 117;
-    public static final int EXEC_SPS_NODE = 118;
+    // 118 available
     public static final int FK_CONSTRAINT_DEFINITION_NODE = 119;
     public static final int FROM_VTI = 120;
     public static final int MATERIALIZE_RESULT_SET_NODE = 121;
@@ -277,8 +277,16 @@
     public static final int WINDOW_REFERENCE_NODE = 229;
     public static final int WINDOW_RESULTSET_NODE = 230;
 
+    // Cursors
+    public static final int DECLARE_STATEMENT_NODE = 233;
+    public static final int FETCH_STATEMENT_NODE = 234;
+    public static final int CLOSE_STATEMENT_NODE = 235;
+    public static final int PREPARE_STATEMENT_NODE = 236;
+    public static final int EXECUTE_STATEMENT_NODE = 237;
+    public static final int DEALLOCATE_STATEMENT_NODE = 238;
+
     // Final value in set, keep up to date!
-    public static final int FINAL_VALUE = CURRENT_SEQUENCE_NODE;
+    public static final int FINAL_VALUE = DEALLOCATE_STATEMENT_NODE;
 
     /**
      * Extensions to this interface can use nodetypes > MAX_NODE_TYPE with out fear of collision

=== added file 'src/main/java/com/akiban/sql/parser/PrepareStatementNode.java'
--- src/main/java/com/akiban/sql/parser/PrepareStatementNode.java	1970-01-01 00:00:00 +0000
+++ src/main/java/com/akiban/sql/parser/PrepareStatementNode.java	2012-12-14 23:54:20 +0000
@@ -0,0 +1,106 @@
+/**
+ * Copyright © 2012 Akiban Technologies, Inc.  All rights
+ * reserved.
+ *
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * This program may also be available under different license terms.
+ * For more information, see www.akiban.com or contact
+ * [e-mail].
+ *
+ * Contributors:
+ * Akiban Technologies, Inc.
+ */
+
+package com.akiban.sql.parser;
+
+import com.akiban.sql.StandardException;
+
+/**
+ * PREPARE a statement for later execution.
+ */
+
+public class PrepareStatementNode extends StatementNode
+{
+    private String name;
+    private StatementNode statement;
+
+    /**
+     * Initializer for an PrepareStatementNode
+     *
+     * @param name The name of the statement
+     * @param statement The statement to be executed
+     */
+
+    public void init(Object name,
+                     Object statement) {
+        this.name = (String)name;
+        this.statement = (StatementNode)statement;
+    }
+    
+    public String getName() {
+        return name;
+    }
+
+    public StatementNode getStatement() {
+        return statement;
+    }
+
+    /**
+     * Fill this node with a deep copy of the given node.
+     */
+    public void copyFrom(QueryTreeNode node) throws StandardException {
+        super.copyFrom(node);
+        
+        PrepareStatementNode other = (PrepareStatementNode)node;
+        this.statement = (StatementNode)getNodeFactory().copyNode(other.statement,
+                                                                  getParserContext());
+    }
+
+    /**
+     * Convert this object to a String.  See comments in QueryTreeNode.java
+     * for how this should be done for tree printing.
+     *
+     * @return This object as a String
+     */
+
+    public String toString() {
+        return "name: " + name + "\n" +
+            super.toString();
+    }
+
+    public String statementToString() {
+        return "PREPARE";
+    }
+
+    /**
+     * Prints the sub-nodes of this object.  See QueryTreeNode.java for
+     * how tree printing is supposed to work.
+     *
+     * @param depth The depth of this node in the tree
+     */
+
+    public void printSubNodes(int depth) {
+        super.printSubNodes(depth);
+
+        printLabel(depth, "statement: ");
+        statement.treePrint(depth + 1);
+    }
+
+    /**
+     * Accept the visitor for all visitable children of this node.
+     * 
+     * @param v the visitor
+     *
+     * @exception StandardException on error
+     */
+    void acceptChildren(Visitor v) throws StandardException {
+        super.acceptChildren(v);
+
+        statement = (StatementNode)statement.accept(v);
+    }
+
+}

=== modified file 'src/main/java/com/akiban/sql/unparser/NodeToString.java'
--- src/main/java/com/akiban/sql/unparser/NodeToString.java	2012-11-07 17:49:31 +0000
+++ src/main/java/com/akiban/sql/unparser/NodeToString.java	2012-12-14 23:54:20 +0000
@@ -211,6 +211,18 @@
             return callStatementNode((CallStatementNode)node);
         case NodeTypes.INDEX_CONSTRAINT_NODE:
             return indexConstraint((IndexConstraintDefinitionNode)node);
+        case NodeTypes.DECLARE_STATEMENT_NODE:
+            return declareStatementNode((DeclareStatementNode)node);
+        case NodeTypes.FETCH_STATEMENT_NODE:
+            return fetchStatementNode((FetchStatementNode)node);
+        case NodeTypes.CLOSE_STATEMENT_NODE:
+            return closeStatementNode((CloseStatementNode)node);
+        case NodeTypes.PREPARE_STATEMENT_NODE:
+            return prepareStatementNode((PrepareStatementNode)node);
+        case NodeTypes.EXECUTE_STATEMENT_NODE:
+            return executeStatementNode((ExecuteStatementNode)node);
+        case NodeTypes.DEALLOCATE_STATEMENT_NODE:
+            return deallocateStatementNode((DeallocateStatementNode)node);
         default:
             return "**UNKNOWN(" + node.getNodeType() +")**";
         }
@@ -1014,8 +1026,41 @@
         return bd.substring(0, bd.length() -2); // delete the last (<COMMA> <SPACE>)
     }
     
+    protected String declareStatementNode(DeclareStatementNode node) 
+            throws StandardException {
+        return "DECLARE " + node.getName() + " CURSOR FOR " +
+            toString(node.getStatement());
+    }
+
+    protected String fetchStatementNode(FetchStatementNode node)
+            throws StandardException {
+        return "FETCH " + 
+            ((node.getCount() < 0) ? "ALL" : Integer.toString(node.getCount())) +
+            " FROM " + node.getName();
+    }
+
+    protected String closeStatementNode(CloseStatementNode node)
+            throws StandardException {
+        return "CLOSE " + node.getName();
+    }
+
+    protected String prepareStatementNode(PrepareStatementNode node)
+            throws StandardException {
+        return "PREPARE " + node.getName() + " AS " +
+            toString(node.getStatement());
+    }
+
+    protected String executeStatementNode(ExecuteStatementNode node)
+            throws StandardException {
+        return "EXECUTE " + node.getName() + 
+            "(" + nodeList(node.getParameterList(), true) + ")";
+    }
+
+    protected String deallocateStatementNode(DeallocateStatementNode node)
+            throws StandardException {
+        return "DEALLOCATE " + node.getName();
+    }
      
-    
     protected void doPrint(QueryTreeNode node, StringBuilder bd) throws StandardException
     {
         if (node instanceof RowConstructorNode)

=== modified file 'src/main/javacc/SQLGrammar.jj'
--- src/main/javacc/SQLGrammar.jj	2012-12-14 23:54:20 +0000
+++ src/main/javacc/SQLGrammar.jj	2012-12-14 23:54:20 +0000
@@ -2983,10 +2983,12 @@
 |
     statementNode = spsAlterStatement()
 |
-    statementNode = globalTemporaryTableDeclaration()
-|
     statementNode = preparableSQLDataStatement()
 |
+    statementNode = cursorStatement()
+|
+    statementNode = executeStatement()
+|
     statementNode = spsSetStatement()
 |
     statementNode = truncateStatement()
@@ -2995,8 +2997,6 @@
 |
     statementNode = revokeStatement()
 |
-    statementNode = execStatement()
-|
     statementNode = explainStatement()
 |
     statementNode = transactionControlStatement()
@@ -11917,20 +11917,6 @@
     }
 }
 
-StatementNode
-execStatement() throws StandardException :
-{
-    TableName stmtName;
-}
-{
-    <EXECUTE> <STATEMENT> stmtName = qualifiedName() 
-    {
-        return (StatementNode)nodeFactory.getNode(NodeTypes.EXEC_SPS_NODE,
-                                                  stmtName,
-                                                  parserContext);
-    }
-}
-
 TransactionStatementNode
 setIsolationStatement() throws StandardException :
 {
@@ -14124,13 +14110,112 @@
 }
 
 StatementNode
+cursorStatement() throws StandardException :
+{
+    String name;
+    StatementNode stmt;
+    int count = 1;
+    Token[] tokenHolder = new Token[1];
+}
+{
+    <DECLARE> name = identifier() [<NO> <SCROLL>] <CURSOR>
+    <FOR> stmt = declarableStatement(tokenHolder)
+    {
+        return (StatementNode)nodeFactory.getNode(NodeTypes.DECLARE_STATEMENT_NODE,
+                                                  name, stmt,
+                                                  parserContext);
+    }
+|
+    <FETCH>
+    [ 
+      <NEXT>
+    |
+      count = uint_value()
+    |
+      <ALL> { count = -1; }
+    ]
+    [ <FROM> ]
+    name = identifier()
+    {
+        return (StatementNode)nodeFactory.getNode(NodeTypes.FETCH_STATEMENT_NODE,
+                                                  name, count,
+                                                  parserContext);
+    }
+|
+    <CLOSE>
+    name = identifier()
+    {
+        return (StatementNode)nodeFactory.getNode(NodeTypes.CLOSE_STATEMENT_NODE,
+                                                  name,
+                                                  parserContext);
+    }
+|
+    <PREPARE> name = identifier()
+    <AS> stmt = proceduralStatement(tokenHolder)
+    {
+        stmt.setBeginOffset(tokenHolder[0].beginOffset);
+        stmt.setEndOffset(getToken(0).endOffset);
+        return (StatementNode)nodeFactory.getNode(NodeTypes.PREPARE_STATEMENT_NODE,
+                                                  name, stmt,
+                                                  parserContext);
+    }
+|
+    <DEALLOCATE>
+    name = identifier()
+    {
+        return (StatementNode)nodeFactory.getNode(NodeTypes.DEALLOCATE_STATEMENT_NODE,
+                                                  name,
+                                                  parserContext);
+    }
+}
+
+StatementNode
+declarableStatement(Token[] tokenHolder) throws StandardException :
+{
+    StatementNode stmt;
+    tokenHolder[0] = getToken(1);
+}
+{
+(
+    stmt = proceduralStatement(tokenHolder)
+|
+    stmt = executeStatement()
+)
+    {
+        stmt.setBeginOffset(tokenHolder[0].beginOffset);
+        stmt.setEndOffset(getToken(0).endOffset);
+        return stmt;
+    }
+}
+
+StatementNode
+executeStatement() throws StandardException :
+{
+    String name;
+    List<ValueNode> params = new ArrayList<ValueNode>();
+}
+{
+    <EXECUTE> name = identifier() [ methodCallParameterList(params) ]
+    {
+        ValueNodeList parameterList = (ValueNodeList)
+            nodeFactory.getNode(NodeTypes.VALUE_NODE_LIST, 
+                                parserContext);
+        for (ValueNode param : params)
+            parameterList.add(param);
+        return (StatementNode)nodeFactory.getNode(NodeTypes.EXECUTE_STATEMENT_NODE,
+                                                  name, parameterList,
+                                                  parserContext);
+    }
+}
+
+StatementNode
 explainStatement() throws StandardException :
 {
     StatementNode stmt;
     Token[] tokenHolder = new Token[1];
 }
 {
-    <EXPLAIN> stmt = proceduralStatement(tokenHolder)
+    <EXPLAIN> stmt = declarableStatement(tokenHolder)
     {
         return (StatementNode)nodeFactory.getNode(NodeTypes.EXPLAIN_STATEMENT_NODE,
                                                   stmt,

=== added file 'src/test/resources/com/akiban/sql/parser/close-1.expected'
--- src/test/resources/com/akiban/sql/parser/close-1.expected	1970-01-01 00:00:00 +0000
+++ src/test/resources/com/akiban/sql/parser/close-1.expected	2012-12-14 23:54:20 +0000
@@ -0,0 +1,3 @@
+com.akiban.sql.parser.CloseStatementNode@6baa9f99
+name: curs
+statementType: CLOSE
\ No newline at end of file

=== added file 'src/test/resources/com/akiban/sql/parser/close-1.sql'
--- src/test/resources/com/akiban/sql/parser/close-1.sql	1970-01-01 00:00:00 +0000
+++ src/test/resources/com/akiban/sql/parser/close-1.sql	2012-12-14 23:54:20 +0000
@@ -0,0 +1,1 @@
+CLOSE curs
\ No newline at end of file

=== added file 'src/test/resources/com/akiban/sql/parser/deallocate-1.expected'
--- src/test/resources/com/akiban/sql/parser/deallocate-1.expected	1970-01-01 00:00:00 +0000
+++ src/test/resources/com/akiban/sql/parser/deallocate-1.expected	2012-12-14 23:54:20 +0000
@@ -0,0 +1,3 @@
+com.akiban.sql.parser.DeallocateStatementNode@7dce784b
+name: ps
+statementType: DEALLOCATE
\ No newline at end of file

=== added file 'src/test/resources/com/akiban/sql/parser/deallocate-1.sql'
--- src/test/resources/com/akiban/sql/parser/deallocate-1.sql	1970-01-01 00:00:00 +0000
+++ src/test/resources/com/akiban/sql/parser/deallocate-1.sql	2012-12-14 23:54:20 +0000
@@ -0,0 +1,1 @@
+DEALLOCATE ps
\ No newline at end of file

=== added file 'src/test/resources/com/akiban/sql/parser/declare-1.expected'
--- src/test/resources/com/akiban/sql/parser/declare-1.expected	1970-01-01 00:00:00 +0000
+++ src/test/resources/com/akiban/sql/parser/declare-1.expected	2012-12-14 23:54:20 +0000
@@ -0,0 +1,32 @@
+com.akiban.sql.parser.DeclareStatementNode@5de9ac4
+name: pc
+statementType: DECLARE
+statement: 	
+	com.akiban.sql.parser.CursorNode@5982bcde
+	name: null
+	updateMode: UNSPECIFIED
+	statementType: SELECT
+	resultSet: 		
+		com.akiban.sql.parser.SelectNode@163dc0bb
+		isDistinct: false
+		resultColumns: 			
+			com.akiban.sql.parser.ResultColumnList@30384065
+
+			[0]:			
+			com.akiban.sql.parser.AllResultColumn@3d0bbf9e
+			tableName: null
+			exposedName: null
+			name: null
+			tableName: null
+			isDefaultColumn: false
+			type: null
+		fromList: 			
+			com.akiban.sql.parser.FromList@4e513d61
+
+			[0]:			
+			com.akiban.sql.parser.FromBaseTable@3794d372
+			tableName: t1
+			updateOrDelete: null
+			null
+			correlation Name: null
+			null
\ No newline at end of file

=== added file 'src/test/resources/com/akiban/sql/parser/declare-1.sql'
--- src/test/resources/com/akiban/sql/parser/declare-1.sql	1970-01-01 00:00:00 +0000
+++ src/test/resources/com/akiban/sql/parser/declare-1.sql	2012-12-14 23:54:20 +0000
@@ -0,0 +1,1 @@
+DECLARE pc CURSOR FOR SELECT * FROM t1
\ No newline at end of file

=== added file 'src/test/resources/com/akiban/sql/parser/declare-2.expected'
--- src/test/resources/com/akiban/sql/parser/declare-2.expected	1970-01-01 00:00:00 +0000
+++ src/test/resources/com/akiban/sql/parser/declare-2.expected	2012-12-14 23:54:20 +0000
@@ -0,0 +1,9 @@
+com.akiban.sql.parser.DeclareStatementNode@739e8329
+name: pc
+statementType: DECLARE
+statement: 	
+	com.akiban.sql.parser.ExecuteStatementNode@2bb5340c
+	name: ps
+	statementType: EXECUTE
+	parameterList: 		
+		com.akiban.sql.parser.ValueNodeList@56c163f
\ No newline at end of file

=== added file 'src/test/resources/com/akiban/sql/parser/declare-2.sql'
--- src/test/resources/com/akiban/sql/parser/declare-2.sql	1970-01-01 00:00:00 +0000
+++ src/test/resources/com/akiban/sql/parser/declare-2.sql	2012-12-14 23:54:20 +0000
@@ -0,0 +1,1 @@
+DECLARE pc CURSOR FOR EXECUTE ps
\ No newline at end of file

=== added file 'src/test/resources/com/akiban/sql/parser/execute-1.expected'
--- src/test/resources/com/akiban/sql/parser/execute-1.expected	1970-01-01 00:00:00 +0000
+++ src/test/resources/com/akiban/sql/parser/execute-1.expected	2012-12-14 23:54:20 +0000
@@ -0,0 +1,5 @@
+com.akiban.sql.parser.ExecuteStatementNode@788ab708
+name: ps
+statementType: EXECUTE
+parameterList: 	
+	com.akiban.sql.parser.ValueNodeList@5af6ac0b
\ No newline at end of file

=== added file 'src/test/resources/com/akiban/sql/parser/execute-1.sql'
--- src/test/resources/com/akiban/sql/parser/execute-1.sql	1970-01-01 00:00:00 +0000
+++ src/test/resources/com/akiban/sql/parser/execute-1.sql	2012-12-14 23:54:20 +0000
@@ -0,0 +1,1 @@
+EXECUTE ps
\ No newline at end of file

=== added file 'src/test/resources/com/akiban/sql/parser/execute-2.expected'
--- src/test/resources/com/akiban/sql/parser/execute-2.expected	1970-01-01 00:00:00 +0000
+++ src/test/resources/com/akiban/sql/parser/execute-2.expected	2012-12-14 23:54:20 +0000
@@ -0,0 +1,14 @@
+com.akiban.sql.parser.ExecuteStatementNode@789934d4
+name: ps
+statementType: EXECUTE
+parameterList: 	
+	com.akiban.sql.parser.ValueNodeList@125b8827
+
+	[0]:	
+	com.akiban.sql.parser.NumericConstantNode@3747c1db
+	value: 100
+	type: INTEGER NOT NULL
+	[1]:	
+	com.akiban.sql.parser.CharConstantNode@48082d37
+	value: Smith
+	type: CHAR(5) NOT NULL
\ No newline at end of file

=== added file 'src/test/resources/com/akiban/sql/parser/execute-2.sql'
--- src/test/resources/com/akiban/sql/parser/execute-2.sql	1970-01-01 00:00:00 +0000
+++ src/test/resources/com/akiban/sql/parser/execute-2.sql	2012-12-14 23:54:20 +0000
@@ -0,0 +1,1 @@
+EXECUTE ps(100,'Smith')
\ No newline at end of file

=== added file 'src/test/resources/com/akiban/sql/parser/fetch-1.expected'
--- src/test/resources/com/akiban/sql/parser/fetch-1.expected	1970-01-01 00:00:00 +0000
+++ src/test/resources/com/akiban/sql/parser/fetch-1.expected	2012-12-14 23:54:20 +0000
@@ -0,0 +1,4 @@
+com.akiban.sql.parser.FetchStatementNode@f5e0873
+name: pc
+count: 1
+statementType: FETCH
\ No newline at end of file

=== added file 'src/test/resources/com/akiban/sql/parser/fetch-1.sql'
--- src/test/resources/com/akiban/sql/parser/fetch-1.sql	1970-01-01 00:00:00 +0000
+++ src/test/resources/com/akiban/sql/parser/fetch-1.sql	2012-12-14 23:54:20 +0000
@@ -0,0 +1,1 @@
+FETCH pc
\ No newline at end of file

=== added file 'src/test/resources/com/akiban/sql/parser/fetch-2.expected'
--- src/test/resources/com/akiban/sql/parser/fetch-2.expected	1970-01-01 00:00:00 +0000
+++ src/test/resources/com/akiban/sql/parser/fetch-2.expected	2012-12-14 23:54:20 +0000
@@ -0,0 +1,4 @@
+com.akiban.sql.parser.FetchStatementNode@667cbde6
+name: pc
+count: 2
+statementType: FETCH
\ No newline at end of file

=== added file 'src/test/resources/com/akiban/sql/parser/fetch-2.sql'
--- src/test/resources/com/akiban/sql/parser/fetch-2.sql	1970-01-01 00:00:00 +0000
+++ src/test/resources/com/akiban/sql/parser/fetch-2.sql	2012-12-14 23:54:20 +0000
@@ -0,0 +1,1 @@
+FETCH 2 FROM pc
\ No newline at end of file

=== added file 'src/test/resources/com/akiban/sql/parser/fetch-3.expected'
--- src/test/resources/com/akiban/sql/parser/fetch-3.expected	1970-01-01 00:00:00 +0000
+++ src/test/resources/com/akiban/sql/parser/fetch-3.expected	2012-12-14 23:54:20 +0000
@@ -0,0 +1,4 @@
+com.akiban.sql.parser.FetchStatementNode@7977b9b
+name: pc
+count: ALL
+statementType: FETCH
\ No newline at end of file

=== added file 'src/test/resources/com/akiban/sql/parser/fetch-3.sql'
--- src/test/resources/com/akiban/sql/parser/fetch-3.sql	1970-01-01 00:00:00 +0000
+++ src/test/resources/com/akiban/sql/parser/fetch-3.sql	2012-12-14 23:54:20 +0000
@@ -0,0 +1,1 @@
+FETCH ALL FROM pc
\ No newline at end of file

=== modified file 'src/test/resources/com/akiban/sql/parser/junk-1.error'
--- src/test/resources/com/akiban/sql/parser/junk-1.error	2012-01-19 19:46:51 +0000
+++ src/test/resources/com/akiban/sql/parser/junk-1.error	2012-12-14 23:54:20 +0000
@@ -2,13 +2,17 @@
 Was expecting one of:
     "alter" ...
     "begin" ...
+    "close" ...
     "commit" ...
     "create" ...
+    "deallocate" ...
     "declare" ...
     "delete" ...
     "drop" ...
     "execute" ...
+    "fetch" ...
     "insert" ...
+    "prepare" ...
     "rollback" ...
     "select" ...
     "update" ...

=== added file 'src/test/resources/com/akiban/sql/parser/prepare-1.expected'
--- src/test/resources/com/akiban/sql/parser/prepare-1.expected	1970-01-01 00:00:00 +0000
+++ src/test/resources/com/akiban/sql/parser/prepare-1.expected	2012-12-14 23:54:20 +0000
@@ -0,0 +1,50 @@
+com.akiban.sql.parser.PrepareStatementNode@46edf730
+name: ps
+statementType: PREPARE
+statement: 	
+	com.akiban.sql.parser.CursorNode@30ff94b1
+	name: null
+	updateMode: UNSPECIFIED
+	statementType: SELECT
+	resultSet: 		
+		com.akiban.sql.parser.SelectNode@5b7b0998
+		isDistinct: false
+		resultColumns: 			
+			com.akiban.sql.parser.ResultColumnList@6ab30913
+
+			[0]:			
+			com.akiban.sql.parser.ResultColumn@1018f51f
+			exposedName: name
+			name: name
+			tableName: null
+			isDefaultColumn: false
+			type: null
+			expression: 				
+				com.akiban.sql.parser.ColumnReference@5684ce7a
+				columnName: name
+				tableName: null
+				type: null
+		fromList: 			
+			com.akiban.sql.parser.FromList@290fd7f6
+
+			[0]:			
+			com.akiban.sql.parser.FromBaseTable@4f2b6c89
+			tableName: customers
+			updateOrDelete: null
+			null
+			correlation Name: null
+			null
+		whereClause: 			
+			com.akiban.sql.parser.BinaryRelationalOperatorNode@2be2befa
+			operator: =
+			methodName: equals
+			type: null
+			leftOperand: 				
+				com.akiban.sql.parser.ColumnReference@33682598
+				columnName: cid
+				tableName: null
+				type: null
+			rightOperand: 				
+				com.akiban.sql.parser.ParameterNode@7a7c3885
+				number: 0
+				type: null
\ No newline at end of file

=== added file 'src/test/resources/com/akiban/sql/parser/prepare-1.sql'
--- src/test/resources/com/akiban/sql/parser/prepare-1.sql	1970-01-01 00:00:00 +0000
+++ src/test/resources/com/akiban/sql/parser/prepare-1.sql	2012-12-14 23:54:20 +0000
@@ -0,0 +1,1 @@
+PREPARE ps AS SELECT name FROM customers WHERE cid = $1
\ No newline at end of file

=== added file 'src/test/resources/com/akiban/sql/unparser/close-1.expected'
--- src/test/resources/com/akiban/sql/unparser/close-1.expected	1970-01-01 00:00:00 +0000
+++ src/test/resources/com/akiban/sql/unparser/close-1.expected	2012-12-14 23:54:20 +0000
@@ -0,0 +1,1 @@
+CLOSE curs
\ No newline at end of file

=== added file 'src/test/resources/com/akiban/sql/unparser/close-1.sql'
--- src/test/resources/com/akiban/sql/unparser/close-1.sql	1970-01-01 00:00:00 +0000
+++ src/test/resources/com/akiban/sql/unparser/close-1.sql	2012-12-14 23:54:20 +0000
@@ -0,0 +1,1 @@
+CLOSE curs
\ No newline at end of file

=== added file 'src/test/resources/com/akiban/sql/unparser/deallocate-1.expected'
--- src/test/resources/com/akiban/sql/unparser/deallocate-1.expected	1970-01-01 00:00:00 +0000
+++ src/test/resources/com/akiban/sql/unparser/deallocate-1.expected	2012-12-14 23:54:20 +0000
@@ -0,0 +1,1 @@
+DEALLOCATE ps
\ No newline at end of file

=== added file 'src/test/resources/com/akiban/sql/unparser/deallocate-1.sql'
--- src/test/resources/com/akiban/sql/unparser/deallocate-1.sql	1970-01-01 00:00:00 +0000
+++ src/test/resources/com/akiban/sql/unparser/deallocate-1.sql	2012-12-14 23:54:20 +0000
@@ -0,0 +1,1 @@
+DEALLOCATE ps
\ No newline at end of file

=== added file 'src/test/resources/com/akiban/sql/unparser/declare-1.expected'
--- src/test/resources/com/akiban/sql/unparser/declare-1.expected	1970-01-01 00:00:00 +0000
+++ src/test/resources/com/akiban/sql/unparser/declare-1.expected	2012-12-14 23:54:20 +0000
@@ -0,0 +1,1 @@
+DECLARE pc CURSOR FOR SELECT * FROM t1
\ No newline at end of file

=== added file 'src/test/resources/com/akiban/sql/unparser/declare-1.sql'
--- src/test/resources/com/akiban/sql/unparser/declare-1.sql	1970-01-01 00:00:00 +0000
+++ src/test/resources/com/akiban/sql/unparser/declare-1.sql	2012-12-14 23:54:20 +0000
@@ -0,0 +1,1 @@
+DECLARE pc CURSOR FOR SELECT * FROM t1
\ No newline at end of file

=== added file 'src/test/resources/com/akiban/sql/unparser/declare-2.expected'
--- src/test/resources/com/akiban/sql/unparser/declare-2.expected	1970-01-01 00:00:00 +0000
+++ src/test/resources/com/akiban/sql/unparser/declare-2.expected	2012-12-14 23:54:20 +0000
@@ -0,0 +1,1 @@
+DECLARE pc CURSOR FOR EXECUTE ps()
\ No newline at end of file

=== added file 'src/test/resources/com/akiban/sql/unparser/declare-2.sql'
--- src/test/resources/com/akiban/sql/unparser/declare-2.sql	1970-01-01 00:00:00 +0000
+++ src/test/resources/com/akiban/sql/unparser/declare-2.sql	2012-12-14 23:54:20 +0000
@@ -0,0 +1,1 @@
+DECLARE pc CURSOR FOR EXECUTE ps
\ No newline at end of file

=== added file 'src/test/resources/com/akiban/sql/unparser/execute-1.expected'
--- src/test/resources/com/akiban/sql/unparser/execute-1.expected	1970-01-01 00:00:00 +0000
+++ src/test/resources/com/akiban/sql/unparser/execute-1.expected	2012-12-14 23:54:20 +0000
@@ -0,0 +1,1 @@
+EXECUTE ps()
\ No newline at end of file

=== added file 'src/test/resources/com/akiban/sql/unparser/execute-1.sql'
--- src/test/resources/com/akiban/sql/unparser/execute-1.sql	1970-01-01 00:00:00 +0000
+++ src/test/resources/com/akiban/sql/unparser/execute-1.sql	2012-12-14 23:54:20 +0000
@@ -0,0 +1,1 @@
+EXECUTE ps
\ No newline at end of file

=== added file 'src/test/resources/com/akiban/sql/unparser/execute-2.expected'
--- src/test/resources/com/akiban/sql/unparser/execute-2.expected	1970-01-01 00:00:00 +0000
+++ src/test/resources/com/akiban/sql/unparser/execute-2.expected	2012-12-14 23:54:20 +0000
@@ -0,0 +1,1 @@
+EXECUTE ps(100, 'Smith')
\ No newline at end of file

=== added file 'src/test/resources/com/akiban/sql/unparser/execute-2.sql'
--- src/test/resources/com/akiban/sql/unparser/execute-2.sql	1970-01-01 00:00:00 +0000
+++ src/test/resources/com/akiban/sql/unparser/execute-2.sql	2012-12-14 23:54:20 +0000
@@ -0,0 +1,1 @@
+EXECUTE ps(100,'Smith')
\ No newline at end of file

=== added file 'src/test/resources/com/akiban/sql/unparser/fetch-1.expected'
--- src/test/resources/com/akiban/sql/unparser/fetch-1.expected	1970-01-01 00:00:00 +0000
+++ src/test/resources/com/akiban/sql/unparser/fetch-1.expected	2012-12-14 23:54:20 +0000
@@ -0,0 +1,1 @@
+FETCH 1 FROM pc
\ No newline at end of file

=== added file 'src/test/resources/com/akiban/sql/unparser/fetch-1.sql'
--- src/test/resources/com/akiban/sql/unparser/fetch-1.sql	1970-01-01 00:00:00 +0000
+++ src/test/resources/com/akiban/sql/unparser/fetch-1.sql	2012-12-14 23:54:20 +0000
@@ -0,0 +1,1 @@
+FETCH pc
\ No newline at end of file

=== added file 'src/test/resources/com/akiban/sql/unparser/fetch-2.expected'
--- src/test/resources/com/akiban/sql/unparser/fetch-2.expected	1970-01-01 00:00:00 +0000
+++ src/test/resources/com/akiban/sql/unparser/fetch-2.expected	2012-12-14 23:54:20 +0000
@@ -0,0 +1,1 @@
+FETCH 2 FROM pc
\ No newline at end of file

=== added file 'src/test/resources/com/akiban/sql/unparser/fetch-2.sql'
--- src/test/resources/com/akiban/sql/unparser/fetch-2.sql	1970-01-01 00:00:00 +0000
+++ src/test/resources/com/akiban/sql/unparser/fetch-2.sql	2012-12-14 23:54:20 +0000
@@ -0,0 +1,1 @@
+FETCH 2 FROM pc
\ No newline at end of file

=== added file 'src/test/resources/com/akiban/sql/unparser/fetch-3.expected'
--- src/test/resources/com/akiban/sql/unparser/fetch-3.expected	1970-01-01 00:00:00 +0000
+++ src/test/resources/com/akiban/sql/unparser/fetch-3.expected	2012-12-14 23:54:20 +0000
@@ -0,0 +1,1 @@
+FETCH ALL FROM pc
\ No newline at end of file

=== added file 'src/test/resources/com/akiban/sql/unparser/fetch-3.sql'
--- src/test/resources/com/akiban/sql/unparser/fetch-3.sql	1970-01-01 00:00:00 +0000
+++ src/test/resources/com/akiban/sql/unparser/fetch-3.sql	2012-12-14 23:54:20 +0000
@@ -0,0 +1,1 @@
+FETCH ALL FROM pc
\ No newline at end of file

=== added file 'src/test/resources/com/akiban/sql/unparser/prepare-1.expected'
--- src/test/resources/com/akiban/sql/unparser/prepare-1.expected	1970-01-01 00:00:00 +0000
+++ src/test/resources/com/akiban/sql/unparser/prepare-1.expected	2012-12-14 23:54:20 +0000
@@ -0,0 +1,1 @@
+PREPARE ps AS SELECT name FROM customers WHERE cid = $1
\ No newline at end of file

=== added file 'src/test/resources/com/akiban/sql/unparser/prepare-1.sql'
--- src/test/resources/com/akiban/sql/unparser/prepare-1.sql	1970-01-01 00:00:00 +0000
+++ src/test/resources/com/akiban/sql/unparser/prepare-1.sql	2012-12-14 23:54:20 +0000
@@ -0,0 +1,1 @@
+PREPARE ps AS SELECT name FROM customers WHERE cid = $1
\ No newline at end of file