Cleanup test execution & makefile cruft

Author: brianc

Makefile

@@ -13,7 +13,6 @@ all:
 	npm install
 
 help:
-	@echo "make prepare-test-db [connectionString=postgres://<your connection string>]"
 	@echo "make test-all [connectionString=postgres://<your connection string>]"
 
 test: test-unit
@@ -32,11 +31,7 @@ test-unit:
 
 test-connection:
 	@echo "***Testing connection***"
-	@node script/test-connection.js $(params)
-
-test-connection-binary:
-	@echo "***Testing binary connection***"
-	@node script/test-connection.js $(params) binary
+	@node script/create-test-tables.js $(params)
 
 test-missing-native:
 	@echo "***Testing optional native install***"
@@ -47,7 +42,7 @@ test-missing-native:
 node_modules/pg-native/index.js:
 	@npm i pg-native
 
-test-native: node_modules/pg-native/index.js
+test-native: node_modules/pg-native/index.js test-connection
 	@echo "***Testing native bindings***"
 	@find test/native -name "*-tests.js" | $(node-command)
 	@find test/integration -name "*-tests.js" | $(node-command) native
@@ -56,17 +51,13 @@ test-integration: test-connection
 	@echo "***Testing Pure Javascript***"
 	@find test/integration -name "*-tests.js" | $(node-command)
 
-test-binary: test-connection-binary
+test-binary: test-connection
 	@echo "***Testing Pure Javascript (binary)***"
 	@find test/integration -name "*-tests.js" | $(node-command) binary
 
 test-pool:
 	@find test/integration/connection-pool -name "*.js" | $(node-command) binary
 
-prepare-test-db:
-	@echo "***Preparing the database for tests***"
-	@find script/create-test-tables.js  | $(node-command)
-
 jshint:
 	@echo "***Starting jshint***"
 	@./node_modules/.bin/jshint lib

package.json

@@ -30,7 +30,8 @@
     "async": "0.9.0",
     "jshint": "2.5.2",
     "lodash": "4.13.1",
-    "pg-copy-streams": "0.3.0"
+    "pg-copy-streams": "0.3.0",
+    "promise-polyfill": "5.2.1"
   },
   "minNativeVersion": "1.7.0",
   "scripts": {

script/create-test-tables.js

@@ -38,23 +38,17 @@ var con = new pg.Client({
   database: args.database
 });
 con.connect();
-if(args.down) {
-  console.log("Dropping table 'person'")
-  var query = con.query("drop table if exists person");
-  query.on('end', function() {
-    console.log("Dropped!");
-    con.end();
-  });
-} else {
-  console.log("Creating table 'person'");
-  con.query("create table person(id serial, name varchar(10), age integer)").on('end', function(){
-    console.log("Created!");
-    console.log("Filling it with people");
-  });;
-  people.map(function(person) {
-    return con.query("insert into person(name, age) values('"+person.name + "', '" + person.age + "')");
-  }).pop().on('end', function(){
-    console.log("Inserted 26 people");
-    con.end();
-  });
-}
+var query = con.query("drop table if exists person");
+query.on('end', function() {
+  console.log("Dropped table 'person'")
+});
+con.query("create table person(id serial, name varchar(10), age integer)").on('end', function(){
+  console.log("Created table person");
+  console.log("Filling it with people");
+});
+people.map(function(person) {
+  return con.query("insert into person(name, age) values('"+person.name + "', '" + person.age + "')");
+}).pop().on('end', function(){
+  console.log("Inserted 26 people");
+  con.end();
+});

script/test-connection.js

@@ -1,6 +1,11 @@
 //make assert a global...
 assert = require('assert');
 
+//support for [email protected]
+if (typeof Promise == 'undefined') {
+  global.Promise = require('promise-polyfill')
+}
+
 var EventEmitter = require('events').EventEmitter;
 var sys = require('util');
 var BufferList = require(__dirname+'/buffer-list')