fix(pg): fix binary format buffer handling

- change Parser.parseDataRowMessage() to produce a buffer slice instead of a string
- change Result.parseRow() and _parseRowAsArray() to create the string from the buffer slice if not in binary mode

Author: faulpeltz

packages/pg-protocol/src/inbound-parser.test.ts

@@ -301,7 +301,7 @@ describe('PgPacketStream', function () {
       testForMessage(oneFieldBuf, {
         name: 'dataRow',
         fieldCount: 1,
-        fields: ['test'],
+        fields: [Buffer.from('test')],
       })
     })
   })
@@ -524,7 +524,7 @@ describe('PgPacketStream', function () {
         name: 'dataRow',
         fieldCount: 1,
         length: 11,
-        fields: ['!'],
+        fields: [Buffer.from('!')],
       })
       assert.equal(messages[0].fields[0], '!')
       assert.deepEqual(messages[1], {

packages/pg-protocol/src/parser.ts

@@ -284,7 +284,7 @@ export class Parser {
     for (let i = 0; i < fieldCount; i++) {
       const len = this.reader.int32()
       // a -1 for length means the value of the field is null
-      fields[i] = len === -1 ? null : this.reader.string(len)
+      fields[i] = len === -1 ? null : this.reader.bytes(len)
     }
     return new DataRowMessage(length, fields)
   }

packages/pg/lib/result.js

@@ -52,7 +52,8 @@ class Result {
     for (let i = 0, len = rowData.length; i < len; i++) {
       const rawValue = rowData[i]
       if (rawValue !== null) {
-        row[i] = this._parsers[i](rawValue)
+        const v = this.fields[i].format !== 'binary' ? rawValue.toString('utf8') : rawValue
+        row[i] = this._parsers[i](v)
       } else {
         row[i] = null
       }
@@ -66,7 +67,7 @@ class Result {
       const rawValue = rowData[i]
       const field = this.fields[i].name
       if (rawValue !== null) {
-        const v = this.fields[i].format === 'binary' ? Buffer.from(rawValue) : rawValue
+        const v = this.fields[i].format !== 'binary' ? rawValue.toString('utf8') : rawValue
         row[field] = this._parsers[i](v)
       } else {
         row[field] = null

packages/pg/test/integration/gh-issues/3495-tests.js

@@ -0,0 +1,25 @@
+const helper = require('../test-helper')
+const assert = require('assert')
+
+const suite = new helper.Suite()
+
+suite.testAsync('binary format mode parses integers correctly', async () => {
+  const client = new helper.pg.Client()
+  await client.connect()
+
+  const r1 = await client.query({
+    text: 'SELECT 1::int as a, 1000::int as b, $1::int as c',
+    values: [3000],
+    binary: false,
+  })
+  assert.deepEqual([1, 1000, 3000], [r1.rows[0].a, r1.rows[0].b, r1.rows[0].c])
+
+  const r2 = await client.query({
+    text: 'SELECT 1::int as a, 1000::int as b, $1::int as c',
+    values: [3000],
+    binary: true,
+  })
+  assert.deepEqual([1, 1000, 3000], [r2.rows[0].a, r2.rows[0].b, r2.rows[0].c])
+
+  await client.end()
+})