Merge lp:~mmcm/akiban-sql-parser/drop-alias-if-exists into lp:~akiban-technologies/akiban-sql-parser/trunk

[Mike McMahon]

Parse IF EXISTS for DROP PROCEDURE.

[Vy Nguyen (oontvoo)]

straight-forward addition.

review: Approve

=== modified file 'src/main/java/com/akiban/sql/parser/DropAliasNode.java'
--- src/main/java/com/akiban/sql/parser/DropAliasNode.java	2012-11-07 17:49:31 +0000
+++ src/main/java/com/akiban/sql/parser/DropAliasNode.java	2012-11-28 20:32:20 +0000
@@ -51,6 +51,7 @@
 public class DropAliasNode extends DDLStatementNode
 {
     private AliasInfo.Type aliasType;
+    private ExistenceCheck existenceCheck;
 
     /**
      * Initializer for a DropAliasNode
@@ -60,10 +61,11 @@
      *
      * @exception StandardException
      */
-    public void init(Object dropAliasName, Object aliasType) throws StandardException {
+    public void init(Object dropAliasName, Object aliasType, Object existenceCheck) throws StandardException {
         TableName dropItem = (TableName)dropAliasName;
         initAndCheck(dropItem);
         this.aliasType = (AliasInfo.Type)aliasType;
+        this.existenceCheck = (ExistenceCheck)existenceCheck;
     }
 
     /**
@@ -74,12 +76,29 @@
 
         DropAliasNode other = (DropAliasNode)node;
         this.aliasType = other.aliasType;
+        this.existenceCheck = other.existenceCheck;
     }
 
     public AliasInfo.Type getAliasType() { 
         return aliasType; 
     }
 
+    public ExistenceCheck getExistenceCheck()
+    {
+        return existenceCheck;
+    }
+
+    /**
+     * 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 super.toString() +
+            "existenceCheck: " + existenceCheck + "\n";
+    }
+
     public String statementToString() {
         return "DROP " + aliasTypeName(aliasType);
     }

=== modified file 'src/main/java/com/akiban/sql/parser/DropTableNode.java'
--- src/main/java/com/akiban/sql/parser/DropTableNode.java	2012-11-07 17:49:31 +0000
+++ src/main/java/com/akiban/sql/parser/DropTableNode.java	2012-11-28 20:32:20 +0000
@@ -96,8 +96,8 @@
      */
     public String toString() {
         return super.toString() +
-            "dropBehavior: " + "\n" + dropBehavior + "\n"
-           + "existenceChec: " + "\n" + existenceCheck + "\n";
+            "dropBehavior: " + dropBehavior + "\n"
+           + "existenceCheck: " + existenceCheck + "\n";
     }
 
     public String statementToString() {

=== modified file 'src/main/javacc/SQLGrammar.jj'
--- src/main/javacc/SQLGrammar.jj	2012-11-09 19:27:35 +0000
+++ src/main/javacc/SQLGrammar.jj	2012-11-28 20:32:20 +0000
@@ -1426,11 +1426,12 @@
     }
 
     /** Create a node for the drop alias/procedure call. */
-    StatementNode dropAliasNode(Object aliasName, AliasInfo.Type type) throws StandardException {
+    StatementNode dropAliasNode(TableName aliasName, AliasInfo.Type type, ExistenceCheck cond) throws StandardException {
 
         StatementNode stmt = (StatementNode)nodeFactory.getNode(NodeTypes.DROP_ALIAS_NODE,
                                                                 aliasName,
                                                                 type,
+                                                                cond,
                                                                 parserContext);
 
         return stmt;
@@ -13530,27 +13531,28 @@
 StatementNode
 dropAliasStatement() throws StandardException :
 {
-    Object aliasName;
+    TableName aliasName;
+    ExistenceCheck cond;
 }
 {
-    <PROCEDURE> aliasName = qualifiedName() 
+    <PROCEDURE> cond = dropCondition() aliasName = qualifiedName() 
     {
-        return dropAliasNode(aliasName, AliasInfo.Type.PROCEDURE);
+        return dropAliasNode(aliasName, AliasInfo.Type.PROCEDURE, cond);
     }    
 |        
-    <FUNCTION> aliasName = qualifiedName() 
+    <FUNCTION> cond = dropCondition() aliasName = qualifiedName() 
     {
-        return dropAliasNode(aliasName, AliasInfo.Type.FUNCTION);
+        return dropAliasNode(aliasName, AliasInfo.Type.FUNCTION, cond);
     }    
 |    
-    <SYNONYM> aliasName = qualifiedName()
+    <SYNONYM> cond = dropCondition() aliasName = qualifiedName()
     {
-        return dropAliasNode(aliasName, AliasInfo.Type.SYNONYM);
+        return dropAliasNode(aliasName, AliasInfo.Type.SYNONYM, cond);
     }
 |    
-    <TYPE> aliasName = qualifiedName() <RESTRICT>
+    <TYPE> cond = dropCondition() aliasName = qualifiedName() <RESTRICT>
     {
-        return dropAliasNode(aliasName, AliasInfo.Type.UDT);
+        return dropAliasNode(aliasName, AliasInfo.Type.UDT, cond);
     }
 }
 

=== modified file 'src/test/resources/com/akiban/sql/parser/drop-procedure-1.expected'
--- src/test/resources/com/akiban/sql/parser/drop-procedure-1.expected	2012-09-29 19:00:44 +0000
+++ src/test/resources/com/akiban/sql/parser/drop-procedure-1.expected	2012-11-28 20:32:20 +0000
@@ -1,3 +1,4 @@
 com.akiban.sql.parser.DropAliasNode@476020ed
 name: test.foo_bar
-statementType: DROP PROCEDURE
\ No newline at end of file
+statementType: DROP PROCEDURE
+existenceCheck: NO_CONDITION

=== modified file 'src/test/resources/com/akiban/sql/parser/drop-table-1.expected'
--- src/test/resources/com/akiban/sql/parser/drop-table-1.expected	2012-07-05 22:01:12 +0000
+++ src/test/resources/com/akiban/sql/parser/drop-table-1.expected	2012-11-28 20:32:20 +0000
@@ -1,7 +1,5 @@
 com.akiban.sql.parser.DropTableNode@2d04faf8
 name: test
 statementType: DROP TABLE
-dropBehavior: 
-2
-existenceChec: 
-NO_CONDITION
\ No newline at end of file
+dropBehavior: 2
+existenceCheck: NO_CONDITION
\ No newline at end of file

=== modified file 'src/test/resources/com/akiban/sql/parser/drop-table-2.expected'
--- src/test/resources/com/akiban/sql/parser/drop-table-2.expected	2012-07-05 22:01:12 +0000
+++ src/test/resources/com/akiban/sql/parser/drop-table-2.expected	2012-11-28 20:32:20 +0000
@@ -1,7 +1,5 @@
 com.akiban.sql.parser.DropTableNode@b23b25c
 name: test.t1
 statementType: DROP TABLE
-dropBehavior: 
-2
-existenceChec: 
-NO_CONDITION
\ No newline at end of file
+dropBehavior: 2
+existenceCheck: NO_CONDITION
\ No newline at end of file

=== modified file 'src/test/resources/com/akiban/sql/parser/drop-table-3.expected'
--- src/test/resources/com/akiban/sql/parser/drop-table-3.expected	2012-07-05 22:01:12 +0000
+++ src/test/resources/com/akiban/sql/parser/drop-table-3.expected	2012-11-28 20:32:20 +0000
@@ -1,7 +1,5 @@
 com.akiban.sql.parser.DropTableNode@2d04faf8
 name: test
 statementType: DROP TABLE
-dropBehavior: 
-2
-existenceChec: 
-IF_EXISTS
\ No newline at end of file
+dropBehavior: 2
+existenceCheck: IF_EXISTS
\ No newline at end of file