build

Author: porsager

cf/src/index.js

@@ -428,7 +428,7 @@ function parseOptions(a, b) {
     return a
 
   const env = process.env // eslint-disable-line
-      , o = (typeof a === 'string' ? b : a) || {}
+      , o = (!a || typeof a === 'string' ? b : a) || {}
       , { url, multihost } = parseUrl(a)
       , query = [...url.searchParams].reduce((a, [b, c]) => (a[b] = c, a), {})
       , host = o.hostname || o.host || multihost || url.hostname || env.PGHOST || 'localhost'
@@ -529,7 +529,7 @@ function parseTransform(x) {
 }
 
 function parseUrl(url) {
-  if (typeof url !== 'string')
+  if (!url || typeof url !== 'string')
     return { url: { searchParams: new Map() } }
 
   let host = url

cjs/src/index.js

@@ -427,7 +427,7 @@ function parseOptions(a, b) {
     return a
 
   const env = process.env // eslint-disable-line
-      , o = (typeof a === 'string' ? b : a) || {}
+      , o = (!a || typeof a === 'string' ? b : a) || {}
       , { url, multihost } = parseUrl(a)
       , query = [...url.searchParams].reduce((a, [b, c]) => (a[b] = c, a), {})
       , host = o.hostname || o.host || multihost || url.hostname || env.PGHOST || 'localhost'
@@ -528,7 +528,7 @@ function parseTransform(x) {
 }
 
 function parseUrl(url) {
-  if (typeof url !== 'string')
+  if (!url || typeof url !== 'string')
     return { url: { searchParams: new Map() } }
 
   let host = url

cjs/tests/bootstrap.js

@@ -1,15 +1,19 @@
 const { spawnSync } = require('child_process')
 
+exec('dropdb', ['postgres_js_test'])
+
 exec('psql', ['-c', 'alter system set ssl=on'])
+exec('psql', ['-c', 'drop user postgres_js_test'])
 exec('psql', ['-c', 'create user postgres_js_test'])
 exec('psql', ['-c', 'alter system set password_encryption=md5'])
 exec('psql', ['-c', 'select pg_reload_conf()'])
+exec('psql', ['-c', 'drop user if exists postgres_js_test_md5'])
 exec('psql', ['-c', 'create user postgres_js_test_md5 with password \'postgres_js_test_md5\''])
 exec('psql', ['-c', 'alter system set password_encryption=\'scram-sha-256\''])
 exec('psql', ['-c', 'select pg_reload_conf()'])
+exec('psql', ['-c', 'drop user if exists postgres_js_test_scram'])
 exec('psql', ['-c', 'create user postgres_js_test_scram with password \'postgres_js_test_scram\''])
 
-exec('dropdb', ['postgres_js_test'])
 exec('createdb', ['postgres_js_test'])
 exec('psql', ['-c', 'grant all on database postgres_js_test to postgres_js_test'])
 exec('psql', ['-c', 'alter database postgres_js_test owner to postgres_js_test'])

deno/src/index.js

@@ -428,7 +428,7 @@ function parseOptions(a, b) {
     return a
 
   const env = process.env // eslint-disable-line
-      , o = (typeof a === 'string' ? b : a) || {}
+      , o = (!a || typeof a === 'string' ? b : a) || {}
       , { url, multihost } = parseUrl(a)
       , query = [...url.searchParams].reduce((a, [b, c]) => (a[b] = c, a), {})
       , host = o.hostname || o.host || multihost || url.hostname || env.PGHOST || 'localhost'
@@ -529,7 +529,7 @@ function parseTransform(x) {
 }
 
 function parseUrl(url) {
-  if (typeof url !== 'string')
+  if (!url || typeof url !== 'string')
     return { url: { searchParams: new Map() } }
 
   let host = url

deno/tests/bootstrap.js

@@ -1,15 +1,19 @@
 import { spawn } from 'https://deno.land/std@0.132.0/node/child_process.ts'
 
+await exec('dropdb', ['postgres_js_test'])
+
 await exec('psql', ['-c', 'alter system set ssl=on'])
+await exec('psql', ['-c', 'drop user postgres_js_test'])
 await exec('psql', ['-c', 'create user postgres_js_test'])
 await exec('psql', ['-c', 'alter system set password_encryption=md5'])
 await exec('psql', ['-c', 'select pg_reload_conf()'])
+await exec('psql', ['-c', 'drop user if exists postgres_js_test_md5'])
 await exec('psql', ['-c', 'create user postgres_js_test_md5 with password \'postgres_js_test_md5\''])
 await exec('psql', ['-c', 'alter system set password_encryption=\'scram-sha-256\''])
 await exec('psql', ['-c', 'select pg_reload_conf()'])
+await exec('psql', ['-c', 'drop user if exists postgres_js_test_scram'])
 await exec('psql', ['-c', 'create user postgres_js_test_scram with password \'postgres_js_test_scram\''])
 
-await exec('dropdb', ['postgres_js_test'])
 await exec('createdb', ['postgres_js_test'])
 await exec('psql', ['-c', 'grant all on database postgres_js_test to postgres_js_test'])
 await exec('psql', ['-c', 'alter database postgres_js_test owner to postgres_js_test'])