Repository: calcite Updated Branches: refs/heads/master 08647e71e -> d943a4c16
Attempt to workaround javac issue by manual inlining of parseQuery Project: http://git-wip-us.apache.org/repos/asf/calcite/repo Commit: http://git-wip-us.apache.org/repos/asf/calcite/commit/d943a4c1 Tree: http://git-wip-us.apache.org/repos/asf/calcite/tree/d943a4c1 Diff: http://git-wip-us.apache.org/repos/asf/calcite/diff/d943a4c1 Branch: refs/heads/master Commit: d943a4c165a6541366750751b6aa50c2412cdacc Parents: 08647e7 Author: Vladimir Sitnikov <[email protected]> Authored: Sun Jan 10 11:00:50 2016 +0300 Committer: Vladimir Sitnikov <[email protected]> Committed: Sun Jan 10 11:00:50 2016 +0300 ---------------------------------------------------------------------- .../apache/calcite/sql/parser/SqlParser.java | 22 ++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/calcite/blob/d943a4c1/core/src/main/java/org/apache/calcite/sql/parser/SqlParser.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/calcite/sql/parser/SqlParser.java b/core/src/main/java/org/apache/calcite/sql/parser/SqlParser.java index e1bda73..abd2d03 100644 --- a/core/src/main/java/org/apache/calcite/sql/parser/SqlParser.java +++ b/core/src/main/java/org/apache/calcite/sql/parser/SqlParser.java @@ -143,7 +143,16 @@ public class SqlParser { */ public SqlNode parseQuery(String sql) throws SqlParseException { parser.ReInit(new StringReader(sql)); - return parseQuery(); + try { + return parser.parseSqlStmtEof(); + } catch (Throwable ex) { + if ((ex instanceof CalciteContextException) + && (originalInput != null)) { + ((CalciteContextException) ex).setOriginalStatement( + originalInput); + } + throw parser.normalizeException(ex); + } } /** @@ -153,7 +162,16 @@ public class SqlParser { * @throws SqlParseException if there is a parse error */ public SqlNode parseStmt() throws SqlParseException { - return parseQuery(); + try { + return parser.parseSqlStmtEof(); + } catch (Throwable ex) { + if ((ex instanceof CalciteContextException) + && (originalInput != null)) { + ((CalciteContextException) ex).setOriginalStatement( + originalInput); + } + throw parser.normalizeException(ex); + } } /**
