dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #7772 from dataease/pr@dev@fixSql

Browse Source 
fix: 定时同步任务支持在历史数据变动后增量更新到doris中 #6276
This commit is contained in:
taojinlong 2024-01-23 17:35:45 +08:00 committed by GitHub
commit 43b15ca56d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
View File

@ -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()); dataMeta = new DatabaseMeta("db", "MSSQLNATIVE", "Native", sqlServerConfiguration.getHost().trim(), sqlServerConfiguration.getDataBase(), sqlServerConfiguration.getPort().toString(), sqlServerConfiguration.getUsername(), sqlServerConfiguration.getPassword());
transMeta.addDatabase(dataMeta); transMeta.addDatabase(dataMeta);
inputSteps = inputStep(transMeta, selectSQL, sqlServerConfiguration); inputSteps = inputStep(transMeta, selectSQL, sqlServerConfiguration);
udjcStep = udjc(datasetTableFields, DatasourceTypes.sqlServer, sqlServerConfiguration); udjcStep = udjc(datasetTableFields, DatasourceTypes.sqlServer, sqlServerConfiguration, isSetKey);
break; break;
case pg: case pg:
PgConfiguration pgConfiguration = new Gson().fromJson(datasource.getConfiguration(), PgConfiguration.class); 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()); dataMeta = new DatabaseMeta("db", "POSTGRESQL", "Native", pgConfiguration.getHost().trim(), pgConfiguration.getDataBase(), pgConfiguration.getPort().toString(), pgConfiguration.getUsername(), pgConfiguration.getPassword());
transMeta.addDatabase(dataMeta); transMeta.addDatabase(dataMeta);
inputSteps = inputStep(transMeta, selectSQL, pgConfiguration); inputSteps = inputStep(transMeta, selectSQL, pgConfiguration);
udjcStep = udjc(datasetTableFields, DatasourceTypes.pg, pgConfiguration); udjcStep = udjc(datasetTableFields, DatasourceTypes.pg, pgConfiguration, isSetKey);
break; break;
case oracle: case oracle:
OracleConfiguration oracleConfiguration = new Gson().fromJson(datasource.getConfiguration(), OracleConfiguration.class); OracleConfiguration oracleConfiguration = new Gson().fromJson(datasource.getConfiguration(), OracleConfiguration.class);
@ -1039,7 +1039,7 @@ public class ExtractDataService {
} }
transMeta.addDatabase(dataMeta); transMeta.addDatabase(dataMeta);
inputSteps = inputStep(transMeta, selectSQL, oracleConfiguration); inputSteps = inputStep(transMeta, selectSQL, oracleConfiguration);
udjcStep = udjc(datasetTableFields, DatasourceTypes.oracle, oracleConfiguration); udjcStep = udjc(datasetTableFields, DatasourceTypes.oracle, oracleConfiguration, isSetKey);
break; break;
case ck: case ck:
CHConfiguration chConfiguration = new Gson().fromJson(datasource.getConfiguration(), CHConfiguration.class); CHConfiguration chConfiguration = new Gson().fromJson(datasource.getConfiguration(), CHConfiguration.class);
@ -1047,7 +1047,7 @@ public class ExtractDataService {
dataMeta.setDatabaseType("Clickhouse"); dataMeta.setDatabaseType("Clickhouse");
transMeta.addDatabase(dataMeta); transMeta.addDatabase(dataMeta);
inputSteps = inputStep(transMeta, selectSQL, chConfiguration); inputSteps = inputStep(transMeta, selectSQL, chConfiguration);
udjcStep = udjc(datasetTableFields, DatasourceTypes.ck, chConfiguration); udjcStep = udjc(datasetTableFields, DatasourceTypes.ck, chConfiguration, isSetKey);
break; break;
case db2: case db2:
Db2Configuration db2Configuration = new Gson().fromJson(datasource.getConfiguration(), Db2Configuration.class); Db2Configuration db2Configuration = new Gson().fromJson(datasource.getConfiguration(), Db2Configuration.class);
@ -1055,11 +1055,11 @@ public class ExtractDataService {
dataMeta.setDatabaseType("DB2"); dataMeta.setDatabaseType("DB2");
transMeta.addDatabase(dataMeta); transMeta.addDatabase(dataMeta);
inputSteps = inputStep(transMeta, selectSQL, db2Configuration); inputSteps = inputStep(transMeta, selectSQL, db2Configuration);
udjcStep = udjc(datasetTableFields, DatasourceTypes.db2, db2Configuration); udjcStep = udjc(datasetTableFields, DatasourceTypes.db2, db2Configuration, isSetKey);
break; break;
case excel: case excel:
inputSteps = excelInputStep(datasetTable.getInfo(), datasetTableFields); inputSteps = excelInputStep(datasetTable.getInfo(), datasetTableFields);
udjcStep = udjc(datasetTableFields, DatasourceTypes.excel, null); udjcStep = udjc(datasetTableFields, DatasourceTypes.excel, null, isSetKey);
default: default:
break; break;
} }