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

Merge pull request #4325 from dataease/pr@dev@pages

Browse Source 
Pr@dev@pages
This commit is contained in:
taojinlong 2023-01-09 18:32:43 +08:00 committed by GitHub
commit 655cbed9d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
backend/src/main/java/io/dataease/listener/DataSourceInitStartListener.java
View File

@ -1,5 +1,6 @@
package io.dataease.listener;
import io.dataease.listener.util.CacheUtils;
import io.dataease.service.datasource.DatasourceService;
import io.dataease.service.dataset.DataSetTableService;
import io.dataease.service.engine.EngineService;
@ -25,7 +26,7 @@ public class DataSourceInitStartListener implements ApplicationListener<Applicat
datasourceService.initDsCheckJob();
dataSetTableService.updateDatasetTableStatus();
engineService.initSimpleEngine();
CacheUtils.removeAll("ENGINE");
}

8
backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
View File

@ -1119,12 +1119,13 @@ public class DataSetTableService {
if (fromItem.getAlias() == null) {
throw new Exception("Failed to parse sql, Every derived table must have its own alias！");
}
subSelect.setAlias(new Alias(fromItem.getAlias().toString()));
subSelect.setAlias(new Alias(fromItem.getAlias().toString(), false));
}
plainSelect.setFromItem(subSelect);
}
List<Join> joins = plainSelect.getJoins();
if (joins != null) {
List<Join> joinsList = new ArrayList<>();
for (Join join : joins) {
FromItem rightItem = join.getRightItem();
if (rightItem instanceof SubSelect) {
@ -1139,14 +1140,13 @@ public class DataSetTableService {
if (rightItem.getAlias() == null) {
throw new Exception("Failed to parse sql, Every derived table must have its own alias！");
}
subSelect.setAlias(new Alias(rightItem.getAlias().toString()));
subSelect.setAlias(new Alias(rightItem.getAlias().toString(), false));
}
List<Join> joinsList = new ArrayList<>();
join.setRightItem(subSelect);
joinsList.add(join);
plainSelect.setJoins(joinsList);
}
}
plainSelect.setJoins(joinsList);
}
Expression expr = plainSelect.getWhere();
if (expr == null) {

11
backend/src/main/resources/db/migration/V48__1.18.1.sql
View File

@ -1,3 +1,12 @@
UPDATE `my_plugin`
SET `version` = '1.18.1'
where `plugin_id` > 0 and `store` = 'default' and `version` = '1.18.0';
where `plugin_id` > 0 and `store` = 'default' and `version` = '1.18.0';
ALTER TABLE `dataset_table_field`
CHANGE COLUMN `origin_name` `origin_name` LONGTEXT BINARY NOT NULL COMMENT '原始字段名' ;
ALTER TABLE `dataset_table_field`
CHANGE COLUMN `name` `name` LONGTEXT BINARY NOT NULL COMMENT '字段名名' ;
ALTER TABLE `datasource`
CHANGE COLUMN `name` `name` VARCHAR(50) BINARY NOT NULL COMMENT '数据源名称' ;