From 8ac967b1930765c2d769c9b565011c9bd9d47022 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Thu, 11 May 2023 14:27:38 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E6=A0=A1=E9=AA=8C=20redshift=20data?= =?UTF-8?q?base=20name?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/io/dataease/provider/datasource/JdbcProvider.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java b/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java index 17ffcd33cf..2aea2a0317 100644 --- a/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java +++ b/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java @@ -787,7 +787,7 @@ public class JdbcProvider extends DefaultJdbcProvider { if(redshiftConfiguration.getDataBase().length() > 64 || redshiftConfiguration.getDataBase().length() < 1){ throw new Exception("Invalid database name"); } - if(!redshiftConfiguration.getDataBase().matches("\"^[a-z][a-z0-9_+.@-]*$\"")){ + if(!redshiftConfiguration.getDataBase().matches("^[a-z][a-z0-9_+.@-]*$")){ throw new Exception("Invalid database name"); } break; From 5a3830ef79ee92013d12fab4bff13d12cbaf33e3 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Thu, 11 May 2023 14:28:12 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E8=A7=A3=E6=9E=90sql=E5=87=BA?= =?UTF-8?q?=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/dataease/service/dataset/DataSetTableService.java | 5 ++--- 1 file changed, 2 insertions(+), 3 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 d432ffda22..15f0f5ced2 100644 --- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java +++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java @@ -1122,8 +1122,7 @@ public class DataSetTableService { SelectBody selectBody = ((SubSelect) fromItem).getSelectBody(); SubSelect subSelect = new SubSelect(); Select subSelectTmp = (Select) CCJSqlParserUtil.parse(removeVariables(selectBody.toString(), dsType)); - PlainSelect subPlainSelect = ((PlainSelect) subSelectTmp.getSelectBody()); - subSelect.setSelectBody(subPlainSelect); + subSelect.setSelectBody(subSelectTmp.getSelectBody()); if (dsType.equals(DatasourceTypes.oracle.getType())) { subSelect.setAlias(new Alias(fromItem.getAlias().toString(), false)); } else { @@ -1280,7 +1279,7 @@ public class DataSetTableService { QueryProvider qp = ProviderFactory.getQueryProvider(ds.getType()); String sqlAsTable = qp.createSQLPreview(sql, null); datasourceRequest.setQuery(sqlAsTable); - + System.out.println(sqlAsTable); Map result; try { datasetSqlLog.setStartTime(System.currentTimeMillis());