Github user jtaylor-sfdc commented on a diff in the pull request:
https://github.com/apache/incubator-phoenix/pull/23#discussion_r11142260
--- Diff: phoenix-core/src/main/antlr3/PhoenixSQL.g ---
@@ -629,24 +629,29 @@ parseOrderByField returns [OrderByNode ret]
parseFrom returns [List<TableNode> ret]
@init{ret = new ArrayList<TableNode>(4); }
- : t=table_ref {$ret.add(t);} (s=sub_table_ref { $ret.add(s); })*
- ;
-
-sub_table_ref returns [TableNode ret]
- : COMMA t=table_ref { $ret = t; }
- | t=join_spec { $ret = t; }
+ : t=table_ref {$ret.add(t);} (COMMA s=table_ref { $ret.add(s); })*
;
table_ref returns [TableNode ret]
+ : t=single_table_ref p=join_parts { $ret = factory.table(t, p); }
+ ;
+
+single_table_ref returns [TableNode ret]
: n=bind_name ((AS)? alias=identifier)? { $ret =
factory.bindTable(alias, factory.table(null,n)); } // TODO: review
| t=from_table_name ((AS)? alias=identifier)? (LPAREN
cdefs=dyn_column_defs RPAREN)? { $ret = factory.namedTable(alias,t,cdefs); }
| LPAREN SELECT s=hinted_select_node RPAREN ((AS)?
alias=identifier)? { $ret = factory.derivedTable(alias, s); }
;
-join_spec returns [TableNode ret]
- : j=join_type JOIN t=table_ref ON e=expression { $ret =
factory.join(j, e, t); }
- ;
+join_parts returns [List<Pair<Pair<JoinTableNode.JoinType,
ParseNode>,TableNode>> ret]
+@init{ret = new ArrayList<Pair<Pair<JoinTableNode.JoinType,
ParseNode>,TableNode>>(4); }
+ : (p=join_part { $ret.add(p); })*
+ ;
+join_part returns [Pair<Pair<JoinTableNode.JoinType, ParseNode>,TableNode>
ret]
--- End diff --
How about a JoinPartNode instead of nested Pairs?
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
