From 4d727015fd3b028d9fb1cabd036639e0f4f9dad7 Mon Sep 17 00:00:00 2001
From: Rahul Shirsat <rahul.shirsat@enterprisedb.com>
Date: Wed, 2 Feb 2022 14:45:31 +0530
Subject: [PATCH] =?UTF-8?q?Fixed=20an=20issue=20where=20the=20query=20tool?=
 =?UTF-8?q?=20is=20displaying=20an=C2=A0incorrect=C2=A0label.=20Fixes=20#7?=
 =?UTF-8?q?136?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/en_US/release_notes_6_5.rst                   | 1 +
 web/pgadmin/tools/sqleditor/static/js/sqleditor.js | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/en_US/release_notes_6_5.rst b/docs/en_US/release_notes_6_5.rst
index 95b01df88..e36c8dc6f 100644
--- a/docs/en_US/release_notes_6_5.rst
+++ b/docs/en_US/release_notes_6_5.rst
@@ -30,6 +30,7 @@ Bug fixes
 | `Issue #7126 <https://redmine.postgresql.org/issues/7126>`_ -  Fixed an issue where the F2 Function key removes browser panel contents.
 | `Issue #7127 <https://redmine.postgresql.org/issues/7127>`_ -  Added validation for Hostname in the server dialog.
 | `Issue #7135 <https://redmine.postgresql.org/issues/7135>`_ -  Enforce the minimum Windows version that the installer will run on.
+| `Issue #7136 <https://redmine.postgresql.org/issues/7136>`_ -  Fixed an issue where the query tool is displaying an incorrect label.
 | `Issue #7142 <https://redmine.postgresql.org/issues/7142>`_ -  Fixed an issue where a warning message was shown after database creation/modification.
 | `Issue #7145 <https://redmine.postgresql.org/issues/7145>`_ -  Ensure that owner should be ignored while comparing extensions.
 | `Issue #7146 <https://redmine.postgresql.org/issues/7146>`_ -  Fixed event trigger comparing issue in Schema Diff tool.
diff --git a/web/pgadmin/tools/sqleditor/static/js/sqleditor.js b/web/pgadmin/tools/sqleditor/static/js/sqleditor.js
index 800e4425e..35c6aad9a 100644
--- a/web/pgadmin/tools/sqleditor/static/js/sqleditor.js
+++ b/web/pgadmin/tools/sqleditor/static/js/sqleditor.js
@@ -2707,7 +2707,7 @@ define('tools.querytool', [
           $('#btn-conn-status i').removeClass('obtaining-conn');
 
           var tree_data = pgWindow.default.pgAdmin.Browser.tree.getTreeNodeHierarchy(pgWindow.default.pgAdmin.Browser.tree.selected());
-          let conn_title = panelTitleFunc.getPanelTitle(pgWindow.default.pgAdmin.Browser, null, null, null, true, tree_data.database.label);
+          let conn_title = ` ${_.unescape(url_params.title)}`;
           self.gridView.set_editor_title(_.unescape(conn_title));
           let connection_data = {
             'server_group': self.gridView.handler.url_params.sgid,