Following [CALCITE-2016], make SqlDotOperator code more similar to SqlAsOperator
Project: http://git-wip-us.apache.org/repos/asf/calcite/repo Commit: http://git-wip-us.apache.org/repos/asf/calcite/commit/bd141121 Tree: http://git-wip-us.apache.org/repos/asf/calcite/tree/bd141121 Diff: http://git-wip-us.apache.org/repos/asf/calcite/diff/bd141121 Branch: refs/heads/master Commit: bd14112100584a0106c4778047f64f276ff0d14b Parents: 237b627 Author: Julian Hyde <[email protected]> Authored: Mon Nov 20 12:00:15 2017 -0800 Committer: Julian Hyde <[email protected]> Committed: Mon Nov 20 14:48:40 2017 -0800 ---------------------------------------------------------------------- .../main/java/org/apache/calcite/sql/fun/SqlDotOperator.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/calcite/blob/bd141121/core/src/main/java/org/apache/calcite/sql/fun/SqlDotOperator.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/sql/fun/SqlDotOperator.java b/core/src/main/java/org/apache/calcite/sql/fun/SqlDotOperator.java index 45e9bd9..0878624 100644 --- a/core/src/main/java/org/apache/calcite/sql/fun/SqlDotOperator.java +++ b/core/src/main/java/org/apache/calcite/sql/fun/SqlDotOperator.java @@ -82,8 +82,12 @@ public class SqlDotOperator extends SqlSpecialOperator { @Override public <R> void acceptCall(SqlVisitor<R> visitor, SqlCall call, boolean onlyExpressions, SqlBasicVisitor.ArgHandler<R> argHandler) { - // Do not visit operands[1] here. - argHandler.visitChild(visitor, call, 0, call.operand(0)); + if (onlyExpressions) { + // Do not visit operands[1] -- it is not an expression. + argHandler.visitChild(visitor, call, 0, call.operand(0)); + } else { + super.acceptCall(visitor, call, onlyExpressions, argHandler); + } } @Override public RelDataType deriveType(SqlValidator validator,
