Github user marmbrus commented on a diff in the pull request: https://github.com/apache/spark/pull/11297#discussion_r56057116 --- Diff: sql/catalyst/src/main/antlr3/org/apache/spark/sql/catalyst/parser/FromClauseParser.g --- @@ -91,10 +91,17 @@ fromClause joinSource @init { gParent.pushMsg("join source", state); } @after { gParent.popMsg(state); } - : fromSource ( joinToken^ fromSource ( KW_ON! expression {$joinToken.start.getType() != COMMA}? )? )* + : fromSource ( joinToken^ fromSource ( joinCond {$joinToken.start.getType() != COMMA}? )? )* | uniqueJoinToken^ uniqueJoinSource (COMMA! uniqueJoinSource)+ ; +joinCond +@init { gParent.pushMsg("join expression list", state); } +@after { gParent.popMsg(state); } + : KW_ON! expression + | KW_USING LPAREN columnNameList RPAREN -> ^(TOK_USING columnNameList) + ; --- End diff -- /cc @hvanhovell
--- 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 infrastruct...@apache.org or file a JIRA ticket with INFRA. --- --------------------------------------------------------------------- To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org For additional commands, e-mail: reviews-h...@spark.apache.org