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

revert: 回滚误提交

Browse Source
This commit is contained in:
taojinlong 2022-04-25 13:16:23 +08:00
parent dbb8a7a76d
commit 14cb6a9af4
1 changed files with 1 additions and 6 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

@ -426,12 +426,7 @@ public class JdbcProvider extends DefaultJdbcProvider {
dataSource.setDriverClassName(oracleConfiguration.getDriver());
dataSource.setUrl(oracleConfiguration.getJdbc());
dataSource.setValidationQuery("select 1 from dual");
if(StringUtils.isNotEmpty(oracleConfiguration.getCharset()) && !oracleConfiguration.getCharset().equalsIgnoreCase("Default")){
Properties props = new Properties();
props.put("serverEncoding", oracleConfiguration.getCharset());
props.put("clientEncoding", "UTF-8");
jdbcConfiguration = oracleConfiguration;
}
jdbcConfiguration = oracleConfiguration;
break;
case pg:
PgConfiguration pgConfiguration = new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), PgConfiguration.class);