diff --git a/packages/api/env/dblogin/.env b/packages/api/env/dblogin/.env index 9cf91c3f8..8ad6626ca 100644 --- a/packages/api/env/dblogin/.env +++ b/packages/api/env/dblogin/.env @@ -1,12 +1,13 @@ DEVMODE=1 CONNECTIONS=mysql +SINGLE_CONNECTION=mysql LABEL_mysql=MySql localhost SERVER_mysql=localhost -# USER_mysql=root +USER_mysql=root PORT_mysql=3306 -# PASSWORD_mysql=Pwd2020Db +PASSWORD_mysql=Pwd2020Db ENGINE_mysql=mysql@dbgate-plugin-mysql # PASSWORD_MODE_mysql=askPassword -PASSWORD_MODE_mysql=askUser +# PASSWORD_MODE_mysql=askUser diff --git a/packages/api/src/controllers/config.js b/packages/api/src/controllers/config.js index d1d4daddf..0187fc4f8 100644 --- a/packages/api/src/controllers/config.js +++ b/packages/api/src/controllers/config.js @@ -39,6 +39,7 @@ module.exports = { return { runAsPortal: !!connections.portalConnections, singleDatabase: connections.singleDatabase, + singleConnection: connections.singleConnection, // hideAppEditor: !!process.env.HIDE_APP_EDITOR, allowShellConnection: platformInfo.allowShellConnection, allowShellScripting: platformInfo.allowShellScripting, diff --git a/packages/api/src/controllers/connections.js b/packages/api/src/controllers/connections.js index 8757deec0..0305f448d 100644 --- a/packages/api/src/controllers/connections.js +++ b/packages/api/src/controllers/connections.js @@ -157,12 +157,31 @@ function getSingleDatabase() { return null; } +function getSingleConnection() { + if (getSingleDatabase()) return null; + if (process.env.SINGLE_CONNECTION) { + // @ts-ignore + const connection = portalConnections.find(x => x._id == process.env.SINGLE_CONNECTION); + if (connection) { + return connection; + } + } + // @ts-ignore + const arg0 = (portalConnections || []).find(x => x._id == 'argv'); + if (arg0) { + return arg0; + } + return null; +} + const singleDatabase = getSingleDatabase(); +const singleConnection = getSingleConnection(); module.exports = { datastore: null, opened: [], singleDatabase, + singleConnection, portalConnections, async _init() {