archive-gh-me/node-postgres
1
0
Fork 0
mirror of https://github.com/brianc/node-postgres.git synced 2025-12-08 20:16:25 +00:00
Code Issues Projects Releases Wiki Activity

Support lock_timeout (#2779)

Browse Source
This commit is contained in:
Martin Kubliniak 2022-08-10 23:15:06 +02:00 committed by GitHub
parent 68160a29bd
commit 3e53d06cd8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/pg/lib/client.js
View File

@ -403,6 +403,9 @@ class Client extends EventEmitter {
if (params.statement_timeout) {
data.statement_timeout = String(parseInt(params.statement_timeout, 10))
}
if (params.lock_timeout) {
data.lock_timeout = String(parseInt(params.lock_timeout, 10))
}
if (params.idle_in_transaction_session_timeout) {
data.idle_in_transaction_session_timeout = String(parseInt(params.idle_in_transaction_session_timeout, 10))
}

1
packages/pg/lib/connection-parameters.js
View File

@ -103,6 +103,7 @@ class ConnectionParameters {
this.application_name = val('application_name', config, 'PGAPPNAME')
this.fallback_application_name = val('fallback_application_name', config, false)
this.statement_timeout = val('statement_timeout', config, false)
this.lock_timeout = val('lock_timeout', config, false)
this.idle_in_transaction_session_timeout = val('idle_in_transaction_session_timeout', config, false)
this.query_timeout = val('query_timeout', config, false)

4
packages/pg/lib/defaults.js
View File

@ -54,6 +54,10 @@ module.exports = {
// false=unlimited
statement_timeout: false,
// Abort any statement that waits longer than the specified duration in milliseconds while attempting to acquire a lock.
// false=unlimited
lock_timeout: false,
// Terminate any session with an open transaction that has been idle for longer than the specified duration in milliseconds
// false=unlimited
idle_in_transaction_session_timeout: false,

3
packages/pg/test/unit/connection-parameters/creation-tests.js
View File

@ -28,6 +28,7 @@ var compare = function (actual, expected, type) {
assert.equal(actual.password, expected.password, type + ' password')
assert.equal(actual.binary, expected.binary, type + ' binary')
assert.equal(actual.statement_timeout, expected.statement_timeout, type + ' statement_timeout')
assert.equal(actual.lock_timeout, expected.lock_timeout, type + ' lock_timeout')
assert.equal(actual.options, expected.options, type + ' options')
assert.equal(
actual.idle_in_transaction_session_timeout,
@ -51,6 +52,7 @@ suite.test('ConnectionParameters initializing from defaults with connectionStrin
host: 'foo.bar.net',
binary: defaults.binary,
statement_timeout: false,
lock_timeout: false,
idle_in_transaction_session_timeout: false,
options: '-c geqo=off',
}
@ -78,6 +80,7 @@ suite.test('ConnectionParameters initializing from config', function () {
asdf: 'blah',
},
statement_timeout: 15000,
lock_timeout: 15000,
idle_in_transaction_session_timeout: 15000,
options: '-c geqo=off',
}