cartodb/CartoDB-SQL-API
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

copy to: removing unnedeed client dependecy

Browse Source
This commit is contained in:
Simon Martín 2018-06-21 13:01:59 +02:00
parent e6448a3255
commit 42a94a3b6c
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/copy_controller.js
View File

@ -71,7 +71,7 @@ function handleCopyTo (logger) {
res.header("Content-Type", "application/octet-stream");
streamCopy.to(
function (err, pgstream, copyToStream, client, done) {
function (err, pgstream, copyToStream, done) {
if (err) {
return next(err);
}

13
app/services/stream_copy.js
View File

@ -1,6 +1,7 @@
const PSQL = require('cartodb-psql');
const copyTo = require('pg-copy-streams').to;
const copyFrom = require('pg-copy-streams').from;
const { Client } = require('pg');
module.exports = class StreamCopy {
constructor (sql, userDbParams) {
@ -20,9 +21,17 @@ module.exports = class StreamCopy {
pgstream
.on('end', () => done())
.on('error', err => done(err));
.on('error', err => done(err))
.on('cancelQuery', err => {
// See https://www.postgresql.org/docs/9.5/static/protocol-flow.html#PROTOCOL-COPY
const cancelingClient = new Client(client.connectionParameters);
cancelingClient.cancel(client, pgstream);
cb(null, pgstream, copyToStream, client, done);
// see https://node-postgres.com/api/pool#releasecallback
done(err);
});
cb(null, pgstream, copyToStream, done);
});
}