Merge lp:~oontvoo/akiban-sql-parser/alter-rename-column into lp:~akiban-technologies/akiban-sql-parser/trunk

[Vy Nguyen]

Support ALTER-TABLE-RENAME-COLUMN statements, allow option <TABLE> token after ALTER-TABLE-RENAME, and transform RENAME-COLUMN to ALTER-TABLE-RENAME-COLUMN.

Oracle's syntax looks intuitive, so we'll follow that.
Syntax:
ALTERT TABLE <table_name>
       RENAME COLUMN <column_name> [AS | TO] <new_column_name>

[Resubmit: Transform RENAME-COLUMN to ALTER-TABLE-COLUMN]

[lp:~oontvoo/akiban-sql-parser/alter-rename-column]

293. By Vy Nguyen on 2013-02-05

[Nathan Williams (nwilliams)]

This is consistent with both Oracle and Postgres and probably least surprising.

Looks as described. Why was the unparser test deleted? Can we add one for the new ALTER syntax or does that not work through that path?

review: Needs Information

[Vy Nguyen (oontvoo)]

Unparsing an ALTER-TABLE node (for error message) has not been supported. None of the existing ALTER-TABLE nodes has a nice NodeToString representation. Now that RENAME-COLUMN is an ANLTER-TABLE node, it inherits the 'curse'.

[Nathan Williams (nwilliams)]

Makes sense.

review: Approve

=== added file 'src/main/java/com/akiban/sql/parser/AlterTableRenameColumnNode.java'
--- src/main/java/com/akiban/sql/parser/AlterTableRenameColumnNode.java	1970-01-01 00:00:00 +0000
+++ src/main/java/com/akiban/sql/parser/AlterTableRenameColumnNode.java	2013-02-05 07:52:19 +0000
@@ -0,0 +1,47 @@
+/**
+ * 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;
+
+public class AlterTableRenameColumnNode extends TableElementNode
+{
+    private String oldName;     // old column name
+    private String newName;     // new column name
+    
+    @Override
+    public void init(Object oldN, Object newN)
+    {
+        oldName = (String) oldN;
+        newName = (String) newN;
+        super.init(oldName, ElementType.AT_RENAME_COLUMN);
+    }
+    
+    @Override
+    public void copyFrom(QueryTreeNode node) throws StandardException
+    {
+        super.copyFrom(node);
+        oldName = ((AlterTableRenameColumnNode)node).oldName;
+        newName = ((AlterTableRenameColumnNode)node).newName;
+    }
+    
+    public String newName()
+    {
+        return newName;
+    }
+}

=== modified file 'src/main/java/com/akiban/sql/parser/NodeFactoryImpl.java'
--- src/main/java/com/akiban/sql/parser/NodeFactoryImpl.java	2012-12-25 20:59:36 +0000
+++ src/main/java/com/akiban/sql/parser/NodeFactoryImpl.java	2013-02-05 07:52:19 +0000
@@ -629,6 +629,9 @@
 
         case NodeTypes.AT_RENAME_NODE:
             return NodeNames.AT_RENAME_NODE_NAME;
+            
+        case NodeTypes.AT_RENAME_COLUMN_NODE:
+            return NodeNames.AT_RENAME_COLUMN_NODE_NAME;
 
         case NodeTypes.DECLARE_STATEMENT_NODE:
             return NodeNames.DECLARE_STATEMENT_NODE_NAME;

=== modified file 'src/main/java/com/akiban/sql/parser/NodeNames.java'
--- src/main/java/com/akiban/sql/parser/NodeNames.java	2012-12-25 20:59:36 +0000
+++ src/main/java/com/akiban/sql/parser/NodeNames.java	2013-02-05 07:52:19 +0000
@@ -76,6 +76,8 @@
 
     static final String AT_RENAME_NODE_NAME = "com.akiban.sql.parser.AlterTableRenameNode";
 
+    static final String AT_RENAME_COLUMN_NODE_NAME = "com.akiban.sql.parser.AlterTableRenameColumnNode";
+    
     static final String AND_NODE_NAME = "com.akiban.sql.parser.AndNode";
 
     static final String BASE_COLUMN_NODE_NAME = "com.akiban.sql.parser.BaseColumnNode";

=== modified file 'src/main/java/com/akiban/sql/parser/NodeTypes.java'
--- src/main/java/com/akiban/sql/parser/NodeTypes.java	2012-12-25 20:59:36 +0000
+++ src/main/java/com/akiban/sql/parser/NodeTypes.java	2013-02-05 07:52:19 +0000
@@ -217,7 +217,8 @@
     public static final int ROW_CTOR_NODE = 166;
     public static final int GROUP_CONCAT_NODE = 167;
     public static final int AT_RENAME_NODE = 168;
-    // 169 - 182 available
+    public static final int AT_RENAME_COLUMN_NODE = 169;
+    // 170 - 182 available
     public static final int ALTER_SERVER_NODE = 183;
     public static final int TIMESTAMP_ADD_FN_NODE = 184;
     public static final int TIMESTAMP_DIFF_FN_NODE = 185;

=== modified file 'src/main/java/com/akiban/sql/parser/TableElementNode.java'
--- src/main/java/com/akiban/sql/parser/TableElementNode.java	2012-11-07 17:49:31 +0000
+++ src/main/java/com/akiban/sql/parser/TableElementNode.java	2013-02-05 07:52:19 +0000
@@ -55,7 +55,7 @@
         AT_UNKNOWN, AT_ADD_FOREIGN_KEY_CONSTRAINT, AT_ADD_PRIMARY_KEY_CONSTRAINT,
         AT_ADD_UNIQUE_CONSTRAINT, AT_ADD_CHECK_CONSTRAINT, AT_DROP_CONSTRAINT,
         AT_MODIFY_COLUMN, AT_DROP_COLUMN, AT_DROP_INDEX, AT_ADD_INDEX,
-        AT_RENAME
+        AT_RENAME, AT_RENAME_COLUMN
     }
 
     String name;

=== modified file 'src/main/javacc/SQLGrammar.jj'
--- src/main/javacc/SQLGrammar.jj	2013-01-20 00:54:24 +0000
+++ src/main/javacc/SQLGrammar.jj	2013-02-05 07:52:19 +0000
@@ -11897,20 +11897,32 @@
 {
     String newColumnName;
     ColumnReference oldColumnReference;
+    TableElementList tableElementList;
+    TableName tableName;
 }
 {
     <COLUMN> oldColumnReference = columnReference()
     <TO> newColumnName = identifier()
     {
-        if (oldColumnReference.getTableNameNode() == null)
+        if ((tableName = oldColumnReference.getTableNameNode()) == null)
             throw new StandardException("Table name missing in RENAME COLUMN");
-        return (StatementNode)nodeFactory.getNode(NodeTypes.RENAME_NODE,
-                                                  oldColumnReference.getTableNameNode(),
-                                                  oldColumnReference.getColumnName(),
-                                                  newColumnName,
-                                                  Boolean.FALSE,
-                                                  RenameNode.RenameType.COLUMN,
-                                                  parserContext);
+
+        tableElementList = (TableElementList)nodeFactory
+                    .getNode(NodeTypes.TABLE_ELEMENT_LIST, parserContext);
+
+        tableElementList.addTableElement((TableElementNode)nodeFactory
+                    .getNode(NodeTypes.AT_RENAME_COLUMN_NODE,
+                             oldColumnReference.getColumnName(),
+                             newColumnName,
+                             parserContext));
+
+        return (StatementNode)nodeFactory.getNode(NodeTypes.ALTER_TABLE_NODE,
+                                                  tableName,
+                                                  tableElementList,
+                                                  new Character('\0'),
+                                                  new int[] {DDLStatementNode.MODIFY_TYPE},
+                                                  new int[] {0},
+                                                  parserContext);  
     }
 }
 
@@ -13164,6 +13176,7 @@
     DataTypeDescriptor  typeDescriptor;
     Token tok = null;
     String name;
+    String newCName;
     TableName newName;
     long[] autoIncrementInfo = new long[4];
 }
@@ -13206,12 +13219,27 @@
         tableElementList.addTableElement(tableElement);
     }
 |
-    <RENAME> [<TO> | <AS>] newName = qualifiedName()
+    <RENAME>
+    (
+        LOOKAHEAD ( {getToken(1).kind == COLUMN} )
+        <COLUMN> name = identifier() [<TO> | <AS>] newCName = identifier()
+        {
+            tableElement = (TableElementNode)nodeFactory.getNode(NodeTypes.AT_RENAME_COLUMN_NODE,
+                                                                 name,
+                                                                 newCName,
+                                                                 parserContext);
+        }
+    |
+        [<TABLE>] [<TO> | <AS>] newName = qualifiedName()
+        {
+            tableElement = (TableElementNode)nodeFactory.getNode(NodeTypes.AT_RENAME_NODE,
+                                                                 newName,
+                                                                 parserContext);
+        }
+    )
     {
+
         changeType[0] = DDLStatementNode.MODIFY_TYPE;
-        tableElement = (TableElementNode)nodeFactory.getNode(NodeTypes.AT_RENAME_NODE,
-                                                             newName,
-                                                             parserContext);
         tableElementList.addTableElement(tableElement);
     }
 }

=== added file 'src/test/resources/com/akiban/sql/parser/alter-rename-column-1.expected'
--- src/test/resources/com/akiban/sql/parser/alter-rename-column-1.expected	1970-01-01 00:00:00 +0000
+++ src/test/resources/com/akiban/sql/parser/alter-rename-column-1.expected	2013-02-05 07:52:19 +0000
@@ -0,0 +1,20 @@
+com.akiban.sql.parser.AlterTableNode@71172d81
+name: t
+statementType: ALTER TABLE
+objectName: t
+compressTable: false
+sequential: false
+truncateTable: false
+purge: false
+defragment: false
+truncateEndOfTable: false
+updateStatistics: false
+updateStatisticsAll: false
+indexNameForUpdateStatistics: null
+tableElementList: 	
+	com.akiban.sql.parser.TableElementList@28acaa28
+
+	[0]:	
+	com.akiban.sql.parser.AlterTableRenameColumnNode@5fd73cf4
+	name: c
+	elementType: AT_RENAME_COLUMN
\ No newline at end of file

=== added file 'src/test/resources/com/akiban/sql/parser/alter-rename-column-1.sql'
--- src/test/resources/com/akiban/sql/parser/alter-rename-column-1.sql	1970-01-01 00:00:00 +0000
+++ src/test/resources/com/akiban/sql/parser/alter-rename-column-1.sql	2013-02-05 07:52:19 +0000
@@ -0,0 +1,1 @@
+ALTER TABLE t RENAME COLUMN c TO d
\ No newline at end of file

=== added file 'src/test/resources/com/akiban/sql/parser/alter-rename-column-2.expected'
--- src/test/resources/com/akiban/sql/parser/alter-rename-column-2.expected	1970-01-01 00:00:00 +0000
+++ src/test/resources/com/akiban/sql/parser/alter-rename-column-2.expected	2013-02-05 07:52:19 +0000
@@ -0,0 +1,20 @@
+com.akiban.sql.parser.AlterTableNode@71172d81
+name: t
+statementType: ALTER TABLE
+objectName: t
+compressTable: false
+sequential: false
+truncateTable: false
+purge: false
+defragment: false
+truncateEndOfTable: false
+updateStatistics: false
+updateStatisticsAll: false
+indexNameForUpdateStatistics: null
+tableElementList: 	
+	com.akiban.sql.parser.TableElementList@28acaa28
+
+	[0]:	
+	com.akiban.sql.parser.AlterTableRenameColumnNode@5fd73cf4
+	name: c
+	elementType: AT_RENAME_COLUMN
\ No newline at end of file

=== added file 'src/test/resources/com/akiban/sql/parser/alter-rename-column-2.sql'
--- src/test/resources/com/akiban/sql/parser/alter-rename-column-2.sql	1970-01-01 00:00:00 +0000
+++ src/test/resources/com/akiban/sql/parser/alter-rename-column-2.sql	2013-02-05 07:52:19 +0000
@@ -0,0 +1,1 @@
+ALTER TABLE t RENAME COLUMN c AS d
\ No newline at end of file

=== added file 'src/test/resources/com/akiban/sql/parser/alter-rename-table-1.expected'
--- src/test/resources/com/akiban/sql/parser/alter-rename-table-1.expected	1970-01-01 00:00:00 +0000
+++ src/test/resources/com/akiban/sql/parser/alter-rename-table-1.expected	2013-02-05 07:52:19 +0000
@@ -0,0 +1,20 @@
+com.akiban.sql.parser.AlterTableNode@43271a80
+name: t
+statementType: ALTER TABLE
+objectName: t
+compressTable: false
+sequential: false
+truncateTable: false
+purge: false
+defragment: false
+truncateEndOfTable: false
+updateStatistics: false
+updateStatisticsAll: false
+indexNameForUpdateStatistics: null
+tableElementList: 	
+	com.akiban.sql.parser.TableElementList@3c3cebf1
+
+	[0]:	
+	com.akiban.sql.parser.AlterTableRenameNode@43a63a1c
+	name: t2
+	elementType: AT_RENAME
\ No newline at end of file

=== added file 'src/test/resources/com/akiban/sql/parser/alter-rename-table-1.sql'
--- src/test/resources/com/akiban/sql/parser/alter-rename-table-1.sql	1970-01-01 00:00:00 +0000
+++ src/test/resources/com/akiban/sql/parser/alter-rename-table-1.sql	2013-02-05 07:52:19 +0000
@@ -0,0 +1,1 @@
+ALTER TABLE t RENAME TABLE AS t2
\ No newline at end of file

=== added file 'src/test/resources/com/akiban/sql/parser/rename-column-1.expected'
--- src/test/resources/com/akiban/sql/parser/rename-column-1.expected	1970-01-01 00:00:00 +0000
+++ src/test/resources/com/akiban/sql/parser/rename-column-1.expected	2013-02-05 07:52:19 +0000
@@ -0,0 +1,20 @@
+com.akiban.sql.parser.AlterTableNode@71172d81
+name: t
+statementType: ALTER TABLE
+objectName: t
+compressTable: false
+sequential: false
+truncateTable: false
+purge: false
+defragment: false
+truncateEndOfTable: false
+updateStatistics: false
+updateStatisticsAll: false
+indexNameForUpdateStatistics: null
+tableElementList: 	
+	com.akiban.sql.parser.TableElementList@28acaa28
+
+	[0]:	
+	com.akiban.sql.parser.AlterTableRenameColumnNode@5fd73cf4
+	name: c
+	elementType: AT_RENAME_COLUMN
\ No newline at end of file

=== added file 'src/test/resources/com/akiban/sql/parser/rename-column-1.sql'
--- src/test/resources/com/akiban/sql/parser/rename-column-1.sql	1970-01-01 00:00:00 +0000
+++ src/test/resources/com/akiban/sql/parser/rename-column-1.sql	2013-02-05 07:52:19 +0000
@@ -0,0 +1,1 @@
+RENAME COLUMN t.c TO d
\ No newline at end of file

=== removed file 'src/test/resources/com/akiban/sql/unparser/rename-column-1.expected'
--- src/test/resources/com/akiban/sql/unparser/rename-column-1.expected	2013-02-01 22:10:31 +0000
+++ src/test/resources/com/akiban/sql/unparser/rename-column-1.expected	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-RENAME COLUMN t.c TO d
\ No newline at end of file

=== removed file 'src/test/resources/com/akiban/sql/unparser/rename-column-1.sql'
--- src/test/resources/com/akiban/sql/unparser/rename-column-1.sql	2013-02-01 22:10:31 +0000
+++ src/test/resources/com/akiban/sql/unparser/rename-column-1.sql	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-RENAME COLUMN t.c TO d
\ No newline at end of file