Fix remainder of error tests

Author: brianc

Makefile

@@ -36,8 +36,10 @@ test-connection:
 test-missing-native:
 	@echo "***Testing optional native install***"
 	@rm -rf node_modules/pg-native
+	@rm -rf node_modules/libpq
 	@node test/native/missing-native.js
 	@rm -rf node_modules/pg-native
+	@rm -rf node_modules/libpq
 
 node_modules/pg-native/index.js:
 	@npm i pg-native

lib/native/index.js

@@ -109,6 +109,10 @@ Client.prototype.connect = function(cb) {
 //  }
 Client.prototype.query = function(config, values, callback) {
   if (typeof config.submit == 'function') {
+    // accept query(new Query(...), (err, res) => { }) style
+    if (typeof values == 'function') {
+      config.callback = values;
+    }
     this._queryQueue.push(config);
     this._pulseQueryQueue();
     return config;

lib/native/query.js

@@ -11,14 +11,9 @@ var util = require('util');
 var utils = require('../utils');
 var NativeResult = require('./result');
 
-var NativeQuery = module.exports = function(config, values) {
+var NativeQuery = module.exports = function(config, values, callback) {
   EventEmitter.call(this);
-  if (typeof config == 'string') {
-    config = {
-      text: config,
-      values: values,
-    };
-  }
+  config = utils.normalizeQueryConfig(config, values, callback);
   this.text = config.text;
   this.values = config.values;
   this.name = config.name;

test/integration/client/query-error-handling-prepared-statement-tests.js

@@ -64,24 +64,29 @@ test('client end during query execution of prepared statement', function() {
   var client = new Client(helper.args);
   client.connect(assert.success(function() {
     var sleepQuery = 'select pg_sleep($1)';
-    var query1 = client.query(new Query({
+
+    var queryConfig = {
       name: 'sleep query',
       text: sleepQuery,
-      values: [5] },
-      assert.calls(function(err, result) {
-        assert.equal(err.message, 'Connection terminated');
-    })));
+      values: [5],
+    }
 
+    var queryInstance = new Query(queryConfig, assert.calls(function (err, result) {
+      assert.equal(err.message, 'Connection terminated');
+    }))
 
-    query1.on('error', function(err) {
+    var query1 = client.query(queryInstance);
+
+
+    query1.on('error', function (err) {
       assert.fail('Prepared statement should not emit error');
     });
 
-    query1.on('row', function(row) {
+    query1.on('row', function (row) {
       assert.fail('Prepared statement should not emit row');
     });
 
-    query1.on('end', function(err) {
+    query1.on('end', function (err) {
       assert.fail('Prepared statement when executed should not return before being killed');
     });
 

test/integration/client/query-error-handling-tests.js

@@ -40,7 +40,9 @@ test('error during query execution', function() {
   }));
 });
 
-if(helper.config.native) return;
+if (helper.config.native) {
+  return console.log("\nTODO: this should work on native as well")
+}
 
 test('9.3 column error fields', function() {
   var client = new Client(helper.args);
@@ -50,12 +52,10 @@ test('9.3 column error fields', function() {
         return client.end();
       }
 
-      client.query('DROP TABLE IF EXISTS column_err_test');
-      client.query('CREATE TABLE column_err_test(a int NOT NULL)');
+      client.query('CREATE TEMP TABLE column_err_test(a int NOT NULL)');
       client.query('INSERT INTO column_err_test(a) VALUES (NULL)', function (err) {
         assert.equal(err.severity, 'ERROR');
         assert.equal(err.code, '23502');
-        assert.equal(err.schema, 'public');
         assert.equal(err.table, 'column_err_test');
         assert.equal(err.column, 'a');
         return client.end();
@@ -73,13 +73,11 @@ test('9.3 constraint error fields', function() {
         return client.end();
       }
 
-      client.query('DROP TABLE IF EXISTS constraint_err_test');
-      client.query('CREATE TABLE constraint_err_test(a int PRIMARY KEY)');
+      client.query('CREATE TEMP TABLE constraint_err_test(a int PRIMARY KEY)');
       client.query('INSERT INTO constraint_err_test(a) VALUES (1)');
       client.query('INSERT INTO constraint_err_test(a) VALUES (1)', function (err) {
         assert.equal(err.severity, 'ERROR');
         assert.equal(err.code, '23505');
-        assert.equal(err.schema, 'public');
         assert.equal(err.table, 'constraint_err_test');
         assert.equal(err.constraint, 'constraint_err_test_pkey');
         return client.end();