Merge lp:~mmcm/akiban-sql-parser/simple-case into lp:~akiban-technologies/akiban-sql-parser/trunk

[Mike McMahon]

Add parsing of simple CASE.

Also restore the version number, which got messed up due to some changes only in /build.

[Nathan Williams (nwilliams)]

As described.

review: Approve

[Thomas Jones-Low (tjoneslo)]

There was one failure during build/test:

* during merge: merge conflicts while merging lp:~mmcm/akiban-sql-parser/simple-case

review: Needs Fixing

[lp:~mmcm/akiban-sql-parser/simple-case]

305. By Mike McMahon on 2013-08-07

Merge from trunk.

[Mike McMahon (mmcm)]

Conflicts resolved.

review: Approve

=== modified file 'pom.xml'
--- pom.xml	2013-07-31 14:50:41 +0000
+++ pom.xml	2013-08-07 17:46:26 +0000
@@ -13,7 +13,7 @@
 
     <groupId>com.akiban</groupId>
     <artifactId>akiban-sql-parser</artifactId>
-    <version>1.0.15-SNAPSHOT</version>
+    <version>1.0.16-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>Akiban SQL Parser</name>
 
=== modified file 'src/main/java/com/akiban/sql/parser/NodeFactoryImpl.java'
--- src/main/java/com/akiban/sql/parser/NodeFactoryImpl.java	2013-07-31 23:47:55 +0000
+++ src/main/java/com/akiban/sql/parser/NodeFactoryImpl.java	2013-08-07 17:46:26 +0000
@@ -1,18 +1,18 @@
-/**
- * Copyright 2011-2013 Akiban Technologies, Inc.
- * 
- * Licensed 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.
- */
+/**
+ * Copyright 2011-2013 Akiban Technologies, Inc.
+ * 
+ * Licensed 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.
+ */
 
 /* The original from which this derives bore the following: */
 
@@ -653,6 +653,9 @@
         case NodeTypes.DEALLOCATE_STATEMENT_NODE:
             return NodeNames.DEALLOCATE_STATEMENT_NODE_NAME;
 
+        case NodeTypes.SIMPLE_CASE_NODE:
+            return NodeNames.SIMPLE_CASE_NODE_NAME;
+
         case NodeTypes.PARTITION_BY_LIST:
             return NodeNames.PARTITION_BY_LIST_NAME;
 
 
=== modified file 'src/main/java/com/akiban/sql/parser/NodeNames.java'
--- src/main/java/com/akiban/sql/parser/NodeNames.java	2013-07-31 23:47:55 +0000
+++ src/main/java/com/akiban/sql/parser/NodeNames.java	2013-08-07 17:46:26 +0000
@@ -1,18 +1,18 @@
-/**
- * Copyright 2011-2013 Akiban Technologies, Inc.
- * 
- * Licensed 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.
- */
+/**
+ * Copyright 2011-2013 Akiban Technologies, Inc.
+ * 
+ * Licensed 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.
+ */
 
 /* The original from which this derives bore the following: */
 
@@ -327,6 +327,8 @@
 
     static final String SET_TRANSACTION_ISOLATION_NODE_NAME = "com.akiban.sql.parser.SetTransactionIsolationNode";
 
+    static final String SIMPLE_CASE_NODE_NAME = "com.akiban.sql.parser.SimpleCaseNode";
+
     static final String SIMPLE_STRING_OPERATOR_NODE_NAME = "com.akiban.sql.parser.SimpleStringOperatorNode";
 
     static final String SPECIAL_FUNCTION_NODE_NAME = "com.akiban.sql.parser.SpecialFunctionNode";
 
=== modified file 'src/main/java/com/akiban/sql/parser/NodeTypes.java'
--- src/main/java/com/akiban/sql/parser/NodeTypes.java	2013-07-31 23:47:55 +0000
+++ src/main/java/com/akiban/sql/parser/NodeTypes.java	2013-08-07 17:46:26 +0000
@@ -1,18 +1,18 @@
-/**
- * Copyright 2011-2013 Akiban Technologies, Inc.
- * 
- * Licensed 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.
- */
+/**
+ * Copyright 2011-2013 Akiban Technologies, Inc.
+ * 
+ * Licensed 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.
+ */
 
 /* The original from which this derives bore the following: */
 
@@ -217,6 +217,7 @@
     public static final int GROUP_CONCAT_NODE = 167;
     public static final int AT_RENAME_NODE = 168;
     public static final int AT_RENAME_COLUMN_NODE = 169;
+    public static final int SIMPLE_CASE_NODE = 170;
     public static final int PARTITION_BY_LIST = 171;
     public static final int PARTITION_BY_COLUMN = 172;
     public static final int FULL_OUTER_JOIN_NODE = 173;
 
=== added file 'src/main/java/com/akiban/sql/parser/SimpleCaseNode.java'
--- src/main/java/com/akiban/sql/parser/SimpleCaseNode.java	1970-01-01 00:00:00 +0000
+++ src/main/java/com/akiban/sql/parser/SimpleCaseNode.java	2013-08-07 17:46:26 +0000
@@ -0,0 +1,163 @@
+/**
+ * Copyright 2011-2013 Akiban Technologies, Inc.
+ * 
+ * Licensed 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 SimpleCaseNode represents the CASE <expr> THEN ... form.
+ */
+
+public class SimpleCaseNode extends ValueNode
+{
+    private ValueNode operand;
+    private ValueNodeList caseOperands, resultValues;
+    private ValueNode elseValue;
+
+    /**
+     * Initializer for a SimpleCaseNode
+     *
+     * @param operand The expression being compared
+     */
+
+    public void init(Object operand) throws StandardException {
+        this.operand = (ValueNode)operand;
+        this.caseOperands = (ValueNodeList)getNodeFactory().getNode(NodeTypes.VALUE_NODE_LIST,
+                                                                    getParserContext());
+        this.resultValues = (ValueNodeList)getNodeFactory().getNode(NodeTypes.VALUE_NODE_LIST,
+                                                                    getParserContext());
+    }
+
+    /**
+     * Fill this node with a deep copy of the given node.
+     */
+    public void copyFrom(QueryTreeNode node) throws StandardException {
+        super.copyFrom(node);
+
+        SimpleCaseNode other = (SimpleCaseNode)node;
+        this.operand = (ValueNode)
+            getNodeFactory().copyNode(other.operand, getParserContext());
+        this.caseOperands = (ValueNodeList)
+            getNodeFactory().copyNode(other.caseOperands, getParserContext());
+        this.resultValues = (ValueNodeList)
+            getNodeFactory().copyNode(other.resultValues, getParserContext());
+        if (other.elseValue == null)
+            this.elseValue = null;
+        else
+            this.elseValue = (ValueNode)
+                getNodeFactory().copyNode(other.elseValue, getParserContext());
+    }
+
+    public ValueNode getOperand() {
+        return operand;
+    }
+
+    public ValueNodeList getCaseOperands() {
+        return caseOperands;
+    }
+
+    public ValueNodeList getResultValues() {
+        return resultValues;
+    }
+
+    public ValueNode getElseValue() {
+        return elseValue;
+    }
+
+    public void setElseValue(ValueNode elseValue) {
+        this.elseValue = elseValue;
+    }
+
+    /** The number of <code>WHEN</code> cases. */
+    public int getNumberOfCases() {
+        return caseOperands.size();
+    }
+
+    /** The <code>WHEN</code> part. */
+    public ValueNode getCaseOperand(int index) {
+        return caseOperands.get(index);
+    }
+
+    /** The <code>THEN</code> part. */
+    public ValueNode getResultValue(int index) {
+        return resultValues.get(index);
+    }
+
+    public void addCase(ValueNode operand, ValueNode result) {
+        caseOperands.add(operand);
+        resultValues.add(result);
+    }
+
+    /**
+     * 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, "operand: ");
+        operand.treePrint(depth + 1);
+
+        for (int i = 0; i < getNumberOfCases(); i++) {
+            printLabel(depth, "when: ");
+            getCaseOperand(i).treePrint(depth + 1);
+            printLabel(depth, "then: ");
+            getResultValue(i).treePrint(depth + 1);
+        }
+
+        if (elseValue != null) {
+            printLabel(depth, "else: ");
+            elseValue.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);
+
+        operand = (ValueNode)operand.accept(v);
+        caseOperands = (ValueNodeList)caseOperands.accept(v);
+        resultValues = (ValueNodeList)resultValues.accept(v);
+        if (elseValue != null)
+            elseValue = (ValueNode)elseValue.accept(v);
+    }
+                
+    /**
+     * {@inheritDoc}
+     */
+    protected boolean isEquivalent(ValueNode o) throws StandardException {
+        if (isSameNodeType(o)) {
+            SimpleCaseNode other = (SimpleCaseNode)o;
+            return operand.isEquivalent(other.operand) &&
+                caseOperands.isEquivalent(other.caseOperands) &&
+                resultValues.isEquivalent(other.resultValues) &&
+                ((elseValue == null) ? (other.elseValue == null) :
+                 elseValue.isEquivalent(other.elseValue));
+        }
+        return false;
+    }
+
+}
 
=== modified file 'src/main/java/com/akiban/sql/unparser/NodeToString.java'
--- src/main/java/com/akiban/sql/unparser/NodeToString.java	2013-07-31 23:59:21 +0000
+++ src/main/java/com/akiban/sql/unparser/NodeToString.java	2013-08-07 17:46:26 +0000
@@ -198,6 +198,8 @@
             return betweenOperatorNode((BetweenOperatorNode)node);
         case NodeTypes.CONDITIONAL_NODE:
             return conditionalNode((ConditionalNode)node);
+        case NodeTypes.SIMPLE_CASE_NODE:
+            return simpleCaseNode((SimpleCaseNode)node);
         case NodeTypes.COALESCE_FUNCTION_NODE:
             return coalesceFunctionNode((CoalesceFunctionNode)node);
         case NodeTypes.AGGREGATE_NODE:
@@ -1076,6 +1078,23 @@
         return str.toString();
     }
 
+    protected String simpleCaseNode(SimpleCaseNode node) throws StandardException {
+        StringBuilder str = new StringBuilder("CASE ");
+        str.append(maybeParens(node.getOperand()));
+        for (int i = 0; i < node.getNumberOfCases(); i++) {
+            str.append(" WHEN ");
+            str.append(maybeParens(node.getCaseOperand(i)));
+            str.append(" THEN ");
+            str.append(maybeParens(node.getResultValue(i)));
+        }
+        if (node.getElseValue() != null) {
+            str.append(" ELSE ");
+            str.append(maybeParens(node.getElseValue()));
+        }
+        str.append(" END");
+        return str.toString();
+    }
+
     protected String coalesceFunctionNode(CoalesceFunctionNode node) 
             throws StandardException {
         return functionCall(node.getFunctionName(),
 
=== modified file 'src/main/javacc/SQLGrammar.jj'
--- src/main/javacc/SQLGrammar.jj	2013-08-03 18:34:52 +0000
+++ src/main/javacc/SQLGrammar.jj	2013-08-07 17:46:26 +0000
@@ -12551,7 +12551,7 @@
                                               parserContext);
     }
 |
-    <CASE> value = whenThenExpression()
+    <CASE> value = caseExpression()
     {
         return value;
     }
@@ -12563,26 +12563,16 @@
     ValueNode expr;
 }
 {
-    <END>
-    {
-        ValueNode value = (ValueNode)nodeFactory.getNode(NodeTypes.CAST_NODE,
-                                                         (ValueNode)nodeFactory.getNode(NodeTypes.UNTYPED_NULL_CONSTANT_NODE,
-                                                                                        parserContext),
-                                                         DataTypeDescriptor.getBuiltInDataTypeDescriptor(Types.CHAR, 1),    
-                                                         parserContext);
-        ((CastNode)value).setForExternallyGeneratedCASTnode();
-        return value;
-    }
-|
-    <ELSE> expr = thenElseExpression() <END>
-    {
-        return expr;
-    }
-|
+    LOOKAHEAD ( { getToken(1).kind == WHEN } )
     expr = whenThenExpression()
     {
         return expr;
     }
+|
+    expr = simpleCaseExpression()
+    {
+        return expr;
+    }
 }
 
 ValueNode
@@ -12596,7 +12586,7 @@
     <WHEN> expr = orExpression(null) 
         ( <OR> expr = orExpression(expr) )*
         <THEN> thenExpr = thenElseExpression()
-    elseExpr = caseExpression()
+    elseExpr = caseElseExpression()
     {
         ValueNodeList thenElseList = (ValueNodeList)nodeFactory.getNode(NodeTypes.VALUE_NODE_LIST, parserContext);
         thenElseList.addValueNode(thenExpr); // then
@@ -12634,6 +12624,85 @@
     }
 }
 
+ValueNode
+caseElseExpression() throws StandardException :
+{
+    ValueNode expr;
+}
+{
+    <END>
+    {
+        ValueNode value = (ValueNode)nodeFactory.getNode(NodeTypes.CAST_NODE,
+                                                         (ValueNode)nodeFactory.getNode(NodeTypes.UNTYPED_NULL_CONSTANT_NODE,
+                                                                                        parserContext),
+                                                         DataTypeDescriptor.getBuiltInDataTypeDescriptor(Types.CHAR, 1),    
+                                                         parserContext);
+        ((CastNode)value).setForExternallyGeneratedCASTnode();
+        return value;
+    }
+|
+    <ELSE> expr = thenElseExpression() <END>
+    {
+        return expr;
+    }
+|
+    expr = whenThenExpression()
+    {
+        return expr;
+    }
+}
+
+ValueNode
+simpleCaseExpression() throws StandardException :
+{
+    ValueNode operand;
+    SimpleCaseNode caseExpr;
+}
+{
+    operand = additiveExpression()
+    {
+        caseExpr = (SimpleCaseNode)nodeFactory.getNode(NodeTypes.SIMPLE_CASE_NODE,
+                                                       operand, 
+                                                       parserContext);
+    }
+    simpleCaseWhenThenExpression(caseExpr)
+    {
+        return caseExpr;
+    }
+}
+
+void
+simpleCaseWhenThenExpression(SimpleCaseNode caseExpr) throws StandardException :
+{
+    ValueNode expr;
+    ValueNode thenExpr;
+    ValueNode elseExpr;
+}
+{
+    <WHEN> expr = additiveExpression()
+    <THEN> thenExpr = thenElseExpression()
+    {
+        caseExpr.addCase(expr, thenExpr);
+    }
+    simpleCaseElseExpression(caseExpr)
+}
+
+void
+simpleCaseElseExpression(SimpleCaseNode caseExpr) throws StandardException :
+{
+    ValueNode expr;
+}
+{
+    <END>
+|
+    <ELSE> expr = thenElseExpression() <END>
+    {
+        caseExpr.setElseValue(expr);
+    }
+|
+    simpleCaseWhenThenExpression(caseExpr)
+}
+
 void
 tableConstraintDefinition(TableElementList tableElementList) throws StandardException :
 {
 
=== added file 'src/test/resources/com/akiban/sql/unparser/select-16.expected'
--- src/test/resources/com/akiban/sql/unparser/select-16.expected	1970-01-01 00:00:00 +0000
+++ src/test/resources/com/akiban/sql/unparser/select-16.expected	2013-08-07 17:46:26 +0000
@@ -0,0 +1,1 @@
+SELECT (CASE x WHEN y THEN x WHEN z THEN y ELSE w END) FROM t
 \ No newline at end of file
 
=== added file 'src/test/resources/com/akiban/sql/unparser/select-16.sql'
--- src/test/resources/com/akiban/sql/unparser/select-16.sql	1970-01-01 00:00:00 +0000
+++ src/test/resources/com/akiban/sql/unparser/select-16.sql	2013-08-07 17:46:26 +0000
@@ -0,0 +1,1 @@
+SELECT CASE x WHEN y THEN x WHEN z THEN y ELSE w END FROM t
 \ No newline at end of file