You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by li...@apache.org on 2016/10/20 23:22:47 UTC
[23/50] [abbrv] kylin git commit: KYLIN-2108: Support usage of schema
name "default" in SQL
KYLIN-2108: Support usage of schema name "default" in SQL
Signed-off-by: Li Yang <li...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/100487fc
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/100487fc
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/100487fc
Branch: refs/heads/KYLIN-1971
Commit: 100487fc209542b4aa226e0435d22b09cf9750c5
Parents: 047a236
Author: Yifan Zhang <ev...@gmail.com>
Authored: Wed Oct 19 15:23:26 2016 +0800
Committer: Li Yang <li...@apache.org>
Committed: Wed Oct 19 16:46:37 2016 +0800
----------------------------------------------------------------------
.../src/main/java/org/apache/kylin/rest/util/QueryUtil.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/100487fc/server-base/src/main/java/org/apache/kylin/rest/util/QueryUtil.java
----------------------------------------------------------------------
diff --git a/server-base/src/main/java/org/apache/kylin/rest/util/QueryUtil.java b/server-base/src/main/java/org/apache/kylin/rest/util/QueryUtil.java
index 210ebc8..cc9d32e 100644
--- a/server-base/src/main/java/org/apache/kylin/rest/util/QueryUtil.java
+++ b/server-base/src/main/java/org/apache/kylin/rest/util/QueryUtil.java
@@ -105,6 +105,10 @@ public class QueryUtil {
String sql = sqlRequest.getSql();
sql = sql.trim();
sql = sql.replace("\r", " ").replace("\n", System.getProperty("line.separator"));
+
+ // KYLIN-2108, DEFAULT is hive default database, but a Calcite keyword too, needs quote
+ sql = sql.replace("DEFAULT.", "\"DEFAULT\".");
+ sql = sql.replace("default.", "\"default\".");
while (sql.endsWith(";"))
sql = sql.substring(0, sql.length() - 1);