Fix url auth

porsager · porsager · commit e6060ba55bf6 · 2019-11-28T00:45:13.000+01:00
diff --git a/lib/index.js b/lib/index.js
@@ -402,6 +402,7 @@ function parseOptions(uri, options) {
   const o = options || uri
       , env = process.env // eslint-disable-line
       , url = options ? Url.parse(uri, true) : { query: {}, pathname: '' }
+      , auth = (url.auth || '').split(':')
       , host = o.hostname || o.host || url.hostname || env.PGHOST || 'localhost'
       , port = o.port || url.port || env.PGPORT || 5432
 
@@ -410,8 +411,8 @@ function parseOptions(uri, options) {
     port,
     path        : o.path || host.indexOf('/') > -1 && host + '/.s.PGSQL.' + port,
     database    : o.database || o.db || url.pathname.slice(1) || env.PGDATABASE || 'postgres',
-    user        : o.user || o.username || url.user || env.PGUSERNAME || os.userInfo().username,
-    pass        : o.pass || o.password || url.pass || env.PGPASSWORD || '',
+    user        : o.user || o.username || auth[0] || env.PGUSERNAME || os.userInfo().username,
+    pass        : o.pass || o.password || auth[1] || env.PGPASSWORD || '',
     max         : o.max || url.query.max || Math.max(1, os.cpus().length),
     fifo        : o.fifo || url.query.fifo || false,
     transform   : o.transform || (x => x),
