From 3f0936741428de2029cc5b9f1672011265ffe86e Mon Sep 17 00:00:00 2001 From: taojinlong Date: Thu, 7 Sep 2023 12:31:53 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20DB2=E6=95=B0=E6=8D=AE=E9=9B=86=EF=BC=8C?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E6=A0=B9=E6=8D=AE=E6=95=B0=E6=8D=AE=E6=BA=90?= =?UTF-8?q?=E4=BE=A7=E9=85=8D=E7=BD=AE=E7=9A=84schema=20=E8=BF=9B=E8=A1=8C?= =?UTF-8?q?=E6=AD=A3=E7=A1=AE=E7=9A=84=E8=AF=BB=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/datasource/Db2Configuration.java | 18 +++++++++++++----- .../provider/query/ck/CKQueryProvider.java | 7 +++++-- .../service/dataset/ExtractDataService.java | 2 +- 3 files changed, 19 insertions(+), 8 deletions(-) diff --git a/core/backend/src/main/java/io/dataease/dto/datasource/Db2Configuration.java b/core/backend/src/main/java/io/dataease/dto/datasource/Db2Configuration.java index 13a67421c9..5b7ea7d612 100644 --- a/core/backend/src/main/java/io/dataease/dto/datasource/Db2Configuration.java +++ b/core/backend/src/main/java/io/dataease/dto/datasource/Db2Configuration.java @@ -14,11 +14,19 @@ public class Db2Configuration extends JdbcConfiguration { public String getJdbc() { if(StringUtils.isEmpty(extraParams.trim())){ - return "jdbc:db2://HOSTNAME:PORT/DATABASE:currentSchema=SCHEMA;" - .replace("HOSTNAME", getHost().trim()) - .replace("PORT", getPort().toString().trim()) - .replace("DATABASE", getDataBase().trim() - .replace("SCHEMA",getSchema().trim())); + if (StringUtils.isEmpty(getSchema())) { + return "jdbc:db2://HOSTNAME:PORT/DATABASE:currentSchema=SCHEMA;" + .replace("HOSTNAME", getHost().trim()) + .replace("PORT", getPort().toString().trim()) + .replace("DATABASE", getDataBase().trim()); + } else { + return "jdbc:db2://HOSTNAME:PORT/DATABASE:currentSchema=SCHEMA;" + .replace("HOSTNAME", getHost().trim()) + .replace("PORT", getPort().toString().trim()) + .replace("DATABASE", getDataBase().trim()) + .replace("SCHEMA", getSchema().trim()); + } + }else { return "jdbc:hive2://HOSTNAME:PORT/DATABASE?EXTRA_PARAMS" .replace("HOSTNAME", getHost().trim()) diff --git a/core/backend/src/main/java/io/dataease/provider/query/ck/CKQueryProvider.java b/core/backend/src/main/java/io/dataease/provider/query/ck/CKQueryProvider.java index bd791c3563..18b8ed35d8 100644 --- a/core/backend/src/main/java/io/dataease/provider/query/ck/CKQueryProvider.java +++ b/core/backend/src/main/java/io/dataease/provider/query/ck/CKQueryProvider.java @@ -31,11 +31,9 @@ import org.stringtemplate.v4.STGroup; import org.stringtemplate.v4.STGroupFile; import javax.annotation.Resource; -import java.text.Format; import java.text.MessageFormat; import java.text.SimpleDateFormat; import java.util.*; -import java.util.concurrent.atomic.AtomicReference; import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Collectors; @@ -1415,6 +1413,11 @@ public class CKQueryProvider extends QueryProvider { } } + @Override + public String sqlForPreview(String table, Datasource ds) { + return "SELECT * FROM " + String.format(CKConstants.KEYWORD_TABLE, table); + } + public List dateformat() { return JSONArray.parseArray("[\n" + "{\"dateformat\": \"%Y%m%d\"},\n" + diff --git a/core/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java b/core/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java index 594b0479dd..ea634adeb7 100644 --- a/core/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java +++ b/core/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java @@ -211,7 +211,7 @@ public class ExtractDataService { for (DatasetTableField oldField : oldFields) { boolean delete = true; for (DatasetTableField datasetTableField : datasetTableFields) { - if (oldField.getDataeaseName().equalsIgnoreCase(datasetTableField.getDataeaseName())) { + if (oldField.getDataeaseName().equalsIgnoreCase(datasetTableField.getDataeaseName()) && oldField.getType().equalsIgnoreCase(datasetTableField.getType())) { delete = false; } }