Akiban SQL Parser

Merge lp:~oontvoo/akiban-sql-parser/columnRenameErrorMsg into lp:~akiban-technologies/akiban-sql-parser/trunk

  1. columnRenameErrorMsg
  2. Merge into trunk
Proposed by Vy Nguyen
Status: Merged
Approved by: Nathan Williams
Approved revision: 289
Merged at revision: 288
Proposed branch: lp:~oontvoo/akiban-sql-parser/columnRenameErrorMsg
Merge into: lp:~akiban-technologies/akiban-sql-parser/trunk
Diff against target: 27 lines (+4/-1)
3 files modified
src/main/java/com/akiban/sql/unparser/NodeToString.java (+2/-1)
src/test/resources/com/akiban/sql/unparser/rename-column-1.expected (+1/-0)
src/test/resources/com/akiban/sql/unparser/rename-column-1.sql (+1/-0)
To merge this branch: bzr merge lp:~oontvoo/akiban-sql-parser/columnRenameErrorMsg
Reviewer Review Type Date Requested Status
Nathan Williams Approve
Review via email: mp+146236@code.launchpad.net

Description of the change

fix NodeToString to produce the correct presentation of a Rename-Column node.

RENAME-COLUMN isn't supported but it shouldn't throw a NullPointerException from NodeToString.java

The NPE came from node.getNewTableName(), because not all RenameNode has a non-null value for getNewTableName().

To post a comment you must log in.
Revision history for this message
Nathan Williams (nwilliams) wrote :

As described.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/main/java/com/akiban/sql/unparser/NodeToString.java'
2--- src/main/java/com/akiban/sql/unparser/NodeToString.java 2013-01-07 20:39:53 +0000
3+++ src/main/java/com/akiban/sql/unparser/NodeToString.java 2013-02-01 22:14:20 +0000
4@@ -423,7 +423,8 @@
5 "RENAME COLUMN " + node.getOldObjectName() +
6 " TO " + node.getNewObjectName();
7 }
8- else if (node.getRenameType() == RenameNode.RenameType.INDEX) {
9+ else if (node.getRenameType() == RenameNode.RenameType.INDEX
10+ || node.getRenameType() == RenameNode.RenameType.COLUMN) {
11 if (node.getObjectName() == null) {
12 return node.statementToString() + " " + node.getOldObjectName() +
13 " TO " + node.getNewObjectName();
14
15=== added file 'src/test/resources/com/akiban/sql/unparser/rename-column-1.expected'
16--- src/test/resources/com/akiban/sql/unparser/rename-column-1.expected 1970-01-01 00:00:00 +0000
17+++ src/test/resources/com/akiban/sql/unparser/rename-column-1.expected 2013-02-01 22:14:20 +0000
18@@ -0,0 +1,1 @@
19+RENAME COLUMN t.c TO d
20\ No newline at end of file
21
22=== added file 'src/test/resources/com/akiban/sql/unparser/rename-column-1.sql'
23--- src/test/resources/com/akiban/sql/unparser/rename-column-1.sql 1970-01-01 00:00:00 +0000
24+++ src/test/resources/com/akiban/sql/unparser/rename-column-1.sql 2013-02-01 22:14:20 +0000
25@@ -0,0 +1,1 @@
26+RENAME COLUMN t.c TO d
27\ No newline at end of file

Subscribers

People subscribed via source and target branches

to all changes: