From bf40f0378872481d238af4893ea5385ee59e6eea Mon Sep 17 00:00:00 2001 From: Charmander <~@charmander.me> Date: Wed, 22 Apr 2020 15:55:03 -0700 Subject: [PATCH] Send the `client_encoding` startup parameter value with more typical formatting All non-alphanumerics are ignored, but `'utf-8'` is weird. `UTF8` is the canonical name, and is what libpq sends. --- packages/pg-protocol/src/serializer.ts | 2 +- packages/pg/lib/connection.js | 2 +- packages/pg/test/unit/connection/outbound-sending-tests.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/pg-protocol/src/serializer.ts b/packages/pg-protocol/src/serializer.ts index 00e43fffe..bff2fd332 100644 --- a/packages/pg-protocol/src/serializer.ts +++ b/packages/pg-protocol/src/serializer.ts @@ -25,7 +25,7 @@ const startup = (opts: Record): Buffer => { writer.addCString(key).addCString(opts[key]) } - writer.addCString('client_encoding').addCString("'utf-8'") + writer.addCString('client_encoding').addCString('UTF8') var bodyBuffer = writer.addCString('').flush() // this message is sent without a code diff --git a/packages/pg/lib/connection.js b/packages/pg/lib/connection.js index c3f30aa0f..761250137 100644 --- a/packages/pg/lib/connection.js +++ b/packages/pg/lib/connection.js @@ -144,7 +144,7 @@ Connection.prototype.startup = function (config) { writer.addCString(key).addCString(val) }) - writer.addCString('client_encoding').addCString("'utf-8'") + writer.addCString('client_encoding').addCString('UTF8') var bodyBuffer = writer.addCString('').flush() // this message is sent without a code diff --git a/packages/pg/test/unit/connection/outbound-sending-tests.js b/packages/pg/test/unit/connection/outbound-sending-tests.js index 8b21de4ce..d6b03964f 100644 --- a/packages/pg/test/unit/connection/outbound-sending-tests.js +++ b/packages/pg/test/unit/connection/outbound-sending-tests.js @@ -28,7 +28,7 @@ test('sends startup message', function () { .addCString('database') .addCString('bang') .addCString('client_encoding') - .addCString("'utf-8'") + .addCString('UTF8') .addCString('') .join(true) )