#3477 PG: search_path update fix (keep $user schema as is)

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));
             }

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);