From a38cd796f631b349f0ad1e9dd34c388b52e91bdb Mon Sep 17 00:00:00 2001
From: Anil Sahoo <anil.sahoo@enterprisedb.com>
Date: Wed, 25 Mar 2026 08:47:36 +0530
Subject: [PATCH 1/2] Fixed Geometry Viewer not auto-updating on first query
 execution after View/Edit Data to Query Tool promotion. #9392

---
 .../sqleditor/static/js/components/sections/ResultSet.jsx     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/web/pgadmin/tools/sqleditor/static/js/components/sections/ResultSet.jsx b/web/pgadmin/tools/sqleditor/static/js/components/sections/ResultSet.jsx
index 076ca84c717..a02903269d4 100644
--- a/web/pgadmin/tools/sqleditor/static/js/components/sections/ResultSet.jsx
+++ b/web/pgadmin/tools/sqleditor/static/js/components/sections/ResultSet.jsx
@@ -1496,11 +1496,13 @@ export function ResultSet() {
     return ()=>eventBus.deregisterListener(QUERY_TOOL_EVENTS.TRIGGER_ADD_ROWS, triggerAddRows);
   }, [columns, selectedRows.size]);
 
+  const gvRenderKeyRef = useRef(0);
   const openGeometryViewerTab = React.useCallback((column, rowsData) => {
+    gvRenderKeyRef.current++;
     layoutDocker.openTab({
       id: PANELS.GEOMETRY,
       title: gettext('Geometry Viewer'),
-      content: <GeometryViewer rows={rowsData} columns={columns} column={column}/>,
+      content: <GeometryViewer key={gvRenderKeyRef.current} rows={rowsData} columns={columns} column={column}/>,
       closable: true,
     }, PANELS.MESSAGES, 'after-tab', true);
   }, [layoutDocker, columns]);

From 37ad3d79c26af382f832f357cf8e25e61ff44afd Mon Sep 17 00:00:00 2001
From: Anil Sahoo <anil.sahoo@enterprisedb.com>
Date: Wed, 25 Mar 2026 11:05:07 +0530
Subject: [PATCH 2/2] Fixed coderabbitai review comments

---
 .../sqleditor/static/js/components/sections/ResultSet.jsx   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/web/pgadmin/tools/sqleditor/static/js/components/sections/ResultSet.jsx b/web/pgadmin/tools/sqleditor/static/js/components/sections/ResultSet.jsx
index a02903269d4..c79c40df027 100644
--- a/web/pgadmin/tools/sqleditor/static/js/components/sections/ResultSet.jsx
+++ b/web/pgadmin/tools/sqleditor/static/js/components/sections/ResultSet.jsx
@@ -1496,13 +1496,13 @@ export function ResultSet() {
     return ()=>eventBus.deregisterListener(QUERY_TOOL_EVENTS.TRIGGER_ADD_ROWS, triggerAddRows);
   }, [columns, selectedRows.size]);
 
-  const gvRenderKeyRef = useRef(0);
+  const gvColumnsSignature = React.useMemo(() => columns.map(c => c.key).join(','), [columns]);
+
   const openGeometryViewerTab = React.useCallback((column, rowsData) => {
-    gvRenderKeyRef.current++;
     layoutDocker.openTab({
       id: PANELS.GEOMETRY,
       title: gettext('Geometry Viewer'),
-      content: <GeometryViewer key={gvRenderKeyRef.current} rows={rowsData} columns={columns} column={column}/>,
+      content: <GeometryViewer key={gvColumnsSignature} rows={rowsData} columns={columns} column={column}/>,
       closable: true,
     }, PANELS.MESSAGES, 'after-tab', true);
   }, [layoutDocker, columns]);