Merge pull request brianc#2210 from brianc/bmc/switch-to-fast-connection

Switch internals to use faster connection

Author: brianc

.travis.yml

@@ -7,20 +7,18 @@ before_script: |
 
 env:
  - CC=clang CXX=clang++ npm_config_clang=1 PGUSER=postgres PGDATABASE=postgres
- # test w/ new faster parsing code
- - CC=clang CXX=clang++ npm_config_clang=1 PGUSER=postgres PGDATABASE=postgres PG_FAST_CONNECTION=true
 
 node_js:
  - lts/dubnium
  - lts/erbium
  # node 13.7 seems to have changed behavior of async iterators exiting early on streams
  # if 13.8 still has this problem when it comes down I'll talk to the node team about the change
- # in the mean time...peg to 13.6 
+ # in the mean time...peg to 13.6
  - 13.6
  - 14
 
 addons:
- postgresql: "10"
+ postgresql: '10'
 
 matrix:
  include:
@@ -42,25 +40,25 @@ matrix:
 
  - node_js: lts/carbon
  addons:
- postgresql: "9.5"
+ postgresql: '9.5'
  dist: precise
 
  # different PostgreSQL versions on Node LTS
  - node_js: lts/erbium
  addons:
- postgresql: "9.3"
+ postgresql: '9.3'
  - node_js: lts/erbium
  addons:
- postgresql: "9.4"
+ postgresql: '9.4'
  - node_js: lts/erbium
  addons:
- postgresql: "9.5"
+ postgresql: '9.5'
  - node_js: lts/erbium
  addons:
- postgresql: "9.6"
+ postgresql: '9.6'
 
  # PostgreSQL 9.2 only works on precise
  - node_js: lts/carbon
  addons:
- postgresql: "9.2"
+ postgresql: '9.2'
  dist: precise

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

@@ -210,8 +210,21 @@ describe('PgPacketStream', function () {
  testForMessage(md5PasswordBuffer, expectedMD5PasswordMessage)
  testForMessage(SASLBuffer, expectedSASLMessage)
  testForMessage(SASLContinueBuffer, expectedSASLContinueMessage)
+
+ // this exercises a found bug in the parser:
+ // https://github.com/brianc/node-postgres/pull/2210#issuecomment-627626084
+ // and adds a test which is deterministic, rather than relying on network packet chunking
+ const extendedSASLContinueBuffer = Buffer.concat([SASLContinueBuffer, Buffer.from([1, 2, 3, 4])])
+ testForMessage(extendedSASLContinueBuffer, expectedSASLContinueMessage)
+
  testForMessage(SASLFinalBuffer, expectedSASLFinalMessage)
 
+ // this exercises a found bug in the parser:
+ // https://github.com/brianc/node-postgres/pull/2210#issuecomment-627626084
+ // and adds a test which is deterministic, rather than relying on network packet chunking
+ const extendedSASLFinalBuffer = Buffer.concat([SASLFinalBuffer, Buffer.from([1, 2, 4, 5])])
+ testForMessage(extendedSASLFinalBuffer, expectedSASLFinalMessage)
+
  testForMessage(paramStatusBuffer, expectedParameterStatusMessage)
  testForMessage(backendKeyDataBuffer, expectedBackendKeyDataMessage)
  testForMessage(readyForQueryBuffer, expectedReadyForQueryMessage)

packages/pg-protocol/src/parser.ts

@@ -296,11 +296,11 @@ export class Parser {
  break
  case 11: // AuthenticationSASLContinue
  message.name = MessageName.authenticationSASLContinue
- message.data = this.reader.string(length - 4)
+ message.data = this.reader.string(length - 8)
  break
  case 12: // AuthenticationSASLFinal
  message.name = MessageName.authenticationSASLFinal
- message.data = this.reader.string(length - 4)
+ message.data = this.reader.string(length - 8)
  break
  default:
  throw new Error('Unknown authenticationOk message type ' + code)

packages/pg/lib/client.js

@@ -18,9 +18,6 @@ var ConnectionParameters = require('./connection-parameters')
 var Query = require('./query')
 var defaults = require('./defaults')
 var Connection = require('./connection')
-if (process.env.PG_FAST_CONNECTION) {
- Connection = require('./connection-fast')
-}
 
 var Client = function (config) {
  EventEmitter.call(this)