Merge lp:~tjoneslo/akiban-sql-parser/fix-bug-1167451 into lp:~akiban-technologies/akiban-sql-parser/trunk

[Thomas Jones-Low]

Fix bug 1167451 - Update the DropSequence node to include the dropBehavior (RESTRICT, CASCADE, DEFAULT) of the other DDL drop nodes. This is currently fixed at RESTRICT. Not really required, but adds flexibility for the future.

[Nathan Williams (nwilliams)]

As described.

review: Approve

[Akiban Build User (build-akiban)]

There were 2 failures during build/test:

* job sql-parser-build failed at build number 290: http://172.16.20.104:8080/job/sql-parser-build/290/

* view must-pass failed: sql-parser-build is red

review: Needs Fixing

[Thomas Jones-Low (tjoneslo)]

Build failed on one file having a 2013 year in the header. Update the pom file check to allow this.

review: Needs Resubmitting

=== modified file 'pom.xml'
--- pom.xml	2013-03-23 17:43:48 +0000
+++ pom.xml	2013-04-17 18:33:28 +0000
@@ -154,7 +154,7 @@
                         <headerSection>
                             <key>__YEAR_SECTION__</key>
                             <defaultValue>2012</defaultValue>
-                            <ensureMatch>20(11)\-2012|2012</ensureMatch>
+                            <ensureMatch>20(11)\-2012|2012|2013</ensureMatch>
                         </headerSection>
                     </headerSections>
                     <strictCheck>true</strictCheck>

=== modified file 'src/main/java/com/akiban/sql/parser/DropSequenceNode.java'
--- src/main/java/com/akiban/sql/parser/DropSequenceNode.java	2012-11-07 17:49:31 +0000
+++ src/main/java/com/akiban/sql/parser/DropSequenceNode.java	2013-04-17 18:33:28 +0000
@@ -50,19 +50,24 @@
 {
     private TableName dropItem;
     private ExistenceCheck existenceCheck;
-    
+    private int dropBehavior;
     /**
      * Initializer for a DropSequenceNode
      *
      * @param dropSequenceName The name of the sequence being dropped
      * @throws StandardException
      */
-    public void init(Object dropSequenceName, Object ec) throws StandardException {
+    public void init(Object dropSequenceName, Object dropBehavior, Object ec) throws StandardException {
         dropItem = (TableName)dropSequenceName;
         initAndCheck(dropItem);
+        this.dropBehavior = ((Integer)dropBehavior).intValue();
         this.existenceCheck = (ExistenceCheck)ec;
     }
 
+    public int getDropBehavior() {
+        return dropBehavior;
+    }
+    
     public ExistenceCheck getExistenceCheck()
     {
         return existenceCheck;
@@ -75,6 +80,8 @@
         super.copyFrom(node);
 
         DropSequenceNode other = (DropSequenceNode)node;
+        this.dropBehavior = other.dropBehavior;
+        this.existenceCheck = other.existenceCheck;
         this.dropItem = (TableName)getNodeFactory().copyNode(other.dropItem,
                                                              getParserContext());
     }
@@ -85,6 +92,7 @@
 
     public String toString() {
         return super.toString() + 
-                "existenceCheck: " + existenceCheck + "\n";
+                "dropBehavior: " + dropBehavior + "\n"
+                + "existenceCheck: " + existenceCheck + "\n";
     }
 }

=== modified file 'src/main/java/com/akiban/sql/parser/IndexDefinition.java'
--- src/main/java/com/akiban/sql/parser/IndexDefinition.java	2013-03-06 11:08:05 +0000
+++ src/main/java/com/akiban/sql/parser/IndexDefinition.java	2013-04-17 18:33:28 +0000
@@ -1,5 +1,5 @@
 /**
- * Copyright © 2012 Akiban Technologies, Inc.  All rights
+ * Copyright © 2013 Akiban Technologies, Inc.  All rights
  * reserved.
  *
  * This program and the accompanying materials are made available
@@ -23,4 +23,5 @@
     public JoinType getJoinType();
     public IndexColumnList getIndexColumnList();
     public TableName getObjectName();
+    
 }

=== modified file 'src/main/javacc/SQLGrammar.jj'
--- src/main/javacc/SQLGrammar.jj	2013-04-11 18:47:18 +0000
+++ src/main/javacc/SQLGrammar.jj	2013-04-17 18:33:28 +0000
@@ -10122,6 +10122,7 @@
     {
         return (StatementNode)nodeFactory.getNode(NodeTypes.DROP_SEQUENCE_NODE,
                                                   sequenceName,
+                                                  new Integer(StatementType.DROP_RESTRICT),
                                                   cond,
                                                   parserContext);
     }

=== modified file 'src/test/resources/com/akiban/sql/parser/drop-sequence-1.expected'
--- src/test/resources/com/akiban/sql/parser/drop-sequence-1.expected	2012-08-14 03:53:33 +0000
+++ src/test/resources/com/akiban/sql/parser/drop-sequence-1.expected	2013-04-17 18:33:28 +0000
@@ -1,4 +1,5 @@
 com.akiban.sql.parser.DropSequenceNode@16bdb503
 name: test.bad_sequence
 statementType: DROP SEQUENCE bad_sequence
+dropBehavior: 1
 existenceCheck: NO_CONDITION
\ No newline at end of file

=== modified file 'src/test/resources/com/akiban/sql/parser/drop-sequence-2.expected'
--- src/test/resources/com/akiban/sql/parser/drop-sequence-2.expected	2012-08-14 03:53:33 +0000
+++ src/test/resources/com/akiban/sql/parser/drop-sequence-2.expected	2013-04-17 18:33:28 +0000
@@ -1,4 +1,5 @@
 com.akiban.sql.parser.DropSequenceNode@62c09554
 name: test.new_sequence
 statementType: DROP SEQUENCE new_sequence
+dropBehavior: 1
 existenceCheck: IF_EXISTS
\ No newline at end of file