From 793061c7a68816019c8b67f2848b4f9547b47152 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Tue, 12 Sep 2023 11:53:12 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20pg=E3=80=81db2=20=E6=94=AF=E6=8C=81curre?= =?UTF-8?q?ntSchema?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/datasource/Db2Configuration.java | 2 +- .../dto/datasource/PgConfiguration.java | 22 +++++++++++++------ 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/core/backend/src/main/java/io/dataease/dto/datasource/Db2Configuration.java b/core/backend/src/main/java/io/dataease/dto/datasource/Db2Configuration.java index 5b7ea7d612..916e506f04 100644 --- a/core/backend/src/main/java/io/dataease/dto/datasource/Db2Configuration.java +++ b/core/backend/src/main/java/io/dataease/dto/datasource/Db2Configuration.java @@ -15,7 +15,7 @@ public class Db2Configuration extends JdbcConfiguration { public String getJdbc() { if(StringUtils.isEmpty(extraParams.trim())){ if (StringUtils.isEmpty(getSchema())) { - return "jdbc:db2://HOSTNAME:PORT/DATABASE:currentSchema=SCHEMA;" + return "jdbc:db2://HOSTNAME:PORT/DATABASE" .replace("HOSTNAME", getHost().trim()) .replace("PORT", getPort().toString().trim()) .replace("DATABASE", getDataBase().trim()); diff --git a/core/backend/src/main/java/io/dataease/dto/datasource/PgConfiguration.java b/core/backend/src/main/java/io/dataease/dto/datasource/PgConfiguration.java index ca2471844e..bd39533183 100644 --- a/core/backend/src/main/java/io/dataease/dto/datasource/PgConfiguration.java +++ b/core/backend/src/main/java/io/dataease/dto/datasource/PgConfiguration.java @@ -11,14 +11,22 @@ public class PgConfiguration extends JdbcConfiguration { private String driver = "org.postgresql.Driver"; private String extraParams = ""; + public String getJdbc() { - if(StringUtils.isEmpty(extraParams.trim())){ - return "jdbc:postgresql://HOSTNAME:PORT/DATABASE?currentSchema=SCHEMA" - .replace("HOSTNAME", getHost().trim()) - .replace("PORT", getPort().toString().trim()) - .replace("DATABASE", getDataBase().trim()) - .replace("SCHEMA", getSchema().trim()); - }else { + 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" + .replace("HOSTNAME", getHost().trim()) + .replace("PORT", getPort().toString().trim()) + .replace("DATABASE", getDataBase().trim()) + .replace("SCHEMA", getSchema().trim()); + } + } else { return "jdbc:postgresql://HOSTNAME:PORT/DATABASE?EXTRA_PARAMS" .replace("HOSTNAME", getHost().trim()) .replace("PORT", getPort().toString().trim())