From 38c78677e81617a89baaa340047c016fd113d74c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Wed, 7 Nov 2018 15:01:24 +0100 Subject: [PATCH 1/5] Drop support for old version of Node.js and support latest LTS releases --- .travis.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 84a63dc..816e884 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,8 @@ language: node_js node_js: - - "0.12" - - "4" - - "5" - "6" + - "8" + - "10" addons: postgresql: "9.2" From de4755862815b72f115cf11c368ab15b02390c4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Wed, 7 Nov 2018 15:01:55 +0100 Subject: [PATCH 2/5] Support 'package-lock.json' --- package-lock.json | 193 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 193 insertions(+) create mode 100644 package-lock.json diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000..3e24a02 --- /dev/null +++ b/package-lock.json @@ -0,0 +1,193 @@ +{ + "name": "pg-copy-streams", + "version": "1.2.0-carto.2", + "lockfileVersion": 1, + "requires": true, + "dependencies": { + "async": { + "version": "0.2.10", + "resolved": "http://registry.npmjs.org/async/-/async-0.2.10.tgz", + "integrity": "sha1-trvgsGdLnXGXCMo43owjfLUmw9E=", + "dev": true + }, + "base64-js": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-0.0.2.tgz", + "integrity": "sha1-Ak8Pcq+iW3X5wO5zzU9V7Bvtl4Q=", + "dev": true + }, + "bops": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/bops/-/bops-0.0.6.tgz", + "integrity": "sha1-CC0dVfoB5g29wuvC26N/ZZVUzzo=", + "dev": true, + "requires": { + "base64-js": "0.0.2", + "to-utf8": "0.0.1" + } + }, + "buffer-writer": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/buffer-writer/-/buffer-writer-1.0.1.tgz", + "integrity": "sha1-Iqk2kB4wKa/NdUfrRIfOtpejvwg=", + "dev": true + }, + "concat-stream": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.1.0.tgz", + "integrity": "sha1-hCae/YzGUCdeMi8wnfRIZ7xRxfM=", + "dev": true, + "requires": { + "bops": "0.0.6" + } + }, + "generic-pool": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/generic-pool/-/generic-pool-2.1.1.tgz", + "integrity": "sha1-rwTcLDJc/Ll1Aj+lK/zpYXp0Nf0=", + "dev": true + }, + "gonna": { + "version": "0.0.0", + "resolved": "https://registry.npmjs.org/gonna/-/gonna-0.0.0.tgz", + "integrity": "sha1-6k4ZsVJ6F4LhJQVeMCSabUvHmlk=", + "dev": true + }, + "heroku-env": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/heroku-env/-/heroku-env-0.1.1.tgz", + "integrity": "sha1-wGeRyUTpuHSOMXf1S/cBQyZ+Yxc=", + "dev": true, + "requires": { + "parse-database-url": "~0.2.0" + } + }, + "lodash": { + "version": "2.2.1", + "resolved": "http://registry.npmjs.org/lodash/-/lodash-2.2.1.tgz", + "integrity": "sha1-ypNf0UqzwMhyq6zxmLnNpQFECGc=", + "dev": true + }, + "packet-reader": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/packet-reader/-/packet-reader-0.2.0.tgz", + "integrity": "sha1-gZ300BC4LV6lZx+KGjrPA5vNdwA=", + "dev": true + }, + "parse-database-url": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/parse-database-url/-/parse-database-url-0.2.2.tgz", + "integrity": "sha1-SGFa56fA/HfjKU0jVCpqUnPDVws=", + "dev": true + }, + "pg": { + "version": "4.4.6", + "resolved": "http://registry.npmjs.org/pg/-/pg-4.4.6.tgz", + "integrity": "sha1-EZgiP7rva6QRqm9Q4X9OtaGTFVk=", + "dev": true, + "requires": { + "buffer-writer": "1.0.1", + "generic-pool": "2.1.1", + "packet-reader": "0.2.0", + "pg-connection-string": "0.1.3", + "pg-types": "1.*", + "pgpass": "0.0.3", + "semver": "^4.1.0" + } + }, + "pg-connection-string": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-0.1.3.tgz", + "integrity": "sha1-2hhHsglA5C7hSSvq9l1J2RskXfc=", + "dev": true + }, + "pg-int8": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/pg-int8/-/pg-int8-1.0.1.tgz", + "integrity": "sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw==", + "dev": true + }, + "pg-types": { + "version": "1.13.0", + "resolved": "https://registry.npmjs.org/pg-types/-/pg-types-1.13.0.tgz", + "integrity": "sha512-lfKli0Gkl/+za/+b6lzENajczwZHc7D5kiUCZfgm914jipD2kIOIvEkAhZ8GrW3/TUoP9w8FHjwpPObBye5KQQ==", + "dev": true, + "requires": { + "pg-int8": "1.0.1", + "postgres-array": "~1.0.0", + "postgres-bytea": "~1.0.0", + "postgres-date": "~1.0.0", + "postgres-interval": "^1.1.0" + } + }, + "pgpass": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/pgpass/-/pgpass-0.0.3.tgz", + "integrity": "sha1-EuZ+NDsxicLzEgbrycwL7//PkUA=", + "dev": true, + "requires": { + "split": "~0.3" + } + }, + "postgres-array": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/postgres-array/-/postgres-array-1.0.3.tgz", + "integrity": "sha512-5wClXrAP0+78mcsNX3/ithQ5exKvCyK5lr5NEEEeGwwM6NJdQgzIJBVxLvRW+huFpX92F2QnZ5CcokH0VhK2qQ==", + "dev": true + }, + "postgres-bytea": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/postgres-bytea/-/postgres-bytea-1.0.0.tgz", + "integrity": "sha1-AntTPAqokOJtFy1Hz5zOzFIazTU=", + "dev": true + }, + "postgres-date": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/postgres-date/-/postgres-date-1.0.3.tgz", + "integrity": "sha1-4tiXAu/bJY/52c7g/pG9BpdSV6g=", + "dev": true + }, + "postgres-interval": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/postgres-interval/-/postgres-interval-1.1.2.tgz", + "integrity": "sha512-fC3xNHeTskCxL1dC8KOtxXt7YeFmlbTYtn7ul8MkVERuTmf7pI4DrkAxcw3kh1fQ9uz4wQmd03a1mRiXUZChfQ==", + "dev": true, + "requires": { + "xtend": "^4.0.0" + } + }, + "semver": { + "version": "4.3.6", + "resolved": "http://registry.npmjs.org/semver/-/semver-4.3.6.tgz", + "integrity": "sha1-MAvG4OhjdPe6YQaLWx7NV/xlMto=", + "dev": true + }, + "split": { + "version": "0.3.3", + "resolved": "http://registry.npmjs.org/split/-/split-0.3.3.tgz", + "integrity": "sha1-zQ7qXmOiEd//frDwkcQTPi0N0o8=", + "dev": true, + "requires": { + "through": "2" + } + }, + "through": { + "version": "2.3.8", + "resolved": "http://registry.npmjs.org/through/-/through-2.3.8.tgz", + "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=", + "dev": true + }, + "to-utf8": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/to-utf8/-/to-utf8-0.0.1.tgz", + "integrity": "sha1-0Xrqcv8vujm55DYBvns/9y4ImFI=", + "dev": true + }, + "xtend": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz", + "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=", + "dev": true + } + } +} From d55dbe70d5023c9a5af5fa0af50d940428b8dc63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Wed, 7 Nov 2018 15:06:38 +0100 Subject: [PATCH 3/5] Do not use deprecated Buffer constructor --- index.js | 6 +++--- test/copy-from.js | 4 ++-- test/copy-to.js | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/index.js b/index.js index c1b23f1..a170c72 100644 --- a/index.js +++ b/index.js @@ -30,11 +30,11 @@ CopyStreamQuery.prototype.submit = function(connection) { } -var copyDataBuffer = Buffer([code.CopyData]) +var copyDataBuffer = Buffer.from([code.CopyData]) CopyStreamQuery.prototype._transform = function(chunk, enc, cb) { var Int32Len = 4; this.push(copyDataBuffer) - var lenBuffer = Buffer(Int32Len) + var lenBuffer = Buffer.alloc(Int32Len) lenBuffer.writeUInt32BE(chunk.length + Int32Len, 0) this.push(lenBuffer) this.push(chunk) @@ -43,7 +43,7 @@ CopyStreamQuery.prototype._transform = function(chunk, enc, cb) { CopyStreamQuery.prototype._flush = function(cb) { var Int32Len = 4; - var finBuffer = Buffer([code.CopyDone, 0, 0, 0, Int32Len]) + var finBuffer = Buffer.from([code.CopyDone, 0, 0, 0, Int32Len]) this.push(finBuffer) this.cb_flush = cb } diff --git a/test/copy-from.js b/test/copy-from.js index ee98a11..d42216b 100644 --- a/test/copy-from.js +++ b/test/copy-from.js @@ -33,7 +33,7 @@ var testRange = function(top) { var txt = 'COPY numbers FROM STDIN' var stream = fromClient.query(copy(txt)) for(var i = 0; i < top; i++) { - stream.write(Buffer('' + i + '\t' + i*10 + '\n')) + stream.write(Buffer.from('' + i + '\t' + i*10 + '\n')) } stream.end() var countDone = gonna('have correct count') @@ -69,7 +69,7 @@ var testSingleEnd = function() { assert(count==1, '`end` Event was triggered ' + count + ' times'); if (count == 1) fromClient.end(); }) - stream.end(Buffer('1\n')) + stream.end(Buffer.from('1\n')) } testSingleEnd() diff --git a/test/copy-to.js b/test/copy-to.js index 9e88e71..7755453 100644 --- a/test/copy-to.js +++ b/test/copy-to.js @@ -31,7 +31,7 @@ var testComparators = function() { assert(copy1._gotCopyOutResponse, 'should have received CopyOutResponse') assert(!copy1._remainder, 'Message with no additional data (len=Int4Len+0) should not leave a remainder') })) - copy1.end(new Buffer([code.CopyOutResponse, 0x00, 0x00, 0x00, 0x04])); + copy1.end(Buffer.from([code.CopyOutResponse, 0x00, 0x00, 0x00, 0x04])); } From 01ab20fce2dc6963f9a27fe88ecb81af92c73bf7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Wed, 7 Nov 2018 16:50:38 +0100 Subject: [PATCH 4/5] Add note to README --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 820986c..f4c2b05 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,7 @@ +## Note + +This is forked repository from [brianc/node-pg-copy-streams](https://github.com/brianc/node-pg-query-stream) + ## pg-copy-streams [![Build Status](https://travis-ci.org/brianc/node-pg-copy-streams.svg)](https://travis-ci.org/brianc/node-pg-copy-streams) From a27bd1fd8f4337adf368f326a07f0f1d494a215b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Wed, 21 Nov 2018 17:57:20 +0100 Subject: [PATCH 5/5] Prepare next release --- NEWS.carto.md | 8 ++++++++ package-lock.json | 2 +- package.json | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/NEWS.carto.md b/NEWS.carto.md index f38605b..99d1d8a 100644 --- a/NEWS.carto.md +++ b/NEWS.carto.md @@ -1,5 +1,13 @@ # CARTO's Changelog +## v1.2.0-carto.3 +Released 2018-mm-dd + +Features: + * Drop support for Node.js 0.12, 4 and, 5. + * Add support for Node.js 8 and 10. + * Do not use deprecated Buffer constructors. + ## v1.2.0-carto.2 Released 2018-10-26 diff --git a/package-lock.json b/package-lock.json index 3e24a02..c149194 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "pg-copy-streams", - "version": "1.2.0-carto.2", + "version": "1.2.0-carto.3", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 89412c1..731621f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pg-copy-streams", - "version": "1.2.0-carto.2", + "version": "1.2.0-carto.3", "description": "Low-Level COPY TO and COPY FROM streams for PostgreSQL in JavaScript using", "main": "index.js", "scripts": {