Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions packages/pg/lib/client.js
Original file line number Diff line number Diff line change
Expand Up @@ -438,6 +438,9 @@ class Client extends EventEmitter {
if (activeQuery.name) {
delete this.connection.submittedNamedStatements[activeQuery.name]
}
if (msg.severity === 'FATAL' || msg.severity === 'PANIC') {
this._queryable = false
}
activeQuery.handleError(msg, this.connection)
}

Expand Down
46 changes: 46 additions & 0 deletions packages/pg/test/unit/client/simple-query-tests.js
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,52 @@ test('executing query', function () {
}
)
})

test('keeps client queryable after an ERROR message during a query', function (done) {
const errorClient = helper.client()
const con = errorClient.connection
con.emit('readyForQuery')

errorClient.query('SELECT 1', function (err) {
assert.ok(err)
assert.equal(errorClient._queryable, true)
done()
})

const err = new Error('division by zero')
err.severity = 'ERROR'
con.emit('errorMessage', err)
con.emit('readyForQuery')
})

test('marks client not queryable after a FATAL or PANIC message during a query', function (done) {
const fatalClient = helper.client()
const con = fatalClient.connection
con.emit('readyForQuery')

fatalClient.query('SELECT pg_sleep(30)', function (err) {
assert.ok(err)
assert.equal(fatalClient._queryable, false)

const panicClient = helper.client()
const panicCon = panicClient.connection
panicCon.emit('readyForQuery')

panicClient.query('SELECT 1', function (panicErr) {
assert.ok(panicErr)
assert.equal(panicClient._queryable, false)
done()
})

const panicMsg = new Error('server panic')
panicMsg.severity = 'PANIC'
panicCon.emit('errorMessage', panicMsg)
})

const fatalMsg = new Error('terminating connection due to administrator command')
fatalMsg.severity = 'FATAL'
con.emit('errorMessage', fatalMsg)
})
})

test('reusing a config object across calls', function () {
Expand Down
Loading