From 12843e278c1f96bf96c2ae65c34d1e8898249d57 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Tue, 23 Jan 2024 17:32:22 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=AE=9A=E6=97=B6=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=94=AF=E6=8C=81=E5=9C=A8=E5=8E=86=E5=8F=B2?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=8F=98=E5=8A=A8=E5=90=8E=E5=A2=9E=E9=87=8F?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=88=B0doris=E4=B8=AD=20#6276?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataease/service/dataset/ExtractDataService.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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 604792707f..948ee365fb 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 @@ -1020,14 +1020,14 @@ public class ExtractDataService { dataMeta = new DatabaseMeta("db", "MSSQLNATIVE", "Native", sqlServerConfiguration.getHost().trim(), sqlServerConfiguration.getDataBase(), sqlServerConfiguration.getPort().toString(), sqlServerConfiguration.getUsername(), sqlServerConfiguration.getPassword()); transMeta.addDatabase(dataMeta); inputSteps = inputStep(transMeta, selectSQL, sqlServerConfiguration); - udjcStep = udjc(datasetTableFields, DatasourceTypes.sqlServer, sqlServerConfiguration); + udjcStep = udjc(datasetTableFields, DatasourceTypes.sqlServer, sqlServerConfiguration, isSetKey); break; case pg: PgConfiguration pgConfiguration = new Gson().fromJson(datasource.getConfiguration(), PgConfiguration.class); dataMeta = new DatabaseMeta("db", "POSTGRESQL", "Native", pgConfiguration.getHost().trim(), pgConfiguration.getDataBase(), pgConfiguration.getPort().toString(), pgConfiguration.getUsername(), pgConfiguration.getPassword()); transMeta.addDatabase(dataMeta); inputSteps = inputStep(transMeta, selectSQL, pgConfiguration); - udjcStep = udjc(datasetTableFields, DatasourceTypes.pg, pgConfiguration); + udjcStep = udjc(datasetTableFields, DatasourceTypes.pg, pgConfiguration, isSetKey); break; case oracle: OracleConfiguration oracleConfiguration = new Gson().fromJson(datasource.getConfiguration(), OracleConfiguration.class); @@ -1039,7 +1039,7 @@ public class ExtractDataService { } transMeta.addDatabase(dataMeta); inputSteps = inputStep(transMeta, selectSQL, oracleConfiguration); - udjcStep = udjc(datasetTableFields, DatasourceTypes.oracle, oracleConfiguration); + udjcStep = udjc(datasetTableFields, DatasourceTypes.oracle, oracleConfiguration, isSetKey); break; case ck: CHConfiguration chConfiguration = new Gson().fromJson(datasource.getConfiguration(), CHConfiguration.class); @@ -1047,7 +1047,7 @@ public class ExtractDataService { dataMeta.setDatabaseType("Clickhouse"); transMeta.addDatabase(dataMeta); inputSteps = inputStep(transMeta, selectSQL, chConfiguration); - udjcStep = udjc(datasetTableFields, DatasourceTypes.ck, chConfiguration); + udjcStep = udjc(datasetTableFields, DatasourceTypes.ck, chConfiguration, isSetKey); break; case db2: Db2Configuration db2Configuration = new Gson().fromJson(datasource.getConfiguration(), Db2Configuration.class); @@ -1055,11 +1055,11 @@ public class ExtractDataService { dataMeta.setDatabaseType("DB2"); transMeta.addDatabase(dataMeta); inputSteps = inputStep(transMeta, selectSQL, db2Configuration); - udjcStep = udjc(datasetTableFields, DatasourceTypes.db2, db2Configuration); + udjcStep = udjc(datasetTableFields, DatasourceTypes.db2, db2Configuration, isSetKey); break; case excel: inputSteps = excelInputStep(datasetTable.getInfo(), datasetTableFields); - udjcStep = udjc(datasetTableFields, DatasourceTypes.excel, null); + udjcStep = udjc(datasetTableFields, DatasourceTypes.excel, null, isSetKey); default: break; }