callback api working

bmc · bmc · commit 47591d677b22 · 2011-03-01T19:51:25.000Z
diff --git a/lib/native.js b/lib/native.js
@@ -119,14 +119,16 @@ var NativeQuery = function(text, values, callback) {
     this.values = text.values;
   } else {
     this.text = text;
-    if(typeof values == 'function') {
-      this.callback = values;
-    } else {
-      this.callback = callback;
-      this.values = values;
-    }
+    this.callback = callback;
+    this.values = values;
+  }
+  if(typeof values == 'function') {
+    this.values = null;
+    this.callback = values;
+  }
+  if(this.callback) {
+    this.rows = [];
   }
-  this.rows = [];
   EventEmitter.call(this);
   this._translateValues();
 };
@@ -135,7 +137,6 @@ sys.inherits(NativeQuery, EventEmitter);
 var p = NativeQuery.prototype;
 
 p.handleRow = function(row) {
-  console.log('handling row');
   if(this.callback) {
     this.rows.push(row);
   }
@@ -144,7 +145,7 @@ p.handleRow = function(row) {
 
 p.handleReadyForQuery = function() {
   if(this.callback) {
-    this.callback(null, this.rows);
+    this.callback(null, { rows: this.rows });
   }
   this.emit('end');
 };
diff --git a/test/native/callback-api-tests.js b/test/native/callback-api-tests.js
@@ -4,10 +4,14 @@ var conString = helper.connectionString();
 
 test('fires callback with results', function() {
   var client = new Client(conString);
-  var q = client.query('SELECT 1', assert.calls(function(err, result) {
-    
+  client.connect();
+  client.query('SELECT 1 as num', assert.calls(function(err, result) {
+    assert.isNull(err);
+    assert.equal(result.rows[0].num, 1);
+    client.query('SELECT * FROM person WHERE name = $1', ['Brian'], assert.calls(function(err, result) {
+      assert.isNull(err);
+      assert.equal(result.rows[0].name, 'Brian');
+      client.end();
+    }))
   }));
-  q.on('row', function(row) {
-    console.log(row);
-  })
 })
