From ca6f52e7c71d133e64158902fdf9e88924549bdc Mon Sep 17 00:00:00 2001
From: Pravesh Sharma <pravesh.sharma@enterprisedb.com>
Date: Tue, 6 May 2025 15:52:20 +0530
Subject: [PATCH] Fixed issues related to column range selection using shift +
 click. #8713

---
 .../static/js/components/QueryToolDataGrid/index.jsx        | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/web/pgadmin/tools/sqleditor/static/js/components/QueryToolDataGrid/index.jsx b/web/pgadmin/tools/sqleditor/static/js/components/QueryToolDataGrid/index.jsx
index 143db2fc2..b2d680d42 100644
--- a/web/pgadmin/tools/sqleditor/static/js/components/QueryToolDataGrid/index.jsx
+++ b/web/pgadmin/tools/sqleditor/static/js/components/QueryToolDataGrid/index.jsx
@@ -380,7 +380,11 @@ export default function QueryToolDataGrid({columns, rows, totalRowCount, dataCha
     const end = isShiftClick && lastSelectedColumn ? Math.max(columnIdx, lastSelectedColumn) : columnIdx;
     for (let i = start; i <= end; i++) {
       if (isSelected) {
-        newSelectedCols.delete(i);
+        if (newSelectedCols.size == 1 || !isShiftClick) {
+          newSelectedCols.delete(i);
+        } else{
+          newSelectedCols.delete(i+1);
+        }
       }
       else {
         newSelectedCols.add(i);