src/connectionMethods/query.ts

@@ -5,6 +5,7 @@ import {
   executeQuery,
 } from '../routines';
 import {
+  type Field,
   type InternalQueryMethod,
   type Notice,
   type QueryResult,
@@ -30,14 +31,20 @@ export const query: InternalQueryMethod = async (
         finalValues as any[],
       );
 
-      return {
-        command: result.command as QueryResult<unknown>['command'],
-        fields: (result.fields || []).map((field) => {
-          return {
+      const fields: Field[] = [];
+
+      if (result.fields) {
+        for (const field of result.fields) {
+          fields.push({
             dataTypeId: field.dataTypeID,
             name: field.name,
-          };
-        }),
+          });
+        }
+      }
+
+      return {
+        command: result.command as QueryResult<unknown>['command'],
+        fields,
         notices: result.notices ?? [],
         rowCount: result.rowCount || 0,
         rows: result.rows || [],

src/routines/executeQuery.ts

@@ -185,14 +185,16 @@ export const executeQuery = async (
   if (clientConfiguration.captureStackTrace) {
     const callSites = await getStackTrace();
 
-    stackTrace = callSites.map((callSite) => {
-      return {
+    stackTrace = [];
+
+    for (const callSite of callSites) {
+      stackTrace.push({
         columnNumber: callSite.columnNumber,
         fileName: callSite.fileName,
         functionName: callSite.functionName,
         lineNumber: callSite.lineNumber,
-      };
-    });
+      });
+    }
   }
 
   const queryId = inheritedQueryId ?? createQueryId();
@@ -401,9 +403,11 @@ export const executeQuery = async (
           fields,
         } = result;
 
-        const rows: readonly QueryResultRow[] = result.rows.map((row) => {
-          return transformRow(executionContext, actualQuery, row, fields);
-        });
+        const rows: QueryResultRow[] = [];
+
+        for (const row of result.rows) {
+          rows.push(transformRow(executionContext, actualQuery, row, fields));
+        }
 
         result = {
           ...result,