Make almost all tests pass

brianc · brianc · commit c93f49b7227e · 2017-06-12T18:32:34.000-05:00
diff --git a/lib/native/index.js b/lib/native/index.js
@@ -46,6 +46,8 @@ var Client = module.exports = function(config) {
   this.namedQueries = {};
 };
 
+Client.Query = NativeQuery;
+
 util.inherits(Client, EventEmitter);
 
 //connect to the backend
@@ -106,34 +108,41 @@ Client.prototype.connect = function(cb) {
 //    optional string rowMode = 'array' for an array of results
 //  }
 Client.prototype.query = function(config, values, callback) {
-  var query = new NativeQuery(this.native);
+  if (typeof config.submit == 'function') {
+    this._queryQueue.push(config);
+    this._pulseQueryQueue();
+    return config;
+  }
+
+  var conf = { };
 
   //support query('text', ...) style calls
   if(typeof config == 'string') {
-    query.text = config;
+    conf.text = config;
   }
 
   //support passing everything in via a config object
   if(typeof config == 'object') {
-    query.text = config.text;
-    query.values = config.values;
-    query.name = config.name;
-    query.callback = config.callback;
-    query._arrayMode = config.rowMode == 'array';
+    conf.text = config.text;
+    conf.values = config.values;
+    conf.name = config.name;
+    conf.callback = config.callback;
+    conf.rowMode = config.rowMode;
   }
 
   //support query({...}, function() {}) style calls
   //& support query(..., ['values'], ...) style calls
   if(typeof values == 'function') {
-    query.callback = values;
+    conf.callback = values;
   }
   else if(util.isArray(values)) {
-    query.values = values;
+    conf.values = values;
   }
   if(typeof callback == 'function') {
-    query.callback = callback;
+    conf.callback = callback;
   }
 
+  var query = new NativeQuery(conf);
   this._queryQueue.push(query);
   this._pulseQueryQueue();
   return query;
diff --git a/lib/native/query.js b/lib/native/query.js
@@ -11,15 +11,20 @@ var util = require('util');
 var utils = require('../utils');
 var NativeResult = require('./result');
 
-var NativeQuery = module.exports = function(native) {
+var NativeQuery = module.exports = function(config, values) {
   EventEmitter.call(this);
-  this.native = native;
-  this.text = null;
-  this.values = null;
-  this.name = null;
-  this.callback = null;
+  if (typeof config == 'string') {
+    config = {
+      text: config,
+      values: values,
+    };
+  }
+  this.text = config.text;
+  this.values = config.values;
+  this.name = config.name;
+  this.callback = config.callback;
   this.state = 'new';
-  this._arrayMode = false;
+  this._arrayMode = config.rowMode == 'array';
 
   //if the 'row' event is listened for
   //then emit them as they come in
@@ -87,6 +92,7 @@ NativeQuery.prototype.handleError = function(err) {
 NativeQuery.prototype.submit = function(client) {
   this.state = 'running';
   var self = this;
+  this.native = client.native;
   client.native.arrayMode = this._arrayMode;
 
   var after = function(err, rows) {
@@ -136,19 +142,19 @@ NativeQuery.prototype.submit = function(client) {
     //check if the client has already executed this named query
     //if so...just execute it again - skip the planning phase
     if(client.namedQueries[this.name]) {
-      return this.native.execute(this.name, values, after);
+      return client.native.execute(this.name, values, after);
     }
     //plan the named query the first time, then execute it
-    return this.native.prepare(this.name, this.text, values.length, function(err) {
+    return client.native.prepare(this.name, this.text, values.length, function(err) {
       if(err) return after(err);
       client.namedQueries[self.name] = true;
       return self.native.execute(self.name, values, after);
     });
   }
   else if(this.values) {
     var vals = this.values.map(utils.prepareValue);
-    this.native.query(this.text, vals, after);
+    client.native.query(this.text, vals, after);
   } else {
-    this.native.query(this.text, after);
+    client.native.query(this.text, after);
   }
 };
diff --git a/test/integration/client/no-row-result-tests.js b/test/integration/client/no-row-result-tests.js
@@ -3,8 +3,10 @@ var pg = helper.pg;
 var config = helper.config;
 
 test('can access results when no rows are returned', function() {
-  console.log('maybe fix this?', __filename)
-  if(config.native) return false;
+  if(config.native) {
+    console.log('maybe fix this?', __filename)
+    return false
+  }
   var checkResult = function(result) {
     assert(result.fields, 'should have fields definition');
     assert.equal(result.fields.length, 1);
diff --git a/test/integration/gh-issues/131-tests.js b/test/integration/gh-issues/131-tests.js
@@ -1,13 +1,13 @@
-var helper = require(__dirname + "/../test-helper");
+var helper = require('../test-helper');
 var pg = helper.pg;
 
-test('parsing array results', function() {
-  pg.connect(helper.config, assert.calls(function(err, client, done) {
+test('parsing array results', function () {
+  pg.connect(helper.config, assert.calls(function (err, client, done) {
     assert.isNull(err);
     client.query("CREATE TEMP TABLE why(names text[], numbors integer[], decimals double precision[])");
     client.query(new pg.Query('INSERT INTO why(names, numbors, decimals) VALUES(\'{"aaron", "brian","a b c" }\', \'{1, 2, 3}\', \'{.1, 0.05, 3.654}\')')).on('error', console.log);
-      test('decimals', function() {
-      client.query('SELECT decimals FROM why', assert.success(function(result) {
+    test('decimals', function () {
+      client.query('SELECT decimals FROM why', assert.success(function (result) {
         assert.lengthIs(result.rows[0].decimals, 3);
         assert.equal(result.rows[0].decimals[0], 0.1);
         assert.equal(result.rows[0].decimals[1], 0.05);
