Merge pull request brianc#1 from brianc/master

merge

Author: shine-on

.jshintrc

@@ -0,0 +1,5 @@
+{
+  "trailing": true,
+  "indent": 2,
+  "evil": true
+}

.travis.yml

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

Makefile

@@ -1,45 +1,70 @@
 SHELL := /bin/bash
 
-user=postgres
-password=1234
-host=localhost
-port=5432
-database=postgres
-verbose=false
+connectionString=postgres://
 
-params := -u $(user) --password $(password) -p $(port) -d $(database) -h $(host) --verbose $(verbose)
+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
+.PHONY : test test-connection test-integration bench test-native \
+	build/default/binding.node jshint upgrade-pg publish
+
+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 
 
-test-all: test-unit test-integration test-native test-binary
+test-all: jshint 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
 
 bench:
 	@find benchmark -name "*-bench.js" | $(node-command)
 
 build/default/binding.node:
-	@node-waf configure build
+	@node-gyp rebuild
 
 test-unit:
 	@find test/unit -name "*-tests.js" | $(node-command)
 
 test-connection:
+	@echo "***Testing connection***"
 	@node script/test-connection.js $(params)
 
 test-connection-binary:
-	@node script/test-connection.js $(params) --binary true
+	@echo "***Testing binary connection***"
+	@node script/test-connection.js $(params) binary
 
 test-native: build/default/binding.node
 	@echo "***Testing native bindings***"
 	@find test/native -name "*-tests.js" | $(node-command)
-	@find test/integration -name "*-tests.js" | $(node-command) --native true
+	@find test/integration -name "*-tests.js" | $(node-command) native
 
-test-integration: test-connection
+test-integration: test-connection 
 	@echo "***Testing Pure Javascript***"
 	@find test/integration -name "*-tests.js" | $(node-command)
 
 test-binary: test-connection-binary
 	@echo "***Testing Pure Javascript (binary)***"
-	@find test/integration -name "*-tests.js" | $(node-command) --binary true
+	@find test/integration -name "*-tests.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
+
+publish:
+	@rm -r build || (exit 0)
+	@npm publish

NEWS.md

@@ -0,0 +1,70 @@
+All major and minor releases are briefly explained below.
+
+For richer information consult the commit log on github with referenced pull requests.
+
+We do not include break-fix version release in this file.
+
+### v2.5.0
+- Ability to opt-in to int8 parsing via `pg.defaults.parseInt8 = true`
+
+### v2.4.0
+- Use eval in the result set parser to increase performance
+
+### v2.3.0
+- Remove built-in support for binary Int64 parsing.
+_Due to the low usage & required compiled dependency this will be pushed into a 3rd party add-on_
+
+### v2.2.0
+- [Add support for excapeLiteral and escapeIdentifier in both JavaScript and the native bindings](https://github.com/brianc/node-postgres/pull/396)
+
+### v2.1.0
+- Add support for SSL connections in JavaScript driver
+ - this means you can connect to heroku postgres from your local machine without the native bindings!
+- [Add field metadata to result object](https://github.com/brianc/node-postgres/blob/master/test/integration/client/row-description-on-results-tests.js)
+- [Add ability for rows to be returned as arrays instead of objects](https://github.com/brianc/node-postgres/blob/master/test/integration/client/results-as-array-tests.js)
+
+### v2.0.0
+
+- Properly handle various PostgreSQL to JavaScript type conversions to avoid data loss:
+
+```
+PostgreSQL | pg@v2.0 JavaScript | pg@v1.0 JavaScript
+--------------------------------|----------------
+float4     | number (float)     | string
+float8     | number (float)     | string
+int8       | string             | number (int)
+numeric    | string             | number (float)
+decimal    | string             | number (float)
+```
+
+For more information see https://github.com/brianc/node-postgres/pull/353
+If you are unhappy with these changes you can always [override the built in type parsing fairly easily](https://github.com/brianc/node-pg-parse-float). 
+
+### v1.3.0
+
+- Make client_encoding configurable and optional
+
+### v1.2.0
+
+- return field metadata on result object: access via result.fields[i].name/dataTypeID
+
+### v1.1.0
+
+- built in support for `JSON` data type for PostgreSQL Server @ v9.2.0 or greater
+
+### v1.0.0
+
+- remove deprecated functionality
+  - Callback function passed to `pg.connect` now __requires__ 3 arguments
+  - Client#pauseDrain() / Client#resumeDrain removed
+  - numeric, decimal, and float data types no longer parsed into float before being returned. Will be returned from query results as `String`
+
+### v0.15.0
+
+- client now emits `end` when disconnected from back-end server
+- if client is disconnected in the middle of a query, query receives an error
+
+### v0.14.0
+
+- add deprecation warnings in prep for v1.0
+- fix read/write failures in native module under node v0.9.x