Skip to content

cleanup: Combine duplicated code in Client#query and avoid unneeded early non-const declarations #3674

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
charmander merged 1 commit into from
May 14, 2026
+8 −9
Merged

cleanup: Combine duplicated code in Client#query and avoid unneeded early non-const declarations #3674

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 8 additions & 9 deletions packages/pg/lib/client.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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') {
Expand All @@ -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) => {
Expand All @@ -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(() => {
Expand Down
Loading