This commit is contained in:
Jan Prochazka
2021-11-14 18:51:07 +01:00
parent f68744fba7
commit 74730b6d60

View File

@@ -47,7 +47,7 @@ const postgresDriverBase = {
showConnectionField: (field, values) => { showConnectionField: (field, values) => {
if (field == 'useDatabaseUrl') return true; if (field == 'useDatabaseUrl') return true;
if (values.useDatabaseUrl) { if (values.useDatabaseUrl) {
return ['databaseUrl', 'defaultDatabase', 'singleDatabase'].includes(field); return ['databaseUrl'].includes(field);
} }
return ['server', 'port', 'user', 'password', 'defaultDatabase', 'singleDatabase'].includes(field); return ['server', 'port', 'user', 'password', 'defaultDatabase', 'singleDatabase'].includes(field);
}, },
@@ -56,14 +56,12 @@ const postgresDriverBase = {
const { databaseUrl } = connection; const { databaseUrl } = connection;
if (databaseUrl) { if (databaseUrl) {
const m = databaseUrl.match(/\/([^/]+)($|\?)/); const m = databaseUrl.match(/\/([^/]+)($|\?)/);
if (m) {
return { return {
...connection, ...connection,
singleDatabase: true, singleDatabase: !!m,
defaultDatabase: m[1], defaultDatabase: m ? m[1] : null,
}; };
} }
}
return connection; return connection;
}, },