dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #6109 from dataease/pr@dev@fixrowpermissions

Browse Source 
fix: pg、db2 支持currentSchema
This commit is contained in:
taojinlong 2023-09-12 20:55:22 -05:00 committed by GitHub
commit 8ba3e583a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/backend/src/main/java/io/dataease/dto/datasource/Db2Configuration.java
View File

@ -15,7 +15,7 @@ public class Db2Configuration extends JdbcConfiguration {
public String getJdbc() { public String getJdbc() {
if(StringUtils.isEmpty(extraParams.trim())){ if(StringUtils.isEmpty(extraParams.trim())){
if (StringUtils.isEmpty(getSchema())) { if (StringUtils.isEmpty(getSchema())) {
return "jdbc:db2://HOSTNAME:PORT/DATABASE:currentSchema=SCHEMA;" return "jdbc:db2://HOSTNAME:PORT/DATABASE"
.replace("HOSTNAME", getHost().trim()) .replace("HOSTNAME", getHost().trim())
.replace("PORT", getPort().toString().trim()) .replace("PORT", getPort().toString().trim())
.replace("DATABASE", getDataBase().trim()); .replace("DATABASE", getDataBase().trim());

8
core/backend/src/main/java/io/dataease/dto/datasource/PgConfiguration.java
View File

@ -11,13 +11,21 @@ public class PgConfiguration extends JdbcConfiguration {
private String driver = "org.postgresql.Driver"; private String driver = "org.postgresql.Driver";
private String extraParams = ""; private String extraParams = "";
public String getJdbc() { public String getJdbc() {
if (StringUtils.isEmpty(extraParams.trim())) { if (StringUtils.isEmpty(extraParams.trim())) {
if (StringUtils.isEmpty(getSchema())) {
return "jdbc:postgresql://HOSTNAME:PORT/DATABASE"
.replace("HOSTNAME", getHost().trim())
.replace("PORT", getPort().toString().trim())
.replace("DATABASE", getDataBase().trim());
} else {
return "jdbc:postgresql://HOSTNAME:PORT/DATABASE?currentSchema=SCHEMA" return "jdbc:postgresql://HOSTNAME:PORT/DATABASE?currentSchema=SCHEMA"
.replace("HOSTNAME", getHost().trim()) .replace("HOSTNAME", getHost().trim())
.replace("PORT", getPort().toString().trim()) .replace("PORT", getPort().toString().trim())
.replace("DATABASE", getDataBase().trim()) .replace("DATABASE", getDataBase().trim())
.replace("SCHEMA", getSchema().trim()); .replace("SCHEMA", getSchema().trim());
}
} else { } else {
return "jdbc:postgresql://HOSTNAME:PORT/DATABASE?EXTRA_PARAMS" return "jdbc:postgresql://HOSTNAME:PORT/DATABASE?EXTRA_PARAMS"
.replace("HOSTNAME", getHost().trim()) .replace("HOSTNAME", getHost().trim())