Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public class ResultSetVO {
private List<JSONObject> 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) {
Expand Down
5 changes: 5 additions & 0 deletions dms-plugins/dms-plugins-datasource/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,11 @@
<artifactId>druid-spring-boot-3-starter</artifactId>
</dependency>

<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
</dependency>

<dependency>
<groupId>com.oracle.database.jdbc</groupId>
<artifactId>ojdbc8</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -55,8 +54,8 @@ public MysqlPluginImpl(Properties props) {
init();
}

public MysqlPluginImpl(String dataSourceName,String hostName, Integer port, String databaseName, String userName, String password, Map<String, String> attributes) {
super(dataSourceName,hostName, port, databaseName, userName, password, attributes);
public MysqlPluginImpl(String dataSourceName, String hostName, Integer port, String databaseName, String userName, String password, Map<String, String> attributes) {
super(dataSourceName, hostName, port, databaseName, userName, password, attributes);
init();
}

Expand All @@ -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;
}

Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,10 @@
<maven.frontend.plugin>1.9.1</maven.frontend.plugin>
<spring.boot.version>3.3.9</spring.boot.version>
<druid.spring.boot.version>1.2.24</druid.spring.boot.version>
<mysql.version>8.0.28</mysql.version>
<mysql.version>8.0.33</mysql.version>
<postgresql.version>42.3.3</postgresql.version>
<guava.version>31.0-jre</guava.version>
<commons.beanutils.version>1.9.4</commons.beanutils.version>
<commons.beanutils.version>1.11.0</commons.beanutils.version>
<hutool.version>5.8.36</hutool.version>
<sqids.version>0.1.0</sqids.version>
<mapstruct.extensions.spring.version>0.1.1</mapstruct.extensions.spring.version>
Expand Down