allow both connectionString and additional options

[caub]

allows

var pool = new Pool({connectionString: 'postgres://foo@dom.com/db', ssl:true, max:4}) // will be an ssl connection with this PR

connectionString params will still override other options to stay compatible

[brianc]

Would you be able to include some tests for this? I can't accept a PR without tests.

[brianc]

please remove this

[brianc]

this should not be a dependency

[brianc]

this needs to be exactly 4.1.1 without the ^

[brianc]

Thanks @caub! Put a couple comments up there.

[caub]

ok, I think npm5 automatically adds pg-native, since it's required in the lib/ source. And it generates that package-lock thing too

I wanted to test with max in addition to ssl, but I don't see it in the connectionParameters object, I hope it's passed to the pg-pool

[brianc]

ohhhh I bet it added it during the test run. I'll need to add some kinda parameter to the test to make it not save when doing an npm install during the tests.

[charmander]

Object.assign can be used now that pg targets Node 4.

[caub]

@charmander done, that's great to be node4+ now

[charmander]

This might be a bit too compact. Maybe:

config = typeof config === 'string' ? parse(config) : Object.assign({}, config) if (config.connectionString) { Object.assign(config, parse(config.connectionString)) }

?

[caub]

I've used intermediate vars, or I can mutate if you really prefer

[charmander]

I’d still suggest the same snippet as earlier, since it always copies the configuration object.

[caub]

@charmander ok done, I just check here with typeof, because parse would probably throw else

[charmander]

Throwing instead of hiding potential errors is generally good, and it already behaved that way. I’d keep this check unmodified.

[caub]

ok done

[charmander]

Is this supposed to work? Connection strings seem to work at the client level, whereas max is at the pool level.

If it’s not, it should probably be removed to avoid misleading people.

[caub]

yes done, I need to make a similar PR for pg-pool

[brianc]

Thanks so much for this! Pushing out a new minor version w/ the changes now.