Skip to content
Merged
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
7 changes: 3 additions & 4 deletions docs/pages/index.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ The simplest possible way to connect, query, and disconnect is with async/await:

```js
import { Client } from 'pg'
const client = await new Client().connect();
const client = await new Client().connect()

const res = await client.query('SELECT $1::text as message', ['Hello world!'])
console.log(res.rows[0].message) // Hello world!
Expand All @@ -55,10 +55,9 @@ await client.end()

For the sake of simplicity, these docs will assume that the methods are successful. In real life use, make sure to properly handle errors thrown in the methods. A `try/catch` block is a great way to do so:

```ts
```js
import { Client } from 'pg'
const client = new Client()
await client.connect()
const client = await new Client().connect()

try {
const res = await client.query('SELECT $1::text as message', ['Hello world!'])
Expand Down
48 changes: 42 additions & 6 deletions packages/pg/lib/client.js
Original file line number Diff line number Diff line change
Expand Up @@ -407,23 +407,47 @@ class Client extends EventEmitter {
}

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

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

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

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

_handleCommandComplete(msg) {
Expand Down Expand Up @@ -453,11 +477,23 @@ class Client extends EventEmitter {
}

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

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

_handleNotification(msg) {
Expand Down
6 changes: 6 additions & 0 deletions packages/pg/test/integration/gh-issues/3174-tests.js
Original file line number Diff line number Diff line change
Expand Up @@ -165,4 +165,10 @@ const testErrorBuffer = (bufferName, errorBuffer) => {
if (!helper.args.native) {
testErrorBuffer('parseComplete', buffers.parseComplete())
testErrorBuffer('commandComplete', buffers.commandComplete('f'))
testErrorBuffer('rowDescription', buffers.rowDescription())
testErrorBuffer('dataRow', buffers.dataRow())
testErrorBuffer('portalSuspended', buffers.portalSuspended())
testErrorBuffer('emptyQuery', buffers.emptyQuery())
testErrorBuffer('copyIn', buffers.copyIn(0))
testErrorBuffer('copyData', buffers.copyData(Buffer.from([1, 2, 3])))
}
16 changes: 16 additions & 0 deletions packages/pg/test/test-buffers.js
Original file line number Diff line number Diff line change
Expand Up @@ -118,4 +118,20 @@ buffers.portalSuspended = function () {
return new BufferList().join(true, 's')
}

buffers.copyIn = function (cols) {
const list = new BufferList()
// text mode
.add(Buffer.from([0]))
// column count
.addInt16(cols)
for (let i = 0; i < cols; i++) {
list.addInt16(i)
}
return list.join(true, 'G')
}

buffers.copyData = function (bytes) {
return new BufferList().add(bytes).join(true, 'd')
}

module.exports = buffers