🔀 Merge branch 'master' of https://github.com/krasaee/n8n into krasaee-master

This commit is contained in:
Jan Oberhauser 2020-01-14 16:29:18 -06:00
commit fb55e5ab29
2 changed files with 26 additions and 1 deletions

View file

@ -35,6 +35,19 @@ export class Postgres implements ICredentialType {
}, },
default: '', default: '',
}, },
{
displayName: 'SSL',
name: 'ssl',
type: 'options' as NodePropertyTypes,
options: [
{ name: 'disable', value: 'disable' },
{ name: 'allow', value: 'allow' },
{ name: 'require', value: 'require' },
{ name: 'verify', value: 'verify (not implemented)' },
{ name: 'verify-full', value: 'verify-full (not implemented)' }
],
default: 'disable',
},
{ {
displayName: 'Port', displayName: 'Port',
name: 'port', name: 'port',

View file

@ -202,7 +202,19 @@ export class Postgres implements INodeType {
const pgp = pgPromise(); const pgp = pgPromise();
const db = pgp(`postgres://${credentials.user}:${credentials.password}@${credentials.host}:${credentials.port}/${credentials.database}`); const config = {
host: credentials.host as string,
port: credentials.port as number,
database: credentials.database as string,
user: credentials.user as string,
password: credentials.password as string,
ssl: credentials.ssl != 'disable',
sslmode: credentials.ssl as string
};
const db = pgp(config);
//const db = pgp(`postgres://${credentials.user}:${credentials.password}@${credentials.host}:${credentials.port}/${credentials.database}`);
let returnItems = []; let returnItems = [];