diff --git a/backend/src/main/java/io/dataease/listener/DataSourceInitStartListener.java b/backend/src/main/java/io/dataease/listener/DataSourceInitStartListener.java index bc53c1b879..fed96e7708 100644 --- a/backend/src/main/java/io/dataease/listener/DataSourceInitStartListener.java +++ b/backend/src/main/java/io/dataease/listener/DataSourceInitStartListener.java @@ -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 joins = plainSelect.getJoins(); if (joins != null) { + List 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 joinsList = new ArrayList<>(); join.setRightItem(subSelect); joinsList.add(join); - plainSelect.setJoins(joinsList); } } + plainSelect.setJoins(joinsList); } Expression expr = plainSelect.getWhere(); if (expr == null) { diff --git a/backend/src/main/resources/db/migration/V48__1.18.1.sql b/backend/src/main/resources/db/migration/V48__1.18.1.sql index e8297a6852..502f6845b3 100644 --- a/backend/src/main/resources/db/migration/V48__1.18.1.sql +++ b/backend/src/main/resources/db/migration/V48__1.18.1.sql @@ -1,3 +1,12 @@ UPDATE `my_plugin` SET `version` = '1.18.1' -where `plugin_id` > 0 and `store` = 'default' and `version` = '1.18.0'; \ No newline at end of file +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 '数据源名称' ;