dbgate-api-premium 6.1.6 → 6.2.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dbgate-api-premium",
   "main": "src/index.js",
-  "version": "6.1.6",
+  "version": "6.2.1",
   "homepage": "https://dbgate.org/",
   "repository": {
     "type": "git",
@@ -29,10 +29,10 @@
     "compare-versions": "^3.6.0",
     "cors": "^2.8.5",
     "cross-env": "^6.0.3",
-    "dbgate-datalib": "^6.1.6",
+    "dbgate-datalib": "^6.2.1",
     "dbgate-query-splitter": "^4.11.3",
-    "dbgate-sqltree": "^6.1.6",
-    "dbgate-tools": "^6.1.6",
+    "dbgate-sqltree": "^6.2.1",
+    "dbgate-tools": "^6.2.1",
     "debug": "^4.3.4",
     "diff": "^5.0.0",
     "diff2html": "^3.4.13",
@@ -74,6 +74,8 @@
     "start:storage": "env-cmd -f env/storage/.env node src/index.js --listen-api",
     "start:storage:built": "env-cmd -f env/storage/.env cross-env DEVMODE= BUILTWEBMODE=1 node dist/bundle.js --listen-api",
     "start:singleconn": "env-cmd node src/index.js --server localhost --user root --port 3307 --engine mysql@dbgate-plugin-mysql --password test --listen-api",
+    "start:azure": "env-cmd -f env/azure/.env node src/index.js --listen-api",
+    "start:e2e:team": "cross-env DEVWEB=1 DEVMODE=1 env-cmd -f ../../e2e-tests/env/team/.env node src/index.js --listen-api",
     "ts": "tsc",
     "build": "webpack",
     "build:doc": "jsdoc2md --template doctpl.hbs  ./src/shell/* > ../../../dbgate.github.io/_docs/apidoc.md"
@@ -81,7 +83,7 @@
   "devDependencies": {
     "@types/fs-extra": "^9.0.11",
     "@types/lodash": "^4.14.149",
-    "dbgate-types": "^6.1.6",
+    "dbgate-types": "^6.2.1",
     "env-cmd": "^10.1.0",
     "jsdoc-to-markdown": "^9.0.5",
     "node-loader": "^1.0.2",

package/src/auth/storageAuthProvider.js

@@ -3,12 +3,14 @@ const {
   getPredefinedPermissions,
   getLogger,
   getConnectionLabel,
+  runQueryFmt,
 } = require('dbgate-tools');
 const {
   storageSelectFmt,
   storageReadUserRolePermissions,
   storageReadUserPermissions,
   storageReadRolePermissions,
+  storageSqlCommandFmt,
 } = require('../controllers/storageDb');
 const { getTokenSecret, getTokenLifetime } = require('./authCommon');
 const { AuthProviderBase } = require('./authProvider');
@@ -129,9 +131,13 @@ class OauthProvider extends StorageProviderBase {
       )}&client_id=${this.config.oauthClient}&client_secret=${this.config.oauthClientSecret}${scopeParam}`
     );
 
-    const { access_token, refresh_token } = resp.data;
+    const { access_token, id_token, refresh_token } = resp.data;
 
-    const payload = jwt.decode(access_token);
+    if (!id_token && !access_token) {
+      return { error: 'Token not found' };
+    }
+
+    const payload = jwt.decode(id_token ?? access_token);
 
     logger.info({ payload }, 'User payload returned from OAUTH');
 
@@ -143,10 +149,13 @@ class OauthProvider extends StorageProviderBase {
     const loginRows = await storageSelectFmt('select * from ~users where ~login = %v', login);
     const permissions = await loadPermissionsForUserId(loginRows[0]?.id ?? -1);
 
-    if (this.config.oauthOnlyDefinedLogins == 1) {
-      if (loginRows.length == 0) {
-        return { error: `Username ${login} not allowed to log in` };
-      }
+    if (this.config.oauthOnlyDefinedLogins == 1 && loginRows.length == 0) {
+      return { error: `Username ${login} not allowed to log in` };
+    }
+
+    if (this.config.oauthSaveNotDefinedLogins == 1 && loginRows.length == 0) {
+      const email = payload[this.config.oauthEmailField || 'email'] ?? null;
+      await storageSqlCommandFmt('insert into ~users (~login, ~email) values (%v, %v)', login, email);
     }
 
     let groups =
@@ -165,22 +174,18 @@ class OauthProvider extends StorageProviderBase {
       }
     }
 
-    if (access_token) {
-      return {
-        accessToken: jwt.sign(
-          {
-            amoid: this.amoid,
-            login,
-            permissions,
-            userId: loginRows[0]?.id,
-          },
-          getTokenSecret(),
-          { expiresIn: getTokenLifetime() }
-        ),
-      };
-    }
-
-    return { error: 'Token not found' };
+    return {
+      accessToken: jwt.sign(
+        {
+          amoid: this.amoid,
+          login,
+          permissions,
+          userId: loginRows[0]?.id,
+        },
+        getTokenSecret(),
+        { expiresIn: getTokenLifetime() }
+      ),
+    };
   }
 
   redirect({ state, redirectUri }) {

package/src/controllers/config.js

@@ -136,7 +136,7 @@ module.exports = {
 
   deleteSettings_meta: true,
   async deleteSettings() {
-    await fs.unlink(path.join(datadir(), 'settings.json'));
+    await fs.unlink(path.join(datadir(), processArgs.runE2eTests ? 'settings-e2etests.json' : 'settings.json'));
     return true;
   },
 
@@ -161,7 +161,10 @@ module.exports = {
 
   async loadSettings() {
     try {
-      const settingsText = await fs.readFile(path.join(datadir(), 'settings.json'), { encoding: 'utf-8' });
+      const settingsText = await fs.readFile(
+        path.join(datadir(), processArgs.runE2eTests ? 'settings-e2etests.json' : 'settings.json'),
+        { encoding: 'utf-8' }
+      );
       return {
         ...this.fillMissingSettings(JSON.parse(settingsText)),
         'other.licenseKey': platformInfo.isElectron ? await this.loadLicenseKey() : undefined,
@@ -247,7 +250,10 @@ module.exports = {
           ...currentValue,
           ..._.omit(values, ['other.licenseKey']),
         };
-        await fs.writeFile(path.join(datadir(), 'settings.json'), JSON.stringify(updated, undefined, 2));
+        await fs.writeFile(
+          path.join(datadir(), processArgs.runE2eTests ? 'settings-e2etests.json' : 'settings.json'),
+          JSON.stringify(updated, undefined, 2)
+        );
         // this.settingsValue = updated;
 
         if (currentValue['other.licenseKey'] != values['other.licenseKey']) {

package/src/controllers/databaseConnections.js

@@ -34,6 +34,8 @@ const pipeForkLogs = require('../utility/pipeForkLogs');
 const crypto = require('crypto');
 const loadModelTransform = require('../utility/loadModelTransform');
 const exportDbModelSql = require('../utility/exportDbModelSql');
+const axios = require('axios');
+const { callTextToSqlApi, callCompleteOnCursorApi, callRefactorSqlQueryApi } = require('../utility/authProxy');
 
 const logger = getLogger('databaseConnections');
 
@@ -69,6 +71,11 @@ module.exports = {
   handle_error(conid, database, props) {
     const { error } = props;
     logger.error(`Error in database connection ${conid}, database ${database}: ${error}`);
+    if (props?.msgid) {
+      const [resolve, reject] = this.requests[props?.msgid];
+      reject(error);
+      delete this.requests[props?.msgid];
+    }
   },
   handle_response(conid, database, { msgid, ...response }) {
     const [resolve, reject] = this.requests[msgid];
@@ -253,9 +260,9 @@ module.exports = {
   },
 
   loadFieldValues_meta: true,
-  async loadFieldValues({ conid, database, schemaName, pureName, field, search }, req) {
+  async loadFieldValues({ conid, database, schemaName, pureName, field, search, dataType }, req) {
     testConnectionPermission(conid, req);
-    return this.loadDataCore('loadFieldValues', { conid, database, schemaName, pureName, field, search });
+    return this.loadDataCore('loadFieldValues', { conid, database, schemaName, pureName, field, search, dataType });
   },
 
   callMethod_meta: true,
@@ -401,6 +408,10 @@ module.exports = {
 
   structure_meta: true,
   async structure({ conid, database, modelTransFile = null }, req) {
+    if (!conid || !database) {
+      return {};
+    }
+
     testConnectionPermission(conid, req);
     if (conid == '__model') {
       const model = await importDbModel(database);
@@ -558,4 +569,47 @@ module.exports = {
 
     return true;
   },
+
+  textToSql_meta: true,
+  async textToSql({ conid, database, text, dialect }) {
+    const existing = this.opened.find(x => x.conid == conid && x.database == database);
+    const { structure } = existing || {};
+    if (!structure) return { errorMessage: 'No database structure' };
+
+    const res = await callTextToSqlApi(text, structure, dialect);
+
+    if (!res?.sql) {
+      return { errorMessage: 'No SQL generated' };
+    }
+
+    return res;
+  },
+
+  completeOnCursor_meta: true,
+  async completeOnCursor({ conid, database, text, dialect, line }) {
+    const existing = this.opened.find(x => x.conid == conid && x.database == database);
+    const { structure } = existing || {};
+    if (!structure) return { errorMessage: 'No database structure' };
+    const res = await callCompleteOnCursorApi(text, structure, dialect, line);
+
+    if (!res?.variants) {
+      return { errorMessage: 'No SQL generated' };
+    }
+
+    return res;
+  },
+
+  refactorSqlQuery_meta: true,
+  async refactorSqlQuery({ conid, database, query, task, dialect }) {
+    const existing = this.opened.find(x => x.conid == conid && x.database == database);
+    const { structure } = existing || {};
+    if (!structure) return { errorMessage: 'No database structure' };
+    const res = await callRefactorSqlQueryApi(query, task, structure, dialect);
+
+    if (!res?.sql) {
+      return { errorMessage: 'No SQL generated' };
+    }
+
+    return res;
+  },
 };

package/src/controllers/sessions.js

@@ -56,12 +56,19 @@ module.exports = {
   handle_done(sesid, props) {
     socket.emit(`session-done-${sesid}`);
     if (!props.skipFinishedMessage) {
-      this.dispatchMessage(sesid, 'Query execution finished');
+      if (props.controlCommand) {
+        this.dispatchMessage(sesid, `${_.startCase(props.controlCommand)} finished`);
+      } else {
+        this.dispatchMessage(sesid, 'Query execution finished');
+      }
     }
     const session = this.opened.find(x => x.sesid == sesid);
     if (session.loadingReader_jslid) {
       socket.emit(`session-jslid-done-${session.loadingReader_jslid}`);
     }
+    if (props.autoCommit) {
+      this.executeControlCommand({ sesid, command: 'commitTransaction' });
+    }
     if (session.killOnDone) {
       this.kill({ sesid });
     }
@@ -131,7 +138,7 @@ module.exports = {
   },
 
   executeQuery_meta: true,
-  async executeQuery({ sesid, sql }) {
+  async executeQuery({ sesid, sql, autoCommit }) {
     const session = this.opened.find(x => x.sesid == sesid);
     if (!session) {
       throw new Error('Invalid session');
@@ -139,7 +146,21 @@ module.exports = {
 
     logger.info({ sesid, sql }, 'Processing query');
     this.dispatchMessage(sesid, 'Query execution started');
-    session.subprocess.send({ msgtype: 'executeQuery', sql });
+    session.subprocess.send({ msgtype: 'executeQuery', sql, autoCommit });
+
+    return { state: 'ok' };
+  },
+
+  executeControlCommand_meta: true,
+  async executeControlCommand({ sesid, command }) {
+    const session = this.opened.find(x => x.sesid == sesid);
+    if (!session) {
+      throw new Error('Invalid session');
+    }
+
+    logger.info({ sesid, command }, 'Processing control command');
+    this.dispatchMessage(sesid, `${_.startCase(command)} started`);
+    session.subprocess.send({ msgtype: 'executeControlCommand', command });
 
     return { state: 'ok' };
   },

package/src/controllers/storage.js

@@ -17,7 +17,7 @@ const { hasPermission } = require('../utility/hasPermission');
 const { changeSetToSql, removeSchemaFromChangeSet } = require('dbgate-datalib');
 const storageModel = require('../storageModel');
 const { dumpSqlCommand } = require('dbgate-sqltree');
-const { runCommandOnDriver, getLogger } = require('dbgate-tools');
+const { runCommandOnDriver, getLogger, runQueryFmt } = require('dbgate-tools');
 const socket = require('../utility/socket');
 const { obtainRefreshedLicense } = require('../utility/authProxy');
 const { datadir } = require('../utility/directories');
@@ -31,11 +31,6 @@ function mapConnection(connnection) {
   };
 }
 
-async function runQueryFmt(driver, conn, query, ...args) {
-  const dmp = driver.createDumper();
-  dmp.put(query, ...args);
-  await driver.query(conn, dmp.s);
-}
 
 let refreshLicenseStarted = false;
 
@@ -140,7 +135,7 @@ module.exports = {
         displayName: 'Internal storage',
         defaultDatabase: process.env.STORAGE_DATABASE,
         singleDatabase: true,
-        ...getDbConnectionParams(),
+        ...await getDbConnectionParams(),
       };
     }
 
@@ -197,7 +192,8 @@ module.exports = {
         await runQueryFmt(
           driver,
           conn,
-          'update auth_methods set is_disabled=%v, is_default = %v, is_collapsed = %v where id = %v',
+          'update auth_methods set name=%v, is_disabled=%v, is_default = %v, is_collapsed = %v where id = %v',
+          method.name,
           method.isDisabled,
           method.isDefault,
           method.isCollapsed,

package/src/controllers/storageDb.js

@@ -4,8 +4,9 @@ const dbgateApi = require('../shell');
 const { getPredefinedPermissions, getLogger, extractErrorLogData } = require('dbgate-tools');
 const _ = require('lodash');
 const logger = getLogger('storageDb');
+const { extractConnectionSslParams } = require('../utility/connectUtility');
 
-function getDbConnectionParams() {
+async function getDbConnectionParams() {
   const server = process.env.STORAGE_SERVER;
   const port = process.env.STORAGE_PORT;
   const user = process.env.STORAGE_USER;
@@ -13,21 +14,33 @@ function getDbConnectionParams() {
   const database = process.env.STORAGE_DATABASE;
   const engine = process.env.STORAGE_ENGINE;
   const serviceName = process.env.STORAGE_SERVICE_NAME;
+  const socketPath = process.env.STORAGE_SOCKET_PATH;
+  const databaseUrl = process.env.STORAGE_DATABASE_URL;
+  const useDatabaseUrl = !!process.env.STORAGE_DATABASE_URL;
+  const authType = process.env.STORAGE_AUTH_TYPE;
 
-  if (!server || !user || !password || !database || !engine) {
+  const useSsl = process.env.STORAGE_USE_SSL;
+  const sslCaFile = process.env.STORAGE_SSL_CA_FILE;
+  const sslCertFile = process.env.STORAGE_SSL_CERT_FILE;
+  const sslCertFilePassword = process.env.STORAGE_SSL_CERT_FILE_PASSWORD;
+  const sslKeyFile = process.env.STORAGE_SSL_KEY_FILE;
+  const sslRejectUnauthorized = process.env.STORAGE_SSL_REJECT_UNAUTHORIZED;
+  const trustServerCertificate = process.env.STORAGE_SSL_TRUST_CERTIFICATE;
+
+  if (!server || !engine) {
     if (database) {
       if (!server) {
         throw new Error('Incorrect storage configuration, missing env variable STORAGE_SERVER');
       }
-      if (!port) {
-        throw new Error('Incorrect storage configuration, missing env variable STORAGE_PORT');
-      }
-      if (!user) {
-        throw new Error('Incorrect storage configuration, missing env variable STORAGE_USER');
-      }
-      if (!password) {
-        throw new Error('Incorrect storage configuration, missing env variable STORAGE_PASSWORD');
-      }
+      // if (!port) {
+      //   throw new Error('Incorrect storage configuration, missing env variable STORAGE_PORT');
+      // }
+      // if (!user) {
+      //   throw new Error('Incorrect storage configuration, missing env variable STORAGE_USER');
+      // }
+      // if (!password) {
+      //   throw new Error('Incorrect storage configuration, missing env variable STORAGE_PASSWORD');
+      // }
       if (!engine) {
         throw new Error('Incorrect storage configuration, missing env variable STORAGE_ENGINE');
       }
@@ -35,7 +48,30 @@ function getDbConnectionParams() {
     return null;
   }
 
-  return { server, port, user, password, database, engine, serviceName };
+  const res = {
+    server,
+    port,
+    user,
+    password,
+    database,
+    engine,
+    serviceName,
+    socketPath,
+    databaseUrl,
+    useDatabaseUrl,
+    authType,
+    useSsl,
+    sslCaFile,
+    sslCertFile,
+    sslCertFilePassword,
+    sslKeyFile,
+    sslRejectUnauthorized,
+    trustServerCertificate,
+  };
+  return {
+    ...res,
+    ssl: await extractConnectionSslParams(res),
+  };
 }
 
 let storageConnection = null;
@@ -47,7 +83,7 @@ async function getStorageConnectionCore() {
     return [storageConnection, storageDriver];
   }
 
-  const dbConnectionParams = getDbConnectionParams();
+  const dbConnectionParams = await getDbConnectionParams();
 
   if (!dbConnectionParams) {
     return [null, null];
@@ -125,6 +161,10 @@ async function storageSelectFmt(sql, ...params) {
   return resp.rows;
 }
 
+async function storageSqlCommandFmt(sql, ...params) {
+  await storageSelectFmt(sql, ...params);
+}
+
 async function storageReadUserRolePermissions(userId) {
   const resp = await storageSelectFmt(
     `
@@ -213,4 +253,5 @@ module.exports = {
   storageReadConfig,
   storageWriteConfig,
   getStorageConnectionError,
+  storageSqlCommandFmt,
 };

package/src/currentVersion.js

@@ -1,5 +1,5 @@
 
 module.exports = { 
-  version: '6.1.6',
-  buildTime: '2025-02-04T16:06:06.228Z'
+  version: '6.2.1',
+  buildTime: '2025-02-28T09:57:07.127Z'
 };

package/src/main.js

@@ -78,6 +78,8 @@ function start() {
     app.use(getExpressPath('/'), express.static('/home/dbgate-docker/public'));
   } else if (platformInfo.isAwsUbuntuLayout) {
     app.use(getExpressPath('/'), express.static('/home/ubuntu/build/public'));
+  } else if (platformInfo.isAzureUbuntuLayout) {
+    app.use(getExpressPath('/'), express.static('/home/azureuser/build/public'));
   } else if (processArgs.runE2eTests) {
     app.use(getExpressPath('/'), express.static(path.resolve('packer/build/public')));
   } else if (platformInfo.isNpmDist) {
@@ -140,6 +142,10 @@ function start() {
     const port = process.env.PORT || 3000;
     logger.info(`DbGate API listening on port ${port} (AWS AMI build)`);
     server.listen(port);
+  } else if (platformInfo.isAzureUbuntuLayout) {
+    const port = process.env.PORT || 3000;
+    logger.info(`DbGate API listening on port ${port} (Azure VM build)`);
+    server.listen(port);
   } else if (platformInfo.isNpmDist) {
     getPort({
       port: parseInt(

package/src/proc/connectProcess.js

@@ -1,6 +1,6 @@
 const childProcessChecker = require('../utility/childProcessChecker');
 const requireEngineDriver = require('../utility/requireEngineDriver');
-const connectUtility = require('../utility/connectUtility');
+const { connectUtility } = require('../utility/connectUtility');
 const { handleProcessCommunication } = require('../utility/processComm');
 const { pickSafeConnectionInfo } = require('../utility/crypting');
 const _ = require('lodash');

package/src/proc/databaseConnectionProcess.js

@@ -11,7 +11,7 @@ const {
   extractErrorLogData,
 } = require('dbgate-tools');
 const requireEngineDriver = require('../utility/requireEngineDriver');
-const connectUtility = require('../utility/connectUtility');
+const { connectUtility } = require('../utility/connectUtility');
 const { handleProcessCommunication } = require('../utility/processComm');
 const { SqlGenerator } = require('dbgate-tools');
 const generateDeploySql = require('../shell/generateDeploySql');
@@ -213,13 +213,12 @@ async function handleRunOperation({ msgid, operation, useTransaction }, skipRead
   }
 }
 
-async function handleQueryData({ msgid, sql }, skipReadonlyCheck = false) {
+async function handleQueryData({ msgid, sql, range }, skipReadonlyCheck = false) {
   await waitConnected();
   const driver = requireEngineDriver(storedConnection);
   try {
     if (!skipReadonlyCheck) ensureExecuteCustomScript(driver);
-    // console.log(sql);
-    const res = await driver.query(dbhan, sql);
+    const res = await driver.query(dbhan, sql, { range });
     process.send({ msgtype: 'response', msgid, ...res });
   } catch (err) {
     process.send({
@@ -234,7 +233,7 @@ async function handleSqlSelect({ msgid, select }) {
   const driver = requireEngineDriver(storedConnection);
   const dmp = driver.createDumper();
   dumpSqlSelect(dmp, select);
-  return handleQueryData({ msgid, sql: dmp.s }, true);
+  return handleQueryData({ msgid, sql: dmp.s, range: select.range }, true);
 }
 
 async function handleDriverDataCore(msgid, callMethod, { logName }) {
@@ -291,10 +290,14 @@ async function handleLoadKeyTableRange({ msgid, key, cursor, count }) {
   });
 }
 
-async function handleLoadFieldValues({ msgid, schemaName, pureName, field, search }) {
-  return handleDriverDataCore(msgid, driver => driver.loadFieldValues(dbhan, { schemaName, pureName }, field, search), {
-    logName: 'loadFieldValues',
-  });
+async function handleLoadFieldValues({ msgid, schemaName, pureName, field, search, dataType }) {
+  return handleDriverDataCore(
+    msgid,
+    driver => driver.loadFieldValues(dbhan, { schemaName, pureName }, field, search, dataType),
+    {
+      logName: 'loadFieldValues',
+    }
+  );
 }
 
 function ensureExecuteCustomScript(driver) {
@@ -336,6 +339,7 @@ async function handleSqlPreview({ msgid, objects, options }) {
       }, 500);
     }
   } catch (err) {
+    console.error(err);
     process.send({
       msgtype: 'response',
       msgid,
@@ -423,7 +427,11 @@ function start() {
       await handleMessage(message);
     } catch (err) {
       logger.error(extractErrorLogData(err), 'Error in DB connection');
-      process.send({ msgtype: 'error', error: extractErrorMessage(err, 'Error processing message') });
+      process.send({
+        msgtype: 'error',
+        error: extractErrorMessage(err, 'Error processing message'),
+        msgid: message?.msgid,
+      });
     }
   });
 }

package/src/proc/serverConnectionProcess.js

@@ -2,7 +2,7 @@ const stableStringify = require('json-stable-stringify');
 const { extractBoolSettingsValue, extractIntSettingsValue, getLogger, extractErrorLogData } = require('dbgate-tools');
 const childProcessChecker = require('../utility/childProcessChecker');
 const requireEngineDriver = require('../utility/requireEngineDriver');
-const connectUtility = require('../utility/connectUtility');
+const { connectUtility } = require('../utility/connectUtility');
 const { handleProcessCommunication } = require('../utility/processComm');
 const logger = getLogger('srvconnProcess');
 

package/src/proc/sessionProcess.js

@@ -8,7 +8,7 @@ const { splitQuery } = require('dbgate-query-splitter');
 const { jsldir } = require('../utility/directories');
 const requireEngineDriver = require('../utility/requireEngineDriver');
 const { decryptConnection } = require('../utility/crypting');
-const connectUtility = require('../utility/connectUtility');
+const { connectUtility } = require('../utility/connectUtility');
 const { handleProcessCommunication } = require('../utility/processComm');
 const { getLogger, extractIntSettingsValue, extractBoolSettingsValue } = require('dbgate-tools');
 
@@ -245,7 +245,47 @@ async function handleStopProfiler({ jslid }) {
   currentProfiler = null;
 }
 
-async function handleExecuteQuery({ sql }) {
+async function handleExecuteControlCommand({ command }) {
+  lastActivity = new Date().getTime();
+
+  await waitConnected();
+  const driver = requireEngineDriver(storedConnection);
+
+  if (command == 'commitTransaction' && !allowExecuteCustomScript(driver)) {
+    process.send({
+      msgtype: 'info',
+      info: {
+        message: 'Connection without read-only sessions is read only',
+        severity: 'error',
+      },
+    });
+    process.send({ msgtype: 'done', skipFinishedMessage: true });
+    return;
+    //process.send({ msgtype: 'error', error: e.message });
+  }
+
+  executingScripts++;
+  try {
+    const dmp = driver.createDumper();
+    switch (command) {
+      case 'commitTransaction':
+        await dmp.commitTransaction();
+        break;
+      case 'rollbackTransaction':
+        await dmp.rollbackTransaction();
+        break;
+      case 'beginTransaction':
+        await dmp.beginTransaction();
+        break;
+    }
+    await driver.query(dbhan, dmp.s, { discardResult: true });
+    process.send({ msgtype: 'done', controlCommand: command });
+  } finally {
+    executingScripts--;
+  }
+}
+
+async function handleExecuteQuery({ sql, autoCommit }) {
   lastActivity = new Date().getTime();
 
   await waitConnected();
@@ -279,7 +319,7 @@ async function handleExecuteQuery({ sql }) {
       // handler.stream = stream;
       // resultIndex = handler.resultIndex;
     }
-    process.send({ msgtype: 'done' });
+    process.send({ msgtype: 'done', autoCommit });
   } finally {
     executingScripts--;
   }
@@ -323,6 +363,7 @@ function handlePing() {
 const messageHandlers = {
   connect: handleConnect,
   executeQuery: handleExecuteQuery,
+  executeControlCommand: handleExecuteControlCommand,
   executeReader: handleExecuteReader,
   startProfiler: handleStartProfiler,
   stopProfiler: handleStopProfiler,

package/src/shell/dataDuplicator.js

@@ -2,7 +2,7 @@ const stream = require('stream');
 const path = require('path');
 const { quoteFullName, fullNameToString, getLogger } = require('dbgate-tools');
 const requireEngineDriver = require('../utility/requireEngineDriver');
-const connectUtility = require('../utility/connectUtility');
+const { connectUtility } = require('../utility/connectUtility');
 const logger = getLogger('dataDuplicator');
 const { DataDuplicator } = require('dbgate-datalib');
 const copyStream = require('./copyStream');

package/src/shell/deployDb.js

@@ -1,7 +1,7 @@
 const generateDeploySql = require('./generateDeploySql');
 const executeQuery = require('./executeQuery');
 const { ScriptDrivedDeployer } = require('dbgate-datalib');
-const connectUtility = require('../utility/connectUtility');
+const { connectUtility } = require('../utility/connectUtility');
 const requireEngineDriver = require('../utility/requireEngineDriver');
 const loadModelFolder = require('../utility/loadModelFolder');
 const crypto = require('crypto');