dennii/dbgate
1
0
Fork 0
mirror of https://github.com/DeNNiiInc/dbgate.git synced 2026-04-24 14:06:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

dbmodel fix

Browse Source
This commit is contained in:
Jan Prochazka
2024-10-01 10:38:35 +02:00
parent 3ec7f651c1
commit 6ec431f471
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/api/src/utility/platformInfo.js
View File

@@ -11,6 +11,7 @@ const isLinux = platform === 'linux';
const isDocker = fs.existsSync('/home/dbgate-docker/public'); const isDocker = fs.existsSync('/home/dbgate-docker/public');
const isDevMode = process.env.DEVMODE == '1'; const isDevMode = process.env.DEVMODE == '1';
const isNpmDist = !!global['IS_NPM_DIST']; const isNpmDist = !!global['IS_NPM_DIST'];
const isDbModel = !!global['IS_DB_MODEL'];
const isForkedApi = processArgs.isForkedApi; const isForkedApi = processArgs.isForkedApi;
// function moduleAvailable(name) { // function moduleAvailable(name) {
@@ -39,8 +40,10 @@ const platformInfo = {
environment: process.env.NODE_ENV, environment: process.env.NODE_ENV,
platform, platform,
runningInWebpack: !!process.env.WEBPACK_DEV_SERVER_URL, runningInWebpack: !!process.env.WEBPACK_DEV_SERVER_URL,
allowShellConnection: (!processArgs.listenApiChild && !isNpmDist) || !!process.env.SHELL_CONNECTION || !!isElectron(), allowShellConnection:
allowShellScripting: (!processArgs.listenApiChild && !isNpmDist) || !!process.env.SHELL_SCRIPTING || !!isElectron(), (!processArgs.listenApiChild && !isNpmDist) || !!process.env.SHELL_CONNECTION || !!isElectron() || !!isDbModel,
allowShellScripting:
(!processArgs.listenApiChild && !isNpmDist) || !!process.env.SHELL_SCRIPTING || !!isElectron() || !!isDbModel,
defaultKeyfile: path.join(os.homedir(), '.ssh/id_rsa'), defaultKeyfile: path.join(os.homedir(), '.ssh/id_rsa'),
}; };

1
packages/dbmodel/bin/dbmodel.js
View File

@@ -8,6 +8,7 @@ global.PLUGINS_DIR = process.env.DEVMODE
? path.join(path.dirname(path.dirname(global.API_PACKAGE)), 'plugins') ? path.join(path.dirname(path.dirname(global.API_PACKAGE)), 'plugins')
: path.dirname(global.API_PACKAGE); : path.dirname(global.API_PACKAGE);
global.IS_NPM_DIST = true; global.IS_NPM_DIST = true;
global.IS_DB_MODEL = true;
const program = require('commander'); const program = require('commander');
const dbgateApi = require('dbgate-api'); const dbgateApi = require('dbgate-api');