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 070e3c0e6c..a6a421b4a3 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 @@ -47,7 +47,6 @@ import java.util.stream.Collectors; @Component("calciteProvider") public class CalciteProvider { - //TODO mongo impala es hive @Resource protected CoreDatasourceMapper coreDatasourceMapper; @Resource @@ -93,7 +92,7 @@ public class CalciteProvider { schemas.add(resultSet.getString(1)); } } catch (Exception e) { - DEException.throwException(e); + DEException.throwException(e.getMessage()); } return schemas; } @@ -107,7 +106,7 @@ public class CalciteProvider { tables.add(getTableDesc(datasourceRequest, resultSet)); } } catch (Exception e) { - DEException.throwException(e); + DEException.throwException(e.getMessage()); } } return tables; @@ -145,15 +144,11 @@ public class CalciteProvider { String querySql = getTablesSql(datasourceRequest).get(0); try (Connection con = getConnection(datasourceRequest.getDatasource()); Statement statement = getStatement(con, 30); ResultSet resultSet = statement.executeQuery(querySql)) { } catch (Exception e) { - DEException.throwException(e); + DEException.throwException(e.getMessage()); } return "Success"; } - public List getTableFields(DatasourceRequest datasourceRequest) throws Exception { - return null; - } - public Map fetchResultField(DatasourceRequest datasourceRequest) throws DEException { List datasetTableFields = new ArrayList<>(); List list = new LinkedList<>(); @@ -242,7 +237,7 @@ public class CalciteProvider { Class.forName("org.apache.calcite.jdbc.Driver"); connection = DriverManager.getConnection("jdbc:calcite:", info); } catch (Exception e) { - DEException.throwException(e); + DEException.throwException(e.getMessage()); } return connection; } @@ -433,7 +428,7 @@ public class CalciteProvider { list.add(row); } } catch (Exception e) { - DEException.throwException(e); + DEException.throwException(e.getMessage()); } return list; } @@ -573,7 +568,7 @@ public class CalciteProvider { Driver driverClass = (Driver) jdbcClassLoader.loadClass(driverClassName).newInstance(); conn = driverClass.connect(configuration.getJdbc(), props); } catch (Exception e) { - DEException.throwException(e); + DEException.throwException(e.getMessage()); } return conn; } @@ -587,7 +582,7 @@ public class CalciteProvider { stat = connection.createStatement(); stat.setQueryTimeout(queryTimeout); } catch (Exception e) { - DEException.throwException(e); + DEException.throwException(e.getMessage()); } return stat; } @@ -640,7 +635,7 @@ public class CalciteProvider { customJdbcClassLoaders.put(coreDriver.getId(), customJdbcClassLoader); return customJdbcClassLoader; } catch (Exception e) { - DEException.throwException(e); + DEException.throwException(e.getMessage()); } return null; } @@ -691,7 +686,7 @@ public class CalciteProvider { SchemaPlus rootSchema = buildSchema(datasourceRequest, calciteConnection); addCustomFunctions(rootSchema); } catch (Exception e) { - DEException.throwException(e); + DEException.throwException(e.getMessage()); } } @@ -709,7 +704,7 @@ public class CalciteProvider { rootSchema.removeSubSchema(datasourceSchemaDTO.getSchemaAlias()); } } catch (Exception e) { - DEException.throwException(e); + DEException.throwException(e.getMessage()); } } diff --git a/core/core-backend/src/main/java/io/dataease/datasource/type/Mysql.java b/core/core-backend/src/main/java/io/dataease/datasource/type/Mysql.java index aa4290a444..fad120d167 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/type/Mysql.java +++ b/core/core-backend/src/main/java/io/dataease/datasource/type/Mysql.java @@ -1,6 +1,7 @@ package io.dataease.datasource.type; import io.dataease.api.ds.vo.DatasourceConfiguration; +import io.dataease.exception.DEException; import lombok.Data; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Component; @@ -25,7 +26,7 @@ public class Mysql extends DatasourceConfiguration { } else { for (String illegalParameter : illegalParameters) { if (getExtraParams().toLowerCase().contains(illegalParameter.toLowerCase())) { - throw new RuntimeException("Illegal parameter: " + illegalParameter); + DEException.throwException("Illegal parameter: " + illegalParameter); } }