center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

fix: MySql数据库表名称含有小数点

Browse Source
This commit is contained in:
taojinlong 2022-06-27 18:23:52 +08:00
parent 3f88b27d50
commit c89dc628fd
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java
View File

@ -10,6 +10,7 @@ import io.dataease.i18n.Translator;
import io.dataease.plugins.common.base.domain.DeDriver;
import io.dataease.plugins.common.base.mapper.DeDriverMapper;
import io.dataease.plugins.common.constants.DatasourceTypes;
import io.dataease.plugins.common.constants.datasource.MySQLConstants;
import io.dataease.plugins.common.dto.datasource.TableField;
import io.dataease.plugins.common.request.datasource.DatasourceRequest;
import io.dataease.plugins.datasource.entity.JdbcConfiguration;
@ -88,7 +89,11 @@ public class JdbcProvider extends DefaultJdbcProvider {
}
}
DatabaseMetaData databaseMetaData = connection.getMetaData();
ResultSet resultSet = databaseMetaData.getColumns(null, "%", datasourceRequest.getTable(), "%");
String tableNamePattern = datasourceRequest.getTable();
if(datasourceRequest.getDatasource().getType().equalsIgnoreCase(DatasourceTypes.mysql.name())){
tableNamePattern = String.format(MySQLConstants.KEYWORD_TABLE, tableNamePattern);
}
ResultSet resultSet = databaseMetaData.getColumns(null, "%", tableNamePattern, "%");
while (resultSet.next()) {
String tableName = resultSet.getString("TABLE_NAME");
String database;

3
frontend/src/views/system/datasource/DsForm.vue
View File

@ -147,7 +147,8 @@ export default {
acquireIncrement: 5,
idleConnectionTestPeriod: 5,
connectTimeout: 5,
customDriver: 'default'
customDriver: 'default',
queryTimeout: 30
},
apiConfiguration: []
},