From d9a32cb40f68ca0853e4eb27028b1f7d762a42a5 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Wed, 8 Mar 2023 16:18:16 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20ES=E6=96=B0=E5=BB=BA=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=E6=95=B0=E6=8D=AE=E9=9B=86,=E8=A1=A8?= =?UTF-8?q?=E5=90=8D=E5=90=AB=E6=9C=89-,=E5=87=BA=E7=8E=B0=E9=A2=84?= =?UTF-8?q?=E8=A7=88=E6=95=B0=E6=8D=AE=E5=A4=B1=E8=B4=A5=20#4315?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/dataease/provider/query/es/EsQueryProvider.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/backend/src/main/java/io/dataease/provider/query/es/EsQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/es/EsQueryProvider.java index ac2852a74b..019b09e61a 100644 --- a/backend/src/main/java/io/dataease/provider/query/es/EsQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/query/es/EsQueryProvider.java @@ -1328,4 +1328,9 @@ public class EsQueryProvider extends QueryProvider { public String getResultCount(boolean isTable, String sql, List xAxis, List fieldCustomFilter, List rowPermissionsTree, List extFilterRequestList, Datasource ds, ChartViewWithBLOBs view) { return null; } + + @Override + public String sqlForPreview(String table, Datasource ds) { + return "SELECT * FROM " + String.format(EsSqlLConstants.KEYWORD_TABLE, table); + } } From 461eb1ee6e02380f6f20bce5eefcdf23eb74d27c Mon Sep 17 00:00:00 2001 From: taojinlong Date: Wed, 8 Mar 2023 17:14:26 +0800 Subject: [PATCH 2/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 --- .../io/dataease/provider/datasource/JdbcProvider.java | 8 ++++++++ 1 file changed, 8 insertions(+) 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 beb65cab8a..18a6d5ae2d 100644 --- a/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java +++ b/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java @@ -777,6 +777,14 @@ public class JdbcProvider extends DefaultJdbcProvider { case StarRocks: MysqlConfiguration mysqlConfiguration = new Gson().fromJson(datasource.getConfiguration(), MysqlConfiguration.class); mysqlConfiguration.getJdbc(); + case redshift: + RedshiftConfiguration redshiftConfiguration = new Gson().fromJson(datasource.getConfiguration(), RedshiftConfiguration.class); + if(redshiftConfiguration.getDataBase().length() > 64 || redshiftConfiguration.getDataBase().length() < 1){ + throw new Exception("Invalid database name"); + } + if(!redshiftConfiguration.getDataBase().matches("\"^[a-z][a-z0-9_+.@-]*$\"")){ + throw new Exception("Invalid database name"); + } default: break; }