Fixed review comments.

Author: pravesh-sharma

web/pgadmin/tools/sqleditor/__init__.py

@@ -73,7 +73,7 @@
     convert_connection_parameter, get_db_disp_restriction
 from pgadmin.misc.workspaces import check_and_delete_adhoc_server
 from pgadmin.utils.driver.psycopg3.typecast import \
-    register_binary_data_typecasters
+    register_binary_data_typecasters, register_binary_typecasters
 
 MODULE_NAME = 'sqleditor'
 TRANSACTION_STATUS_CHECK_FAILED = gettext("Transaction status check failed.")
@@ -2229,13 +2229,9 @@ def download_binary_data(trans_id):
             status=410,
             success=0,
             errormsg=gettext(
-                "Could not find the required parameter (query)."
+                "Could not find the required parameters (rowpos, colpos)."
             )
         )
-    col_pos = data['colpos']
-    cur.scroll(int(data['rowpos']))
-    binary_data = cur.fetchone()
-    binary_data = binary_data[col_pos]
 
     try:
         row_pos = int(data['rowpos'])
@@ -2254,6 +2250,15 @@ def download_binary_data(trans_id):
         return internal_server_error(
             errormsg='Invalid row/column position.'
         )
+    finally:
+        # Always restore the original typecasters
+        # (works on connection or cursor)
+        register_binary_typecasters(cur)
+
+    if binary_data is None:
+        return bad_request(
+            errormsg=gettext('The selected cell contains NULL.')
+        )
 
     return send_file(
         BytesIO(binary_data),

web/pgadmin/tools/sqleditor/static/js/components/QueryToolDataGrid/Formatters.jsx

@@ -74,17 +74,13 @@ export function NumberFormatter({row, column}) {
 }
 NumberFormatter.propTypes = FormatterPropTypes;
 
-export function BinaryFormatter({row, column}) {
+export function BinaryFormatter({row, column, ...props}) {
   let value = row[column.key];
   const eventBus = useContext(QueryToolEventsContext);
   const dataGridExtras = useContext(DataGridExtrasContext);
   const downloadBinaryData = usePreferences().getPreferences('misc', 'enable_binary_data_download').value;
 
-  // Use clientPK as the absolute row position
-  // rowKeyGetter returns the clientPK value which is a sequential counter (0, 1, 2, ...)
-  // that persists across pagination and represents the 0-based absolute position in the result set
-  const absoluteRowPos = parseInt(dataGridExtras?.rowKeyGetter?.(row) ?? 0);
-  console.log(absoluteRowPos)
+  const absoluteRowPos = (dataGridExtras?.startRowNum ?? 1) - 1 + props.rowIdx;
 
   return (
     <StyledNullAndDefaultFormatter value={value} column={column}>

web/pgadmin/tools/sqleditor/static/js/components/QueryToolDataGrid/index.jsx

@@ -429,8 +429,8 @@ export default function QueryToolDataGrid({columns, rows, totalRowCount, dataCha
   }, []);
 
   const dataGridExtras = useMemo(()=>({
-    onSelectedCellChange, handleShortcuts, startRowNum, rowKeyGetter: props.rowKeyGetter
-  }), [onSelectedCellChange, props.rowKeyGetter]);
+    onSelectedCellChange, handleShortcuts, startRowNum
+  }), [onSelectedCellChange]);
 
   // Save column width to window object on resize
   const handleColumnResize = (column, width) => {