diff --git a/dms-api/src/main/java/com/basedt/dms/api/vo/ResultSetVO.java b/dms-api/src/main/java/com/basedt/dms/api/vo/ResultSetVO.java index 88bbb78..7746574 100644 --- a/dms-api/src/main/java/com/basedt/dms/api/vo/ResultSetVO.java +++ b/dms-api/src/main/java/com/basedt/dms/api/vo/ResultSetVO.java @@ -46,7 +46,7 @@ public class ResultSetVO { private List data; public ResultSetVO(ResultSet rs, Boolean editable) throws SQLException { - ResultSetDynaClass resultSetDynaClass = new ResultSetDynaClass(rs); + ResultSetDynaClass resultSetDynaClass = new ResultSetDynaClass(rs, true, true); DynaProperty[] cols = resultSetDynaClass.getDynaProperties(); this.columns = new ArrayList<>(cols.length); for (DynaProperty col : cols) { diff --git a/dms-plugins/dms-plugins-datasource/pom.xml b/dms-plugins/dms-plugins-datasource/pom.xml index 684aa4e..d1de15e 100644 --- a/dms-plugins/dms-plugins-datasource/pom.xml +++ b/dms-plugins/dms-plugins-datasource/pom.xml @@ -28,6 +28,11 @@ druid-spring-boot-3-starter + + mysql + mysql-connector-java + + com.oracle.database.jdbc ojdbc8 diff --git a/dms-plugins/dms-plugins-datasource/src/main/java/com/basedt/dms/plugins/datasource/impl/mysql/MysqlPluginImpl.java b/dms-plugins/dms-plugins-datasource/src/main/java/com/basedt/dms/plugins/datasource/impl/mysql/MysqlPluginImpl.java index 5f0ddf9..c099a66 100644 --- a/dms-plugins/dms-plugins-datasource/src/main/java/com/basedt/dms/plugins/datasource/impl/mysql/MysqlPluginImpl.java +++ b/dms-plugins/dms-plugins-datasource/src/main/java/com/basedt/dms/plugins/datasource/impl/mysql/MysqlPluginImpl.java @@ -27,7 +27,6 @@ import com.basedt.dms.plugins.datasource.*; import com.basedt.dms.plugins.datasource.dto.ColumnDTO; import com.basedt.dms.plugins.datasource.enums.DataSourceType; -import com.basedt.dms.plugins.datasource.impl.jdbc.JdbcDataTypeMapper; import com.google.auto.service.AutoService; import lombok.SneakyThrows; @@ -55,8 +54,8 @@ public MysqlPluginImpl(Properties props) { init(); } - public MysqlPluginImpl(String dataSourceName,String hostName, Integer port, String databaseName, String userName, String password, Map attributes) { - super(dataSourceName,hostName, port, databaseName, userName, password, attributes); + public MysqlPluginImpl(String dataSourceName, String hostName, Integer port, String databaseName, String userName, String password, Map attributes) { + super(dataSourceName, hostName, port, databaseName, userName, password, attributes); init(); } @@ -81,7 +80,7 @@ public CatalogHandler getCatalogHandler() { @Override public TableHandler getTableHandler() { MysqlTableHandler handler = new MysqlTableHandler(); - handler.initialize(getDataSource(), new HashMap<>(),new MysqlDataTypeMapper(),getIndexHandler()); + handler.initialize(getDataSource(), new HashMap<>(), new MysqlDataTypeMapper(), getIndexHandler()); return handler; } diff --git a/pom.xml b/pom.xml index dd68263..1fd408a 100644 --- a/pom.xml +++ b/pom.xml @@ -55,10 +55,10 @@ 1.9.1 3.3.9 1.2.24 - 8.0.28 + 8.0.33 42.3.3 31.0-jre - 1.9.4 + 1.11.0 5.8.36 0.1.0 0.1.1