Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: brianc/node-postgres
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v6.1.4
Choose a base ref
...
head repository: brianc/node-postgres
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v6.1.5
Choose a head ref
  • 3 commits
  • 3 files changed
  • 3 contributors

Commits on Mar 20, 2017

  1. Update README.md (#1247) 

    grammar fix
    @ryhamz @brianc
    ryhamz authored and brianc committed Mar 20, 2017
    Copy the full SHA
    549404e View commit details

  2. Fix ECONNRESET error emitted after failed connect (#1230) 

    On Windows, after a connect attempt has failed, an error event with
ECONNRESET is emitted after the real connect error is propagated to the
connect callback, because the connection is not in ending state
(connection._ending) where ECONNRESET is ignored. This change ends the
connection when connect has failed.

This fixes #746.
    @magnushiie @brianc
    magnushiie authored and brianc committed Mar 20, 2017
    Copy the full SHA
    197f86f View commit details

  3. Bump version

    @brianc
    brianc committed Mar 20, 2017
    Copy the full SHA
    3de22ba View commit details
Showing with 3 additions and 2 deletions.
  1. +1 −1 README.md
  2. +1 −0 lib/client.js
  3. +1 −1 package.json
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
@@ -72,7 +72,7 @@ var config = {


//this initializes a connection pool
//it will keep idle connections open for a 30 seconds
//it will keep idle connections open for 30 seconds
//and set a limit of maximum 10 idle clients
var pool = new pg.Pool(config);

1 change: 1 addition & 0 deletions lib/client.js
View file
Original file line number Diff line number Diff line change
@@ -182,6 +182,7 @@ Client.prototype.connect = function(callback) {
if(!callback) {
return self.emit('error', error);
}
con.end(); // make sure ECONNRESET errors don't cause error events
callback(error);
callback = null;
});
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "pg",
"version": "6.1.4",
"version": "6.1.5",
"description": "PostgreSQL client - pure javascript & libpq with the same API",
"keywords": [
"postgres",