Skip to content

Commit 4a2b3d4

Browse files
committed
Merge branch 'kesavkolla-master'
2 parents 8d07daf + 1094040 commit 4a2b3d4

File tree

3 files changed

+32
-2
lines changed

3 files changed

+32
-2
lines changed

lib/client.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,9 @@ Client.prototype.query = function(config, values, callback) {
313313
if(this.binary && !query.binary) {
314314
query.binary = true;
315315
}
316-
query._result._getTypeParser = this._types.getTypeParser.bind(this._types);
316+
if(query._result) {
317+
query._result._getTypeParser = this._types.getTypeParser.bind(this._types);
318+
}
317319

318320
this.queryQueue.push(query);
319321
this._pulseQueryQueue();

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@
2525
"pg-connection-string": "0.1.3",
2626
"pg-types": "1.6.0",
2727
"pgpass": "0.0.3",
28-
"semver": "^4.1.0"
28+
"semver": "^4.1.0",
29+
"pg-copy-streams":"~0.3.0"
2930
},
3031
"devDependencies": {
3132
"async": "0.9.0",
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
var helper = require('../test-helper');
2+
var assert = require('assert');
3+
var copyFrom = require('pg-copy-streams').from;
4+
5+
if(helper.args.native) return;
6+
7+
helper.pg.connect(function (err, client, done) {
8+
if (err) throw err;
9+
10+
var c = 'CREATE TEMP TABLE employee (id integer, fname varchar(400), lname varchar(400))';
11+
12+
client.query(c, function (err) {
13+
if (err) throw err;
14+
15+
var stream = client.query(copyFrom("COPY employee FROM STDIN"));
16+
stream.on('end', function () {
17+
done();
18+
helper.pg.end();
19+
});
20+
21+
for (var i = 1; i <= 5; i++) {
22+
var line = ['1\ttest', i, '\tuser', i, '\n'];
23+
stream.write(line.join(''));
24+
}
25+
stream.end();
26+
});
27+
});

0 commit comments

Comments
 (0)