From 389e323289cb877383098aaa962f7120f1eea1ab Mon Sep 17 00:00:00 2001 From: zhangstar333 <87313068+zhangstar333@users.noreply.github.com> Date: Sat, 31 Dec 2022 12:48:26 +0800 Subject: [PATCH] [vectorized](jdbc) fix external table of oracle have keyworld column (#15487) if column name is keyword of oracle, the query will report error --- docs/en/docs/ecosystem/external-table/jdbc-of-doris.md | 2 ++ docs/zh-CN/docs/ecosystem/external-table/jdbc-of-doris.md | 1 + .../src/main/java/org/apache/doris/catalog/OdbcTable.java | 7 +++++++ .../test/java/org/apache/doris/planner/QueryPlanTest.java | 4 ++-- 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/docs/en/docs/ecosystem/external-table/jdbc-of-doris.md b/docs/en/docs/ecosystem/external-table/jdbc-of-doris.md index d2479131bd9a08..74e0c368b30f83 100644 --- a/docs/en/docs/ecosystem/external-table/jdbc-of-doris.md +++ b/docs/en/docs/ecosystem/external-table/jdbc-of-doris.md @@ -101,6 +101,8 @@ Parameter Description： ``` select * from mysql_table where k1 > 1000 and k3 ='term'; ``` +Because it is possible to use keywords in the database as column name, in order to solve this problem, escape characters will be automatically added to field names and table names in SQL statements according to the standards of each database. For example, MYSQL (``), PostgreSQL (""), SQLServer ([]), and ORACLE (""), But this may cause case sensitivity of field names. You can check the query statements issued to each database after escape through explain SQL. + ### Data write After the JDBC external table is create in Doris, the data can be written directly by the `insert into` statement, the query results of Doris can be written to the JDBC external table, or the data can be imported from one JDBC table to another. diff --git a/docs/zh-CN/docs/ecosystem/external-table/jdbc-of-doris.md b/docs/zh-CN/docs/ecosystem/external-table/jdbc-of-doris.md index 68e63682aa308d..b60a3f5ec4ac36 100644 --- a/docs/zh-CN/docs/ecosystem/external-table/jdbc-of-doris.md +++ b/docs/zh-CN/docs/ecosystem/external-table/jdbc-of-doris.md @@ -87,6 +87,7 @@ PROPERTIES ( ``` select * from mysql_table where k1 > 1000 and k3 ='term'; ``` +由于可能存在使用数据库内部的关键字作为字段名，为解决这种状况下仍能正确查询，所以在SQL语句中，会根据各个数据库的标准自动在字段名与表名上加上转义符。例如 MYSQL(``)、PostgreSQL("")、SQLServer([])、ORACLE("")，所以此时可能会造成字段名的大小写敏感，具体可以通过explain sql，查看转义后下发到各个数据库的查询语句。 ### 数据写入 diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/OdbcTable.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/OdbcTable.java index b2464c257fa9aa..562f4d7807df31 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/catalog/OdbcTable.java +++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/OdbcTable.java @@ -96,6 +96,11 @@ private static String psqlProperName(String name) { return list.stream().map(s -> "\"" + s + "\"").collect(Collectors.joining(".")); } + private static String oracleProperName(String name) { + List list = Arrays.asList(name.split("\\.")); + return list.stream().map(s -> "\"" + s.toUpperCase() + "\"").collect(Collectors.joining(".")); + } + public static String databaseProperName(TOdbcTableType tableType, String name) { switch (tableType) { case MYSQL: @@ -104,6 +109,8 @@ public static String databaseProperName(TOdbcTableType tableType, String name) { return mssqlProperName(name); case POSTGRESQL: return psqlProperName(name); + case ORACLE: + return oracleProperName(name); default: return name; } diff --git a/fe/fe-core/src/test/java/org/apache/doris/planner/QueryPlanTest.java b/fe/fe-core/src/test/java/org/apache/doris/planner/QueryPlanTest.java index 914bc338bc7881..4f41e70c456513 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/planner/QueryPlanTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/planner/QueryPlanTest.java @@ -1312,7 +1312,7 @@ public void testPushDownOfOdbcTable() throws Exception { // this table is Oracle ODBC table, so abs(k1) should not be pushed down queryStr = "explain select * from odbc_oracle where k1 > 10 and abs(k1) > 10"; explainString = getSQLPlanOrErrorMsg(queryStr); - Assert.assertTrue(explainString.contains("k1 > 10")); + Assert.assertTrue(explainString.contains("\"K1\" > 10")); Assert.assertTrue(!explainString.contains("abs(k1) > 10")); } @@ -1352,7 +1352,7 @@ public void testOdbcSink() throws Exception { String explainString = getSQLPlanOrErrorMsg(queryStr); Assert.assertTrue(explainString.contains("TABLENAME IN DORIS: odbc_oracle")); Assert.assertTrue(explainString.contains("TABLE TYPE: ORACLE")); - Assert.assertTrue(explainString.contains("TABLENAME OF EXTERNAL TABLE: tbl1")); + Assert.assertTrue(explainString.contains("TABLENAME OF EXTERNAL TABLE: \"TBL1\"")); // enable transaction of ODBC Sink Deencapsulation.setField(connectContext.getSessionVariable(), "enableOdbcTransaction", true);