From ef9db3c5c6b5b590448717a39fb5ff359c7e401e Mon Sep 17 00:00:00 2001 From: taojinlong Date: Mon, 9 Jan 2023 16:24:17 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E5=A4=A7=E5=B0=8F=E5=86=99=E5=AF=BC?= =?UTF-8?q?=E8=87=B4=E6=8C=87=E6=A0=87=E5=92=8C=E7=BB=B4=E5=BA=A6=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E5=88=87=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/db/migration/V48__1.18.1.sql | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) 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 '数据源名称' ; From c1bd98eccbd6c913f7e358cb7c18b5bbfe749013 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Mon, 9 Jan 2023 16:33:52 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E9=9B=86):=20?= =?UTF-8?q?=E5=88=9B=E5=BB=BAjoin=E8=AF=AD=E5=8F=A5=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E5=8C=96=E6=97=A0=E6=B3=95=E4=BF=9D=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/dataease/service/dataset/DataSetTableService.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java index 01fe847d0a..c7244f0ed6 100644 --- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java +++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java @@ -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 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) { From 70073bba39619fe223648777a9404b02cdf81d7c Mon Sep 17 00:00:00 2001 From: taojinlong Date: Mon, 9 Jan 2023 17:42:23 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E5=90=AF=E5=8A=A8=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E6=B8=85=E7=90=86=E5=BC=95=E6=93=8E=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/dataease/listener/DataSourceInitStartListener.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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