From c50c1e081e540dd6dc99016e54326012ed71396f Mon Sep 17 00:00:00 2001
From: Charmander <~@charmander.me>
Date: Wed, 13 May 2026 20:38:22 -0700
Subject: [PATCH] cleanup: Combine duplicated code in `Client#query` and avoid
 unneeded early non-const declarations

No behaviour change except for the negligible one of reading the `query_timeout` property before `submit`.
---
 packages/pg/lib/client.js | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/packages/pg/lib/client.js b/packages/pg/lib/client.js
index bb5e6d5f0..fb45649b3 100644
--- a/packages/pg/lib/client.js
+++ b/packages/pg/lib/client.js
@@ -605,14 +605,14 @@ class Client extends EventEmitter {
     // can take in strings, config object or query object
     let query
     let result
-    let readTimeout
-    let readTimeoutTimer
-    let queryCallback
 
-    if (config === null || config === undefined) {
+    if (config == null) {
       throw new TypeError('Client was passed a null or undefined query')
-    } else if (typeof config.submit === 'function') {
-      readTimeout = config.query_timeout || this.connectionParameters.query_timeout
+    }
+
+    const readTimeout = config.query_timeout || this.connectionParameters.query_timeout
+
+    if (typeof config.submit === 'function') {
       result = query = config
       if (!query.callback) {
         if (typeof values === 'function') {
@@ -622,7 +622,6 @@ class Client extends EventEmitter {
         }
       }
     } else {
-      readTimeout = config.query_timeout || this.connectionParameters.query_timeout
       query = new Query(config, values, callback)
       if (!query.callback) {
         result = new this._Promise((resolve, reject) => {
@@ -639,9 +638,9 @@ class Client extends EventEmitter {
     }
 
     if (readTimeout) {
-      queryCallback = query.callback || (() => {})
+      const queryCallback = query.callback || (() => {})
 
-      readTimeoutTimer = setTimeout(() => {
+      const readTimeoutTimer = setTimeout(() => {
         const error = new Error('Query read timeout')
 
         process.nextTick(() => {