Skip to content

Commit 26a6f2b

Browse files
committed
Adding ability to pass through idle_in_transaction_session_timeout
1 parent 69345eb commit 26a6f2b

File tree

5 files changed

+74
-1
lines changed

5 files changed

+74
-1
lines changed

packages/pg/lib/client.js

+3
Original file line numberDiff line numberDiff line change
@@ -371,6 +371,9 @@ Client.prototype.getStartupConf = function () {
371371
if (params.statement_timeout) {
372372
data.statement_timeout = String(parseInt(params.statement_timeout, 10))
373373
}
374+
if (params.idle_in_transaction_session_timeout) {
375+
data.idle_in_transaction_session_timeout = String(parseInt(params.idle_in_transaction_session_timeout, 10))
376+
}
374377

375378
return data
376379
}

packages/pg/lib/connection-parameters.js

+1
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ var ConnectionParameters = function (config) {
6565
this.application_name = val('application_name', config, 'PGAPPNAME')
6666
this.fallback_application_name = val('fallback_application_name', config, false)
6767
this.statement_timeout = val('statement_timeout', config, false)
68+
this.idle_in_transaction_session_timeout = val('idle_in_transaction_session_timeout', config, false)
6869
this.query_timeout = val('query_timeout', config, false)
6970

7071
if (config.connectionTimeoutMillis === undefined) {

packages/pg/lib/defaults.js

+4
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,10 @@ module.exports = {
5959
// false=unlimited
6060
statement_timeout: false,
6161

62+
// Terminate any session with an open transaction that has been idle for longer than the specified duration in milliseconds
63+
// false=unlimited
64+
idle_in_transaction_session_timeout: false
65+
6266
// max milliseconds to wait for query to complete (client side)
6367
query_timeout: false,
6468

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
'use strict'
2+
var helper = require('./test-helper')
3+
var Client = helper.Client
4+
5+
var suite = new helper.Suite()
6+
7+
var conInfo = helper.config
8+
9+
function getConInfo (override) {
10+
return Object.assign({}, conInfo, override )
11+
}
12+
13+
function getIdleTransactionSessionTimeout (conf, cb) {
14+
var client = new Client(conf)
15+
client.connect(assert.success(function () {
16+
client.query('SHOW idle_in_transaction_session_timeout', assert.success(function (res) {
17+
var timeout = res.rows[0].idle_in_transaction_session_timeout
18+
cb(timeout)
19+
client.end()
20+
}))
21+
}))
22+
}
23+
24+
if (!helper.args.native) { // idle_in_transaction_session_timeout is not supported with the native client
25+
suite.test('No default idle_in_transaction_session_timeout ', function (done) {
26+
getConInfo()
27+
getIdleTransactionSessionTimeout({}, function (res) {
28+
assert.strictEqual(res, '0') // 0 = no timeout
29+
done()
30+
})
31+
})
32+
33+
suite.test('idle_in_transaction_session_timeout integer is used', function (done) {
34+
var conf = getConInfo({
35+
'idle_in_transaction_session_timeout': 3000
36+
})
37+
getIdleTransactionSessionTimeout(conf, function (res) {
38+
assert.strictEqual(res, '3s')
39+
done()
40+
})
41+
})
42+
43+
suite.test('idle_in_transaction_session_timeout float is used', function (done) {
44+
var conf = getConInfo({
45+
'idle_in_transaction_session_timeout': 3000.7
46+
})
47+
getIdleTransactionSessionTimeout(conf, function (res) {
48+
assert.strictEqual(res, '3s')
49+
done()
50+
})
51+
})
52+
53+
suite.test('idle_in_transaction_session_timeout string is used', function (done) {
54+
var conf = getConInfo({
55+
'idle_in_transaction_session_timeout': '3000'
56+
})
57+
getIdleTransactionSessionTimeout(conf, function (res) {
58+
assert.strictEqual(res, '3s')
59+
done()
60+
})
61+
})
62+
63+
}

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

+3-1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ var compare = function (actual, expected, type) {
2323
assert.equal(actual.password, expected.password, type + ' password')
2424
assert.equal(actual.binary, expected.binary, type + ' binary')
2525
assert.equal(actual.statement_timout, expected.statement_timout, type + ' statement_timeout')
26+
assert.equal(actual.idle_in_transaction_session_timeout, expected.idle_in_transaction_session_timeout, type + 'idle_in_transaction_session_timeout')
2627
}
2728

2829
test('ConnectionParameters initializing from defaults', function () {
@@ -62,7 +63,8 @@ test('ConnectionParameters initializing from config', function () {
6263
ssl: {
6364
asdf: 'blah'
6465
},
65-
statement_timeout: 15000
66+
statement_timeout: 15000,
67+
idle_in_transaction_session_timeout: 15000
6668
}
6769
var subject = new ConnectionParameters(config)
6870
compare(subject, config, 'config')

0 commit comments

Comments
 (0)