From babf61f8e95574a40b7a7dfe1f72d26f6ea325a7 Mon Sep 17 00:00:00 2001 From: junjun Date: Thu, 18 Jan 2024 10:04:39 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BF=AE=E5=A4=8D=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E9=9B=86=E9=A2=84=E8=A7=88=E6=8A=A5=E9=94=99=E6=8F=90?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/dataease/datasource/provider/CalciteProvider.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/core-backend/src/main/java/io/dataease/datasource/provider/CalciteProvider.java b/core/core-backend/src/main/java/io/dataease/datasource/provider/CalciteProvider.java index 43438cb658..797bc92009 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/provider/CalciteProvider.java +++ b/core/core-backend/src/main/java/io/dataease/datasource/provider/CalciteProvider.java @@ -173,7 +173,7 @@ public class CalciteProvider { datasetTableFields.add(tableField); } list = getDataResult(resultSet); - } catch (Exception e) { + } catch (Exception | AssertionError e) { DEException.throwException(Translator.get("i18n_fetch_error") + e.getMessage()); } finally { try { @@ -255,7 +255,7 @@ public class CalciteProvider { DatasourceConfiguration configuration = null; DatasourceType datasourceType = DatasourceType.valueOf(ds.getType()); try { - if(rootSchema.getSubSchema(ds.getSchemaAlias()) != null){ + if (rootSchema.getSubSchema(ds.getSchemaAlias()) != null) { JdbcSchema jdbcSchema = rootSchema.getSubSchema(ds.getSchemaAlias()).unwrap(JdbcSchema.class); BasicDataSource basicDataSource = (BasicDataSource) jdbcSchema.getDataSource(); basicDataSource.close();