From 62f790535809139cfc77c74a1b9c4fadf2d63620 Mon Sep 17 00:00:00 2001 From: serge-rider Date: Sun, 20 May 2018 22:22:54 +0300 Subject: [PATCH] #3477 PG: search_path update fix (keep $user schema as is) --- .../dbeaver/ext/postgresql/model/PostgreDataSource.java | 2 +- .../jkiss/dbeaver/ext/postgresql/model/PostgreDatabase.java | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreDataSource.java b/plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreDataSource.java index dd67cafbf7..195ad02dd0 100644 --- a/plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreDataSource.java +++ b/plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreDataSource.java @@ -197,7 +197,7 @@ public class PostgreDataSource extends JDBCDataSource implements DBSObjectSelect String searchPathStr = JDBCUtils.queryString(session, "SHOW search_path"); this.searchPath.clear(); if (searchPathStr != null) { - for (String str : searchPathStr.replace("$user", activeUser).split(",")) { + for (String str : searchPathStr.split(",")) { str = str.trim(); this.searchPath.add(DBUtils.getUnQuotedIdentifier(this, str)); } diff --git a/plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreDatabase.java b/plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreDatabase.java index 3ff569fbc7..d014b39ee4 100644 --- a/plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreDatabase.java +++ b/plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreDatabase.java @@ -473,10 +473,7 @@ public class PostgreDatabase implements DBSInstance, DBSCatalog, DBPRefreshableO StringBuilder spString = new StringBuilder(); for (String sp : newSearchPath) { if (spString.length() > 0) spString.append(","); - if (sp.startsWith("$")) - spString.append(sp); - else - spString.append(DBUtils.getQuotedIdentifier(getDataSource(), sp)); + spString.append(DBUtils.getQuotedIdentifier(getDataSource(), sp)); } try (JDBCSession session = context.openSession(monitor, DBCExecutionPurpose.UTIL, "Change search path")) { JDBCUtils.executeSQL(session, "SET search_path = " + spString); -- GitLab