merge with upstream

Author: hoegaarden

NEWS.md

@@ -4,6 +4,9 @@ For richer information consult the commit log on github with referenced pull req
 
 We do not include break-fix version release in this file.
 
+### v2.9.0
+- Add better support for [unix domain socket](https://github.com/brianc/node-postgres/pull/487) connections
+
 ### v2.8.0
 - Add support for parsing JSON[] and UUID[] result types
 

binding.gyp

@@ -2,13 +2,16 @@
   'targets': [
     {
       'target_name': 'binding',
+      'sources': ['src/binding.cc'],
+      'include_dirs': [
+        '<!@(pg_config --includedir)',
+        '<!(node -e "require(\'nan\')")'
+      ],
       'conditions' : [
         ['OS=="win"', {
           'conditions' : [
             ['"<!@(cmd /C where /Q pg_config || echo n)"!="n"',
               {
-                'sources': ['src/binding.cc'],
-                'include_dirs': ['<!@(pg_config --includedir)'],
                 'libraries' : ['libpq.lib'],
                 'msvs_settings': {
                   'VCLinkerTool' : {
@@ -24,8 +27,6 @@
           'conditions' : [
             ['"y"!="n"', # ToDo: add pg_config existance condition that works on linux
               {
-                'sources': ['src/binding.cc'],
-                'include_dirs': ['<!@(pg_config --includedir)'],
                 'libraries' : ['-lpq -L<!@(pg_config --libdir)']
               }
             ]

lib/connection-parameters.js

@@ -12,16 +12,24 @@ var val = function(key, config) {
 var url = require('url');
 //parses a connection string
 var parse = function(str) {
+  var config;
   //unix socket
   if(str.charAt(0) === '/') {
-    return { host: str };
+    config = str.split(' ');
+    return { host: config[0], database: config[1] };
   }
   // url parse expects spaces encoded as %20
-  str = encodeURI(str);
+  if(/ |%[^a-f0-9]|%[a-f0-9][^a-f0-9]/i.test(str)) str = encodeURI(str);
   var result = url.parse(str, true);
-  var config = {};
+  config = {};
+  if(result.protocol == 'socket:') {
+    config.host = decodeURI(result.pathname);
+    config.database = result.query.db;
+    config.client_encoding = result.query.encoding;
+    return config;
+  }
   config.host = result.hostname;
-  config.database = result.pathname ? result.pathname.slice(1) : null;
+  config.database = result.pathname ? decodeURI(result.pathname.slice(1)) : null;
   var auth = (result.auth || ':').split(':');
   config.user = auth[0];
   config.password = auth[1];

lib/types/textParsers.js

@@ -3,12 +3,12 @@ var arrayParser = require(__dirname + "/arrayParser.js");
 //parses PostgreSQL server formatted date strings into javascript date objects
 var parseDate = function(isoDate) {
   //TODO this could do w/ a refactor
-  var dateMatcher = /(\d{4})-(\d{2})-(\d{2}) (\d{2}):(\d{2}):(\d{2})(\.\d{1,})?/;
+  var dateMatcher = /(\d{1,})-(\d{2})-(\d{2}) (\d{2}):(\d{2}):(\d{2})(\.\d{1,})?/;
 
   var match = dateMatcher.exec(isoDate);
   //could not parse date
   if(!match) {
-    dateMatcher = /^(\d{4})-(\d{2})-(\d{2})$/;
+    dateMatcher = /^(\d{1,})-(\d{2})-(\d{2})$/;
     match = dateMatcher.test(isoDate);
     if(!match) {
       return null;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "pg",
-  "version": "2.8.3",
+  "version": "2.9.0",
   "description": "PostgreSQL client - pure javascript & libpq with the same API",
   "keywords": [
     "postgres",
@@ -20,7 +20,8 @@
   "dependencies": {
     "generic-pool": "2.0.3",
     "buffer-writer": "1.0.0",
-    "pgpass": "0.0.1"
+    "pgpass": "0.0.1",
+    "nan": "~0.6.0"
   },
   "devDependencies": {
     "jshint": "1.1.0",