revert the binary columns fix, closed as a duplicate of brianc#3496

Author: nigrosimone

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

@@ -577,24 +577,6 @@ describe('PgPacketStream', function () {
     })
   })
 
-  // the row description says which columns are binary, and their values are bytes rather than
-  // text: decoding them as utf8 would lose every byte it cannot carry
-  it('keeps the bytes of a binary column', async function () {
-    const description = buffers.rowDescription([
-      { name: 'n', dataTypeID: 23, formatCode: 1 },
-      { name: 't', dataTypeID: 25, formatCode: 0 },
-    ])
-    const row = new BufferList()
-      .addInt16(2)
-      .addInt32(4)
-      .add(Buffer.from([0, 0, 0x03, 0xe8]))
-      .addInt32(2)
-      .add(Buffer.from('é', 'utf8'))
-      .join(true, 'D')
-    const messages = await parseBuffers([description, row])
-    assert.deepStrictEqual((messages[1] as any).fields, [Buffer.from([0, 0, 0x03, 0xe8]), 'é'])
-  })
-
   // the parser moves what is left of a chunk to the front of its buffer before reading the next
   // one, so a message that kept a view into that buffer would change after being delivered
   it('keeps a copyData chunk intact after the parser reuses its buffer', async function () {

packages/pg-protocol/src/parser.ts

@@ -83,9 +83,6 @@ export class Parser {
   private bufferOffset: number = 0
   private reader = new BufferReader()
   private mode: Mode
-  // which columns of the rows to come are in the binary format, from the last row description:
-  // a binary value is bytes, and decoding it as text would lose every byte utf8 cannot carry
-  private binaryColumns: boolean[] | null = null
 
   constructor(opts?: StreamOptions) {
     if (opts?.mode === 'binary') {
@@ -191,7 +188,7 @@ export class Parser {
         message = emptyQuery
         break
       case MessageCodes.DataRow:
-        message = parseDataRowMessage(reader, this.binaryColumns)
+        message = parseDataRowMessage(reader)
         break
       case MessageCodes.CommandComplete:
         message = parseCommandCompleteMessage(reader)
@@ -219,7 +216,6 @@ export class Parser {
         break
       case MessageCodes.RowDescriptionMessage:
         message = parseRowDescriptionMessage(reader)
-        this.binaryColumns = binaryColumnsOf(message as RowDescriptionMessage)
         break
       case MessageCodes.ParameterDescriptionMessage:
         message = parseParameterDescriptionMessage(reader)
@@ -280,12 +276,6 @@ const parseNotificationMessage = (reader: BufferReader) => {
   return new NotificationResponseMessage(LATEINIT_LENGTH, processId, channel, payload)
 }
 
-// null when every column is text, which is nearly always, so the row parser has one check to make
-const binaryColumnsOf = (message: RowDescriptionMessage): boolean[] | null => {
-  const formats = message.fields.map((field) => field.format === 'binary')
-  return formats.includes(true) ? formats : null
-}
-
 const parseRowDescriptionMessage = (reader: BufferReader) => {
   const fieldCount = reader.int16()
   const message = new RowDescriptionMessage(LATEINIT_LENGTH, fieldCount)
@@ -316,13 +306,13 @@ const parseParameterDescriptionMessage = (reader: BufferReader) => {
   return message
 }
 
-const parseDataRowMessage = (reader: BufferReader, binaryColumns: boolean[] | null) => {
+const parseDataRowMessage = (reader: BufferReader) => {
   const fieldCount = reader.int16()
   const fields: any[] = new Array(fieldCount)
   for (let i = 0; i < fieldCount; i++) {
     const len = reader.int32()
     // a -1 for length means the value of the field is null
-    fields[i] = len === -1 ? null : binaryColumns && binaryColumns[i] ? reader.bytes(len) : reader.string(len)
+    fields[i] = len === -1 ? null : reader.string(len)
   }
   return new DataRowMessage(LATEINIT_LENGTH, fields)
 }