#3698 PostgreSQL: active database switch fixes

plugins/org.jkiss.dbeaver.ext.postgresql/src/org/jkiss/dbeaver/ext/postgresql/model/PostgreDataSource.java

@@ -285,11 +285,13 @@ public class PostgreDataSource extends JDBCDataSource implements DBSObjectSelect
         }
         getDefaultInstance().cacheDataTypes(monitor);
 
+/*
         // Update database name and URL in connection settings and save datasources
         DBPConnectionConfiguration conConfig = getContainer().getConnectionConfiguration();
         conConfig.setDatabaseName(activeDatabaseName);
         conConfig.setUrl(getContainer().getDriver().getDataSourceProvider().getConnectionURL(getContainer().getDriver(), conConfig));
         getContainer().getRegistry().flushConfig();
+*/
 
         try (JDBCSession session = getDefaultContext(false).openSession(monitor, DBCExecutionPurpose.UTIL, "Update object state")) {
             determineDefaultObjects(session);

plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/jdbc/JDBCExecutionContext.java

@@ -415,6 +415,6 @@ public class JDBCExecutionContext extends AbstractExecutionContext<JDBCDataSourc
 
     public void reconnect(DBRProgressMonitor monitor) throws DBCException {
         close();
-        connect(monitor, null, null, false, false);
+        connect(monitor, null, null, false, true);
     }
 }