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

createDb, dropDb - catch errors

Browse Source
This commit is contained in:
Jan Prochazka
2024-08-29 19:50:46 +02:00
parent 967daf3bb6
commit b747c750e8
3 changed files with 38 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
packages/api/src/controllers/serverConnections.js
View File

@@ -59,7 +59,7 @@ module.exports = {
if (connection.useRedirectDbLogin) {
throw new MissingCredentialsError({ conid, redirectToDbLogin: true });
}
const subprocess = fork(
const subprocess = fork(
global['API_PACKAGE'] || process.argv[1],
[
'--is-forked-api',
@@ -184,22 +184,29 @@ module.exports = {
return { status: 'ok' };
},
createDatabase_meta: true,
async createDatabase({ conid, name }, req) {
async sendDatabaseOp({ conid, msgtype, name }, req) {
testConnectionPermission(conid, req);
const opened = await this.ensureOpened(conid);
if (opened.connection.isReadOnly) return false;
opened.subprocess.send({ msgtype: 'createDatabase', name });
return { status: 'ok' };
const res = await this.sendRequest(opened, { msgtype, name });
if (res.errorMessage) {
console.error(res.errorMessage);
return {
apiErrorMessage: res.errorMessage,
};
}
return res.result || null;
},
createDatabase_meta: true,
async createDatabase({ conid, name }, req) {
return this.sendDatabaseOp({ conid, msgtype: 'createDatabase', name }, req);
},
dropDatabase_meta: true,
async dropDatabase({ conid, name }, req) {
testConnectionPermission(conid, req);
const opened = await this.ensureOpened(conid);
if (opened.connection.isReadOnly) return false;
opened.subprocess.send({ msgtype: 'dropDatabase', name });
return { status: 'ok' };
return this.sendDatabaseOp({ conid, msgtype: 'dropDatabase', name }, req);
},
sendRequest(conn, message) {