diff --git a/src/main/ipc-handlers/schema.js b/src/main/ipc-handlers/schema.js index 93c5f5a2..203e7d80 100644 --- a/src/main/ipc-handlers/schema.js +++ b/src/main/ipc-handlers/schema.js @@ -135,7 +135,7 @@ export default connections => { } }); - ipcMain.handle('raw-query', async (event, { uid, query, schema, tabUid }) => { + ipcMain.handle('raw-query', async (event, { uid, query, schema, tabUid, autocommit }) => { if (!query) return; try { @@ -144,6 +144,7 @@ export default connections => { details: true, schema, tabUid, + autocommit, comments: false }); @@ -165,4 +166,40 @@ export default connections => { return { status: 'error', response: err.toString() }; } }); + + ipcMain.handle('commit-tab', async (event, { uid, tabUid }) => { + if (!tabUid) return; + + try { + await connections[uid].commitTab(tabUid); + return { status: 'success' }; + } + catch (err) { + return { status: 'error', response: err.toString() }; + } + }); + + ipcMain.handle('rollback-tab', async (event, { uid, tabUid }) => { + if (!tabUid) return; + + try { + await connections[uid].rollbackTab(tabUid); + return { status: 'success' }; + } + catch (err) { + return { status: 'error', response: err.toString() }; + } + }); + + ipcMain.handle('destroy-connection-to-commit', async (event, { uid, tabUid }) => { + if (!tabUid) return; + + try { + await connections[uid].destroyConnectionToCommit(tabUid); + return { status: 'success' }; + } + catch (err) { + return { status: 'error', response: err.toString() }; + } + }); }; diff --git a/src/main/libs/clients/MySQLClient.js b/src/main/libs/clients/MySQLClient.js index 09910f47..b8737a04 100644 --- a/src/main/libs/clients/MySQLClient.js +++ b/src/main/libs/clients/MySQLClient.js @@ -10,6 +10,7 @@ export class MySQLClient extends AntaresCore { this._schema = null; this._runningConnections = new Map(); + this._connectionsToCommit = new Map(); this.types = { 0: 'DECIMAL', @@ -101,9 +102,10 @@ export class MySQLClient extends AntaresCore { } /** - * @memberof MySQLClient + * + * @returns dbConfig */ - async connect () { + async getDbConfig () { delete this._params.application_name; const dbConfig = { @@ -134,48 +136,17 @@ export class MySQLClient extends AntaresCore { } } - if (!this._poolSize) { - this._connection = await mysql.createConnection(dbConfig); + return dbConfig; + } - // ANSI_QUOTES check - const res = await this.getVariable('sql_mode', 'global'); - const sqlMode = res?.value.split(','); - const hasAnsiQuotes = sqlMode.includes('ANSI_QUOTES'); - - if (this._params.readonly) - await this.raw('SET SESSION TRANSACTION READ ONLY'); - - if (hasAnsiQuotes) - await this.raw(`SET SESSION sql_mode = "${sqlMode.filter(m => m !== 'ANSI_QUOTES').join(',')}"`); - } - else { - this._connection = mysql.createPool({ - ...dbConfig, - connectionLimit: this._poolSize, - typeCast: (field, next) => { - if (field.type === 'DATETIME') - return field.string(); - else - return next(); - } - }); - - // ANSI_QUOTES check - const res = await this.getVariable('sql_mode', 'global'); - const sqlMode = res?.value.split(','); - const hasAnsiQuotes = sqlMode.includes('ANSI_QUOTES'); - - if (hasAnsiQuotes) - await this._connection.query(`SET SESSION sql_mode = "${sqlMode.filter(m => m !== 'ANSI_QUOTES').join(',')}"`); - - this._connection.on('connection', connection => { - if (this._params.readonly) - connection.query('SET SESSION TRANSACTION READ ONLY'); - - if (hasAnsiQuotes) - connection.query(`SET SESSION sql_mode = "${sqlMode.filter(m => m !== 'ANSI_QUOTES').join(',')}"`); - }); - } + /** + * @memberof MySQLClient + */ + async connect () { + if (!this._poolSize) + this._connection = await this.getConnection(); + else + this._connection = await this.getConnectionPool(); } /** @@ -186,6 +157,56 @@ export class MySQLClient extends AntaresCore { if (this._ssh) this._ssh.close(); } + async getConnection () { + const dbConfig = await this.getDbConfig(); + const connection = await mysql.createConnection(dbConfig); + + // ANSI_QUOTES check + const [res] = await connection.query('SHOW GLOBAL VARIABLES LIKE \'%sql_mode%\''); + const sqlMode = res[0]?.Variable_name?.split(','); + const hasAnsiQuotes = sqlMode.includes('ANSI_QUOTES'); + + if (this._params.readonly) + await connection.query('SET SESSION TRANSACTION READ ONLY'); + + if (hasAnsiQuotes) + await connection.query(`SET SESSION sql_mode = "${sqlMode.filter(m => m !== 'ANSI_QUOTES').join(',')}"`); + + return connection; + } + + async getConnectionPool () { + const dbConfig = await this.getDbConfig(); + const connection = mysql.createPool({ + ...dbConfig, + connectionLimit: this._poolSize, + typeCast: (field, next) => { + if (field.type === 'DATETIME') + return field.string(); + else + return next(); + } + }); + + // ANSI_QUOTES check + const [res] = await connection.query('SHOW GLOBAL VARIABLES LIKE \'%sql_mode%\''); + const sqlMode = res[0]?.Variable_name?.split(','); + const hasAnsiQuotes = sqlMode.includes('ANSI_QUOTES'); + + if (hasAnsiQuotes) + await connection.query(`SET SESSION sql_mode = "${sqlMode.filter(m => m !== 'ANSI_QUOTES').join(',')}"`); + + connection.on('connection', connection => { + if (this._params.readonly) + connection.query('SET SESSION TRANSACTION READ ONLY'); + + if (hasAnsiQuotes) + connection.query(`SET SESSION sql_mode = "${sqlMode.filter(m => m !== 'ANSI_QUOTES').join(',')}"`); + }); + + return connection; + } + /** * Executes an USE query * @@ -1276,6 +1297,36 @@ export class MySQLClient extends AntaresCore { return await this.killProcess(id); } + /** + * + * @param {string} tabUid + * @returns {Promise} + */ + async commitTab (tabUid) { + const connection = this._connectionsToCommit.get(tabUid); + if (connection) + return await connection.query('COMMIT'); + } + + /** + * + * @param {string} tabUid + * @returns {Promise} + */ + async rollbackTab (tabUid) { + const connection = this._connectionsToCommit.get(tabUid); + if (connection) + return await connection.query('ROLLBACK'); + } + + destroyConnectionToCommit (tabUid) { + const connection = this._connectionsToCommit.get(tabUid); + if (connection) { + connection.destroy(); + this._connectionsToCommit.delete(tabUid); + } + } + /** * CREATE TABLE * @@ -1580,6 +1631,7 @@ export class MySQLClient extends AntaresCore { details: false, split: true, comments: true, + autocommit: true, ...args }; @@ -1594,8 +1646,21 @@ export class MySQLClient extends AntaresCore { .filter(Boolean) .map(q => q.trim()) : [sql]; + + let connection; const isPool = typeof this._connection.getConnection === 'function'; - const connection = isPool ? await this._connection.getConnection() : this._connection; + + if (!args.autocommit && args.tabUid) { // autocommit OFF + if (this._connectionsToCommit.has(args.tabUid)) + connection = this._connectionsToCommit.get(args.tabUid); + else { + connection = await this.getConnection(); + await connection.query('SET SESSION autocommit=0'); + this._connectionsToCommit.set(args.tabUid, connection); + } + } + else// autocommit ON + connection = isPool ? await this._connection.getConnection() : this._connection; if (args.tabUid && isPool) this._runningConnections.set(args.tabUid, connection.connection.connectionId); @@ -1660,7 +1725,7 @@ export class MySQLClient extends AntaresCore { }); } catch (err) { - if (isPool) { + if (isPool && args.autocommit) { connection.release(); this._runningConnections.delete(args.tabUid); } @@ -1672,7 +1737,7 @@ export class MySQLClient extends AntaresCore { keysArr = keysArr ? [...keysArr, ...response] : response; } catch (err) { - if (isPool) { + if (isPool && args.autocommit) { connection.release(); this._runningConnections.delete(args.tabUid); } @@ -1690,7 +1755,7 @@ export class MySQLClient extends AntaresCore { keys: keysArr }); }).catch((err) => { - if (isPool) { + if (isPool && args.autocommit) { connection.release(); this._runningConnections.delete(args.tabUid); } @@ -1701,7 +1766,7 @@ export class MySQLClient extends AntaresCore { resultsArr.push({ rows, report, fields, keys, duration }); } - if (isPool) { + if (isPool && args.autocommit) { connection.release(); this._runningConnections.delete(args.tabUid); } diff --git a/src/renderer/components/ModalFakerRows.vue b/src/renderer/components/ModalFakerRows.vue index 829d5eac..b7785537 100644 --- a/src/renderer/components/ModalFakerRows.vue +++ b/src/renderer/components/ModalFakerRows.vue @@ -6,7 +6,7 @@
- {{ $t('message.tableFiller') }} + {{ $tc('message.insertRow', 2) }}
diff --git a/src/renderer/components/TheFooter.vue b/src/renderer/components/TheFooter.vue index 9413d1c9..644fb7a1 100644 --- a/src/renderer/components/TheFooter.vue +++ b/src/renderer/components/TheFooter.vue @@ -11,9 +11,9 @@
    -
  • - - {{ $t('message.plantATree') }} +
  • + + {{ $t('word.donate') }}
  • diff --git a/src/renderer/components/WorkspaceTabQuery.vue b/src/renderer/components/WorkspaceTabQuery.vue index c7fed5e3..8ab66c53 100644 --- a/src/renderer/components/WorkspaceTabQuery.vue +++ b/src/renderer/components/WorkspaceTabQuery.vue @@ -46,6 +46,24 @@ {{ $t('word.run') }}
+ +
diff --git a/src/renderer/i18n/en-US.js b/src/renderer/i18n/en-US.js index 21424055..f63721c1 100644 --- a/src/renderer/i18n/en-US.js +++ b/src/renderer/i18n/en-US.js @@ -124,7 +124,9 @@ module.exports = { filter: 'Filter', disabled: 'Disabled', enable: 'Enable', - disable: 'Disable' + disable: 'Disable', + commit: 'Commit', + rollback: 'Rollback' }, message: { appWelcome: 'Welcome to Antares SQL Client!', @@ -252,7 +254,11 @@ module.exports = { closeTab: 'Close tab', goToDownloadPage: 'Go to download page', readOnlyMode: 'Read-only mode', - killQuery: 'Kill query' + killQuery: 'Kill query', + insertRow: 'Insert row | Insert rows', + commitMode: 'Commit mode', + autoCommit: 'Auto commit', + manualCommit: 'Manual commit' }, faker: { address: 'Address', diff --git a/src/renderer/ipc-api/Schema.js b/src/renderer/ipc-api/Schema.js index 02dee1d5..ac4f7bd4 100644 --- a/src/renderer/ipc-api/Schema.js +++ b/src/renderer/ipc-api/Schema.js @@ -50,6 +50,18 @@ export default class { return ipcRenderer.invoke('kill-tab-query', params); } + static commitTab (params) { + return ipcRenderer.invoke('commit-tab', params); + } + + static rollbackTab (params) { + return ipcRenderer.invoke('rollback-tab', params); + } + + static destroyConnectionToCommit (params) { + return ipcRenderer.invoke('destroy-connection-to-commit', params); + } + static useSchema (params) { return ipcRenderer.invoke('use-schema', params); }