Repository: phoenix Updated Branches: refs/heads/calcite 826f0af64 -> 7cfe49114
Update Parser.tdd and pom.xml to go with the lastest Calcite version Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/7cfe4911 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/7cfe4911 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/7cfe4911 Branch: refs/heads/calcite Commit: 7cfe49114875de263f50ccd6d1c73a915f353d3a Parents: 826f0af Author: maryannxue <maryann....@gmail.com> Authored: Tue Jun 7 22:36:16 2016 -0400 Committer: maryannxue <maryann....@gmail.com> Committed: Tue Jun 7 22:36:16 2016 -0400 ---------------------------------------------------------------------- phoenix-core/src/main/codegen/data/Parser.tdd | 4 ++++ pom.xml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/7cfe4911/phoenix-core/src/main/codegen/data/Parser.tdd ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/codegen/data/Parser.tdd b/phoenix-core/src/main/codegen/data/Parser.tdd index f58f65e..1ee5c3a 100644 --- a/phoenix-core/src/main/codegen/data/Parser.tdd +++ b/phoenix-core/src/main/codegen/data/Parser.tdd @@ -36,6 +36,10 @@ "SPLIT" ] + # List of keywords from "keywords" section that are not reserved. + nonReservedKeywords: [ + ] + # List of methods for parsing custom SQL statements. statementParserMethods: [ "SqlCommit()", http://git-wip-us.apache.org/repos/asf/phoenix/blob/7cfe4911/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 009b2f2..8e6e5c9 100644 --- a/pom.xml +++ b/pom.xml @@ -91,7 +91,7 @@ <!-- Do not change jodatime.version until HBASE-15199 is fixed --> <jodatime.version>1.6</jodatime.version> <joni.version>2.1.2</joni.version> - <avatica.version>1.7.1</avatica.version> + <avatica.version>1.8.0</avatica.version> <calcite.version>1.8.0-SNAPSHOT</calcite.version> <jettyVersion>8.1.7.v20120910</jettyVersion> <tephra.version>0.7.0</tephra.version>
