center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge pull request #4277 from dataease/pr@dev@fixds

Browse Source 
Pr@dev@fixds
This commit is contained in:
taojinlong 2023-01-04 15:19:54 +08:00 committed by GitHub
commit 35812f30ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/src/main/java/io/dataease/provider/query/pg/PgQueryProvider.java
View File

@ -803,8 +803,8 @@ public class PgQueryProvider extends QueryProvider {
public String getTotalCount(boolean isTable, String sql, Datasource ds) {
if(isTable){
String schema = new Gson().fromJson(ds.getConfiguration(), JdbcConfiguration.class).getSchema();
String tableWithSchema = String.format(SqlServerSQLConstants.KEYWORD_TABLE, schema) + "." + String.format(SqlServerSQLConstants.KEYWORD_TABLE, sql);
return "SELECT COUNT(*) from " + String.format(PgConstants.KEYWORD_TABLE, tableWithSchema);
String tableWithSchema = String.format(PgConstants.KEYWORD_TABLE, schema) + "." + String.format(PgConstants.KEYWORD_TABLE, sql);
return "SELECT COUNT(*) from " + tableWithSchema;
}else {
return "SELECT COUNT(*) from ( " + sql + " ) DE_COUNT_TEMP";
}

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

@ -208,7 +208,7 @@ public class ExtractDataService {
for (DatasetTableField oldField : oldFields) {
boolean delete = true;
for (DatasetTableField datasetTableField : datasetTableFields) {
if (oldField.getDataeaseName().equalsIgnoreCase(datasetTableField.getDataeaseName()) && oldField.getDeExtractType().equals(datasetTableField.getDeExtractType())) {
if (oldField.getDataeaseName().equalsIgnoreCase(datasetTableField.getDataeaseName())) {
delete = false;
}
}
@ -220,7 +220,7 @@ public class ExtractDataService {
for (DatasetTableField datasetTableField : datasetTableFields) {
boolean add = true;
for (DatasetTableField oldField : oldFields) {
if (oldField.getDataeaseName().equalsIgnoreCase(datasetTableField.getDataeaseName()) && oldField.getDeExtractType().equals(datasetTableField.getDeExtractType())) {
if (oldField.getDataeaseName().equalsIgnoreCase(datasetTableField.getDataeaseName())) {
add = false;
}
}

2
frontend/src/views/dataset/data/UpdateInfo.vue
View File

@ -940,7 +940,7 @@ export default {
this.sql = ''
return
}
if (this.incrementalConfig.incrementalAdd.length > 0) {
if (this.incrementalConfig?.incrementalAdd?.length > 0) {
this.incrementalUpdateType = 'incrementalAdd'
this.sql = this.incrementalConfig.incrementalAdd
} else {