Merge pull request brianc#657 from brianc/libpq

Rewrite native bindings

Author: brianc

.travis.yml

@@ -1,6 +1,7 @@
 language: node_js
 node_js:
   - "0.10"
+  - "0.11"
 before_script:
   - node script/create-test-tables.js pg://postgres@127.0.0.1:5432/postgres
 env:

Makefile

@@ -7,35 +7,26 @@ params := $(connectionString)
 node-command := xargs -n 1 -I file node file $(params)
 
 .PHONY : test test-connection test-integration bench test-native \
-	build/default/binding.node jshint upgrade-pg publish
+	 jshint publish test-missing-native update-npm
 
 all:
 	npm install
 
-build:
-	node-gyp rebuild
-
 help:
 	@echo "make prepare-test-db [connectionString=postgres://<your connection string>]"
 	@echo "make test-all [connectionString=postgres://<your connection string>]"
 
 test: test-unit
 
-test-all: jshint test-unit test-integration test-native test-binary
+test-all: jshint test-missing-native test-unit test-integration test-native test-binary
 
-test-travis: test-all upgrade-pg
-	#@make test-all connectionString=postgres://postgres@localhost:5433/postgres
 
-upgrade-pg:
-	#@chmod 755 script/travis-pg-9.2-install.sh
-	#@./script/travis-pg-9.2-install.sh
+udpate-npm:
+	@npm i npm --global
 
 bench:
 	@find benchmark -name "*-bench.js" | $(node-command)
 
-build/default/binding.node:
-	@node-gyp rebuild
-
 test-unit:
 	@find test/unit -name "*-tests.js" | $(node-command)
 
@@ -47,12 +38,23 @@ test-connection-binary:
 	@echo "***Testing binary connection***"
 	@node script/test-connection.js $(params) binary
 
-test-native: build/default/binding.node
+test-missing-native:
+	@echo "***Testing optional native install***"
+	@rm -rf node_modules/pg-native
+	@node test/native/missing-native.js
+	@npm install pg-native@1.4.0
+	@node test/native/missing-native.js
+	@rm -rf node_modules/pg-native
+
+node_modules/pg-native/index.js:
+	@npm i pg-native
+
+test-native: node_modules/pg-native/index.js
 	@echo "***Testing native bindings***"
 	@find test/native -name "*-tests.js" | $(node-command)
 	@find test/integration -name "*-tests.js" | $(node-command) native
 
-test-integration: test-connection build/default/binding.node
+test-integration: test-connection
 	@echo "***Testing Pure Javascript***"
 	@find test/integration -name "*-tests.js" | $(node-command)
 
@@ -67,7 +69,3 @@ prepare-test-db:
 jshint:
 	@echo "***Starting jshint***"
 	@./node_modules/.bin/jshint lib
-
-publish:
-	@rm -r build || (exit 0)
-	@npm publish

binding.gyp

@@ -7,8 +7,6 @@ var ConnectionParameters = require(__dirname + '/connection-parameters');
 var Query = require(__dirname + '/query');
 var defaults = require(__dirname + '/defaults');
 var Connection = require(__dirname + '/connection');
-var CopyFromStream = require(__dirname + '/copystream').CopyFromStream;
-var CopyToStream = require(__dirname + '/copystream').CopyToStream;
 
 var Client = function(config) {
   EventEmitter.call(this);
@@ -130,17 +128,6 @@ Client.prototype.connect = function(callback) {
       self.activeQuery.handleCopyInResponse(self.connection);
     });
 
-    con.on('copyOutResponse', function(msg) {
-      if(self.activeQuery.stream === undefined) {
-        self.activeQuery._canceledDueToError = new Error('No destination stream defined');
-        //canceling query requires creation of new connection
-        //look for postgres frontend/backend protocol
-        //TODO - this needs to die/be refactored
-        (new self.constructor({port: self.port, host: self.host}))
-          .cancel(self, self.activeQuery);
-      }
-    });
-
     con.on('copyData', function (msg) {
       self.activeQuery.handleCopyData(msg, self.connection);
     });
@@ -185,13 +172,13 @@ Client.prototype.connect = function(callback) {
   con.once('end', function() {
     if ( callback ) {
       // haven't received a connection message yet !
-      var err = new Error('Connection was ended during query');
+      var err = new Error('Connection terminated');
       callback(err);
       callback = null;
       return;
     }
     if(self.activeQuery) {
-      var disconnectError = new Error('Connection was ended during query');
+      var disconnectError = new Error('Connection terminated');
       self.activeQuery.handleError(disconnectError, con);
       self.activeQuery = null;
     }
@@ -209,9 +196,8 @@ Client.prototype.getStartupConf = function() {
   var params = this.connectionParameters;
 
   var data = {
-    user     : params.user ,
-    database : params.database
-    // client_encoding : "'".concat(params.client_encoding).concat("'")
+    user: params.user,
+    database: params.database
   };
 
   var appName = params.application_name || params.fallback_application_name;
@@ -301,30 +287,12 @@ Client.prototype._pulseQueryQueue = function() {
   }
 };
 
-Client.prototype._copy = function (text, stream) {
-  var config = {};
-  config.text = text;
-  config.stream = stream;
-  config.callback = function (error) {
-    if(error) {
-      config.stream.error(error);
-    } else {
-      config.stream.close();
-    }
-  };
-  var query = new Query(config);
-  this.queryQueue.push(query);
-  this._pulseQueryQueue();
-  return config.stream;
-
-};
-
 Client.prototype.copyFrom = function (text) {
-  return this._copy(text, new CopyFromStream());
+  throw new Error("For PostgreSQL COPY TO/COPY FROM support npm install pg-copy-streams");
 };
 
 Client.prototype.copyTo = function (text) {
-  return this._copy(text, new CopyToStream());
+  throw new Error("For PostgreSQL COPY TO/COPY FROM support npm install pg-copy-streams");
 };
 
 Client.prototype.query = function(config, values, callback) {