Merge lp:~mmcm/akiban-sql-parser/from-table-set-correlation-name into lp:~akiban-technologies/akiban-sql-parser/trunk

Proposed by Mike McMahon
Status: Merged
Approved by: Nathan Williams
Approved revision: 282
Merged at revision: 281
Proposed branch: lp:~mmcm/akiban-sql-parser/from-table-set-correlation-name
Merge into: lp:~akiban-technologies/akiban-sql-parser/trunk
Diff against target: 30 lines (+8/-1)
2 files modified
src/main/java/com/akiban/sql/parser/FromTable.java (+7/-0)
src/main/java/com/akiban/sql/parser/ResultColumnList.java (+1/-1)
To merge this branch: bzr merge lp:~mmcm/akiban-sql-parser/from-table-set-correlation-name
Reviewer Review Type Date Requested Status
Nathan Williams Approve
Review via email: mp+142828@code.launchpad.net

Description of the change

Allow setting name of a derived table. Look up columns by name (such as in a derived table) case insensitively.

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

Simple enough.

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/parser/FromTable.java'
2--- src/main/java/com/akiban/sql/parser/FromTable.java 2012-11-07 17:49:31 +0000
3+++ src/main/java/com/akiban/sql/parser/FromTable.java 2013-01-11 03:56:22 +0000
4@@ -97,6 +97,13 @@
5 }
6
7 /**
8+ * Set this table's correlation name.
9+ */
10+ public void setCorrelationName(String correlationName) {
11+ this.correlationName = correlationName;
12+ }
13+
14+ /**
15 * Convert this object to a String. See comments in QueryTreeNode.java
16 * for how this should be done for tree printing.
17 *
18
19=== modified file 'src/main/java/com/akiban/sql/parser/ResultColumnList.java'
20--- src/main/java/com/akiban/sql/parser/ResultColumnList.java 2012-11-07 17:49:31 +0000
21+++ src/main/java/com/akiban/sql/parser/ResultColumnList.java 2013-01-11 03:56:22 +0000
22@@ -197,7 +197,7 @@
23 for (int index = 0; index < size; index++) {
24 ResultColumn resultColumn = get(index);
25
26- if (columnName.equals(resultColumn.getName())) {
27+ if (columnName.equalsIgnoreCase(resultColumn.getName())) {
28 return resultColumn;
29 }
30 }

Subscribers

People subscribed via source and target branches