Fallback to user for db name instead of 'postgres' - fixes porsager#141

porsager · porsager · commit 0b33b7197b10 · 2021-02-12T09:29:28.000+01:00
diff --git a/lib/index.js b/lib/index.js
@@ -518,13 +518,14 @@ function parseOptions(a, b) {
       , auth = (url.auth || '').split(':')
       , host = o.hostname || o.host || url.hostname || env.PGHOST || 'localhost'
       , port = o.port || url.port || env.PGPORT || 5432
+      , user = o.user || o.username || auth[0] || env.PGUSERNAME || env.PGUSER || osUsername()
 
   return Object.assign({
     host,
     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 || auth[0] || env.PGUSERNAME || env.PGUSER || osUsername(),
+    database        : o.database || o.db || (url.pathname || '').slice(1) || env.PGDATABASE || user,
+    user            : user,
     pass            : o.pass || o.password || auth[1] || env.PGPASSWORD || '',
     max             : o.max || url.query.max || 10,
     types           : o.types || {},
diff --git a/tests/index.js b/tests/index.js
@@ -53,13 +53,15 @@ t('Connects with no options', async() => {
   return [1, result]
 })
 
-t('Uses default database without slash', async() =>
-  ['postgres', postgres('postgres://localhost').options.database]
-)
+t('Uses default database without slash', async() => {
+  const sql = postgres('postgres://localhost')
+  return [sql.options.user, sql.options.database]
+})
 
-t('Uses default database with slash', async() =>
-  ['postgres', postgres('postgres://localhost/').options.database]
-)
+t('Uses default database with slash', async() => {
+  const sql = postgres('postgres://localhost/')
+  return [sql.options.user, sql.options.database]
+})
 
 t('Result is array', async() =>
   [true, Array.isArray(await sql`select 1`)]
