archive-gh-me/node-postgres
1
0
Fork 0
mirror of https://github.com/brianc/node-postgres.git synced 2026-01-18 15:55:05 +00:00
Code Issues Projects Releases Wiki Activity

Fix hanging listener when error occured

Browse Source
This commit is contained in:
Juneidy 2019-06-27 11:22:04 +08:00
parent 1cdad4d8d2
commit b0f7958299
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
index.js
View File

@ -19,10 +19,23 @@ function Cursor (text, values, config) {
this._cb = null
this._rows = null
this._portal = null
this._ifNoData = this._ifNoData.bind(this)
this._rowDescription = this._rowDescription.bind(this)
}
util.inherits(Cursor, EventEmitter)
Cursor.prototype._ifNoData = function () {
this.state = 'idle'
this._shiftQueue()
}
Cursor.prototype._rowDescription = function () {
if (this.connection) {
this.connection.removeListener('noData', this._ifNoData)
}
}
Cursor.prototype.submit = function (connection) {
this.connection = connection
this._portal = 'C_' + (nextUniqueID++)
@ -45,19 +58,12 @@ Cursor.prototype.submit = function (connection) {
con.flush()
const ifNoData = () => {
this.state = 'idle'
this._shiftQueue()
}
if (this._conf.types) {
this._result._getTypeParser = this._conf.types.getTypeParser
}
con.once('noData', ifNoData)
con.once('rowDescription', () => {
con.removeListener('noData', ifNoData)
})
con.once('noData', this._ifNoData)
con.once('rowDescription', this._rowDescription)
}
Cursor.prototype._shiftQueue = function () {
@ -114,6 +120,8 @@ Cursor.prototype.handleEmptyQuery = function () {
}
Cursor.prototype.handleError = function (msg) {
this.connection.removeListener('noData', this._ifNoData)
this.connection.removeListener('rowDescription', this._rowDescription)
this.state = 'error'
this._error = msg
// satisfy any waiting callback