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

unify to and from method in only one getPGStream

Browse Source
This commit is contained in:
Simon Martín 2018-06-21 15:16:47 +02:00
parent 3ede1ea9f1
commit 823e3abcfe
1 changed files with 12 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
app/services/stream_copy.js
View File

@ -11,7 +11,6 @@ module.exports = class StreamCopy {
this.pg = new PSQL(userDbParams);
this.sql = sql;
this.connectionClosedByClient = false;
this.stream = null;
}
@ -23,45 +22,30 @@ module.exports = class StreamCopy {
return ACTION_FROM;
}
to(cb) {
getStream(action, cb) {
this.pg.connect((err, client, done) => {
if (err) {
return cb(err);
}
this.stream = copyTo(this.sql);
let streamMaker = action === ACTION_TO ? copyTo : copyFrom;
this.stream = streamMaker(this.sql);
const pgstream = client.query(this.stream);
pgstream
.on('end', () => done())
.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);
if(action === ACTION_TO) {
// See https://www.postgresql.org/docs/9.5/static/protocol-flow.html#PROTOCOL-COPY
const cancelingClient = new Client(client.connectionParameters);
cancelingClient.cancel(client, pgstream);
// see https://node-postgres.com/api/pool#releasecallback
done(err);
});
cb(null, pgstream);
});
}
from(cb) {
this.pg.connect((err, client, done) => {
if (err) {
return cb(err);
}
this.stream = copyFrom(this.sql);
const pgstream = client.query(this.stream);
pgstream
.on('end', () => done())
.on('error', err => done(err))
.on('cancelQuery', () => {
client.connection.sendCopyFail('CARTO SQL API: Connection closed by client');
// see https://node-postgres.com/api/pool#releasecallback
done(err);
} else if (action === ACTION_FROM) {
client.connection.sendCopyFail('CARTO SQL API: Connection closed by client');
}
});
cb(null, pgstream);