Merge branch 'master' of github.com:dbgate/dbgate

This commit is contained in:
Jan Prochazka
2022-11-03 16:45:05 +01:00

View File

@@ -48,16 +48,17 @@ const driver = {
...driverBase, ...driverBase,
analyserClass: Analyser, analyserClass: Analyser,
async connect({ server, port, user, password, database, useDatabaseUrl, databaseUrl, ssl }) { async connect({ server, port, user, password, database, useDatabaseUrl, databaseUrl, ssl }) {
// let mongoUrl = databaseUrl; let mongoUrl;
// if (!useDatabaseUrl) { if (useDatabaseUrl) {
// mongoUrl = user ? `mongodb://${user}:${password}@${server}:${port}` : `mongodb://${server}:${port}`; // change port to ssh tunnel port
// if (database) mongoUrl += '/' + database; const url = new URL(databaseUrl);
// } url.port = port;
const mongoUrl = useDatabaseUrl mongoUrl = url.href;
? databaseUrl } else {
: user mongoUrl = user
? `mongodb://${user}:${password}@${server}:${port}` ? `mongodb://${user}:${password}@${server}:${port}`
: `mongodb://${server}:${port}`; : `mongodb://${server}:${port}`;
}
const options = { const options = {
useUnifiedTopology: true, useUnifiedTopology: true,