Add more versions to the travis test matrix

Add node 4.2.2 to Travis
Minimum postgres 9.2 to allow tests to complete in Travis

Remove test that is no longer needed since we no longer disconnect/reconnect listeners

copy-to.js

@@ -4,7 +4,6 @@ module.exports = function(txt, options) {
 
 var Transform = require('stream').Transform
 var util = require('util')
-var code = require('./message-formats')
 
 var CopyStreamQuery = function(text, options) {
   Transform.call(this, options)
@@ -24,6 +23,13 @@ CopyStreamQuery.prototype.submit = function(connection) {
   connection.stream.pipe(this)
 }
 
+var code = {
+  E: 69, //Error
+  H: 72, //CopyOutResponse
+  d: 0x64, //CopyData
+  c: 0x63 //CopyDone
+}
+
 CopyStreamQuery.prototype._detach = function() {
   this.connection.stream.unpipe(this)
   // Unpipe can drop us out of flowing mode
@@ -38,13 +44,13 @@ CopyStreamQuery.prototype._transform = function(chunk, enc, cb) {
   }
   if(!this._copyOutResponse) {
     this._copyOutResponse = true
-    if(chunk[0] == code.ErrorResponse) {
+    if(chunk[0] == code.E) {
       this._detach()
       this.push(null)
       return cb();
     }
-    if(chunk[0] != code.CopyOutResponse) {
-      this.emit('error', new Error('Expected CopyOutResponse code (H)'))
+    if(chunk[0] != code.H) {
+      this.emit('error', new Error('Expected copy out response'))
     }
     var length = chunk.readUInt32BE(1)
     offset = 1
@@ -53,14 +59,14 @@ CopyStreamQuery.prototype._transform = function(chunk, enc, cb) {
   while((chunk.length - offset) > 5) {
     var messageCode = chunk[offset]
     //complete or error
-    if(messageCode == code.CopyDone || messageCode == code.ErrorResponse) {
+    if(messageCode == code.c || messageCode == code.E) {
       this._detach()
       this.push(null)
       return cb();
     }
     //something bad happened
-    if(messageCode != code.CopyData) {
-      return this.emit('error', new Error('Expected CopyData code (d)'))
+    if(messageCode != code.d) {
+      return this.emit('error', new Error('expected "d" (copydata message)'))
     }
     var length = chunk.readUInt32BE(offset + 1) - 4 //subtract length of UInt32
     //can we read the next row?

index.js

@@ -10,7 +10,6 @@ module.exports = {
 
 var Transform = require('stream').Transform
 var util = require('util')
-var code = require('./message-formats')
 
 var CopyStreamQuery = function(text, options) {
   Transform.call(this, options)
@@ -27,21 +26,28 @@ CopyStreamQuery.prototype.submit = function(connection) {
   connection.query(this.text)
 }
 
+var code = {
+  H: 72, //CopyOutResponse
+  d: 0x64, //CopyData
+  c: 0x63 //CopyDone
+}
 
-var copyDataBuffer = Buffer([code.CopyData])
+var copyDataBuffer = Buffer([code.d])
 CopyStreamQuery.prototype._transform = function(chunk, enc, cb) {
   this.push(copyDataBuffer)
   var lenBuffer = Buffer(4)
   lenBuffer.writeUInt32BE(chunk.length + 4, 0)
   this.push(lenBuffer)
   this.push(chunk)
+  this.rowCount++
   cb()
 }
 
 CopyStreamQuery.prototype._flush = function(cb) {
-  var finBuffer = Buffer([code.CopyDone, 0, 0, 0, 4])
+  var finBuffer = Buffer([code.c, 0, 0, 0, 4])
   this.push(finBuffer)
-  cb()
+  //never call this callback, do not close underlying stream
+  //cb()
 }
 
 CopyStreamQuery.prototype.handleError = function(e) {
@@ -49,17 +55,10 @@ CopyStreamQuery.prototype.handleError = function(e) {
 }
 
 CopyStreamQuery.prototype.handleCopyInResponse = function(connection) {
-  this.pipe(connection.stream, { end: false })
+  this.pipe(connection.stream)
 }
 
-CopyStreamQuery.prototype.handleCommandComplete = function(msg) {
-  // Parse affected row count as in
-  // https://github.com/brianc/node-postgres/blob/35e5567f86774f808c2a8518dd312b8aa3586693/lib/result.js#L37
-  var match = /COPY (\d+)/.exec((msg || {}).text)
-  if (match) {
-    this.rowCount = parseInt(match[1], 10)
-  }
-
+CopyStreamQuery.prototype.handleCommandComplete = function() {
   this.unpipe()
   this.emit('end')
 }

message-formats.js

@@ -1,17 +0,0 @@
-/**
- * The COPY feature uses the following protocol codes.
- * The codes for the most recent protocol version are documented on
- * https://www.postgresql.org/docs/current/static/protocol-message-formats.html
- * 
- * The protocol flow itself is described on
- * https://www.postgresql.org/docs/current/static/protocol-flow.html
- */
-module.exports = {
-  ErrorResponse:    0x45,
-  CopyInResponse:   0x47,
-  CopyOutResponse:  0x48,
-  CopyBothResponse: 0x57,
-  CopyData:         0x64,
-  CopyDone:         0x63,
-  CopyFail:         0x66
-} 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "pg-copy-streams",
-  "version": "1.1.2",
+  "version": "0.3.0",
   "description": "Low-Level COPY TO and COPY FROM streams for PostgreSQL in JavaScript using",
   "main": "index.js",
   "scripts": {

test/copy-from.js

@@ -30,6 +30,10 @@ var testRange = function(top) {
 
   var txt = 'COPY numbers FROM STDIN'
   var stream = fromClient.query(copy(txt))
+  var rowEmitCount = 0
+  stream.on('row', function() {
+    rowEmitCount++
+  })
   for(var i = 0; i < top; i++) {
     stream.write(Buffer('' + i + '\t' + i*10 + '\n'))
   }