Skip to content

Commit

Permalink
Merge branch 'kesavkolla-master'
Browse files Browse the repository at this point in the history
  • Loading branch information
brianc committed Dec 13, 2014
2 parents 8d07daf + 1094040 commit 4a2b3d4
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 2 deletions.
4 changes: 3 additions & 1 deletion lib/client.js
Expand Up @@ -313,7 +313,9 @@ Client.prototype.query = function(config, values, callback) {
if(this.binary && !query.binary) {
query.binary = true;
}
query._result._getTypeParser = this._types.getTypeParser.bind(this._types);
if(query._result) {
query._result._getTypeParser = this._types.getTypeParser.bind(this._types);
}

this.queryQueue.push(query);
this._pulseQueryQueue();
Expand Down
3 changes: 2 additions & 1 deletion package.json
Expand Up @@ -25,7 +25,8 @@
"pg-connection-string": "0.1.3",
"pg-types": "1.6.0",
"pgpass": "0.0.3",
"semver": "^4.1.0"
"semver": "^4.1.0",
"pg-copy-streams":"~0.3.0"
},
"devDependencies": {
"async": "0.9.0",
Expand Down
27 changes: 27 additions & 0 deletions test/integration/gh-issues/699-tests.js
@@ -0,0 +1,27 @@
var helper = require('../test-helper');
var assert = require('assert');
var copyFrom = require('pg-copy-streams').from;

if(helper.args.native) return;

helper.pg.connect(function (err, client, done) {
if (err) throw err;

var c = 'CREATE TEMP TABLE employee (id integer, fname varchar(400), lname varchar(400))';

client.query(c, function (err) {
if (err) throw err;

var stream = client.query(copyFrom("COPY employee FROM STDIN"));
stream.on('end', function () {
done();
helper.pg.end();
});

for (var i = 1; i <= 5; i++) {
var line = ['1\ttest', i, '\tuser', i, '\n'];
stream.write(line.join(''));
}
stream.end();
});
});

0 comments on commit 4a2b3d4

Please sign in to comment.