Skip to content

Always check if this.activeQuery is null before using it #2

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

Open
rhodey wants to merge 1 commit into
base: 8.13.0
Choose a base branch
from
Open

Always check if this.activeQuery is null before using it #2

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
34 changes: 32 additions & 2 deletions packages/pg/lib/client.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,27 +357,47 @@ class Client extends EventEmitter {
}

_handleRowDescription(msg) {
if (!this.activeQuery) {
const error = new Error('Received unexpected rowDescription message from backend.')
this._handleErrorEvent(error)
return
}
// delegate rowDescription to active query
this.activeQuery.handleRowDescription(msg)
}

_handleDataRow(msg) {
if (!this.activeQuery) {
const error = new Error('Received unexpected dataRow message from backend.')
this._handleErrorEvent(error)
return
}
// delegate dataRow to active query
this.activeQuery.handleDataRow(msg)
}

_handlePortalSuspended(msg) {
if (!this.activeQuery) {
const error = new Error('Received unexpected portalSuspended message from backend.')
this._handleErrorEvent(error)
return
}
// delegate portalSuspended to active query
this.activeQuery.handlePortalSuspended(this.connection)
}

_handleEmptyQuery(msg) {
if (!this.activeQuery) {
const error = new Error('Received unexpected emptyQuery message from backend.')
this._handleErrorEvent(error)
return
}
// delegate emptyQuery to active query
this.activeQuery.handleEmptyQuery(this.connection)
}

_handleCommandComplete(msg) {
if (this.activeQuery == null) {
if (!this.activeQuery) {
const error = new Error('Received unexpected commandComplete message from backend.')
this._handleErrorEvent(error)
return
Expand All @@ -387,7 +407,7 @@ class Client extends EventEmitter {
}

_handleParseComplete() {
if (this.activeQuery == null) {
if (!this.activeQuery) {
const error = new Error('Received unexpected parseComplete message from backend.')
this._handleErrorEvent(error)
return
Expand All @@ -401,10 +421,20 @@ class Client extends EventEmitter {
}

_handleCopyInResponse(msg) {
if (!this.activeQuery) {
const error = new Error('Received unexpected copyInResponse message from backend.')
this._handleErrorEvent(error)
return
}
this.activeQuery.handleCopyInResponse(this.connection)
}

_handleCopyData(msg) {
if (!this.activeQuery) {
const error = new Error('Received unexpected copyData message from backend.')
this._handleErrorEvent(error)
return
}
this.activeQuery.handleCopyData(msg, this.connection)
}

Expand Down