cartodb/node-postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'libpq' of https://github.com/brianc/node-postgres into libpq

Browse Source
This commit is contained in:
Brian Carlson 2011-02-24 08:05:48 -06:00
commit 3233dba5ad
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/native.js
View File

@ -46,8 +46,8 @@ p.connect = function() {
}) })
} }
p.query = function(queryString) { p.query = function(config) {
var q = new NativeQuery(queryString); var q = new NativeQuery(config);
this._queryQueue.push(q); this._queryQueue.push(q);
this._pulseQueryQueue(); this._pulseQueryQueue();
return q; return q;
@ -79,7 +79,7 @@ var ctor = function(config) {
connection._pulseQueryQueue(); connection._pulseQueryQueue();
}); });
//proxy some events to active query //proxy some events to active query
connection.on('_row', function(row) { connection.on('_row', function(row) {
connection._activeQuery.emit('row', row); connection._activeQuery.emit('row', row);
}) })
@ -108,7 +108,11 @@ var connect = function(config, callback) {
//event emitter proxy //event emitter proxy
var NativeQuery = function(text) { var NativeQuery = function(text) {
this.text = text; if(typeof text == 'object') {
this.text = text.text;
} else {
this.text = text;
}
EventEmitter.call(this); EventEmitter.call(this);
}; };

13
test/native/evented-api-tests.js
View File

@ -39,7 +39,18 @@ test('multiple results', function() {
assert.equal(row.name, 'Aaron'); assert.equal(row.name, 'Aaron');
assert.emits(q, 'row', function(row) { assert.emits(q, 'row', function(row) {
assert.equal(row.name, "Brian"); assert.equal(row.name, "Brian");
client.end();
})
})
assert.emits(q, 'end', function() {
test('query with config', function() {
var q = client.query({text:'SELECT 1 as num'});
assert.emits(q, 'row', function(row) {
assert.strictEqual(row.num, 1);
assert.emits(q, 'end', function() {
client.end();
})
})
}) })
}) })
}) })