diff --git a/integration-tests/engines.js b/integration-tests/engines.js index 14dadddd5..5d0a06c7c 100644 --- a/integration-tests/engines.js +++ b/integration-tests/engines.js @@ -147,8 +147,6 @@ const mysqlEngine = { pureName: 'obj1', status: 'ENABLED', eventType: 'RECURRING', - enableSql: 'ALTER EVENT obj1 ENABLE;', - disableSql: 'ALTER EVENT obj1 DISABLE;', intervalValue: '1', intervalField: 'HOUR', }, @@ -161,8 +159,6 @@ const mysqlEngine = { pureName: 'obj1', status: 'ENABLED', eventType: 'ONE TIME', - enableSql: 'ALTER EVENT obj1 ENABLE;', - disableSql: 'ALTER EVENT obj1 DISABLE;', }, }, ], diff --git a/packages/types/dbinfo.d.ts b/packages/types/dbinfo.d.ts index 0ef99a779..6bd700e75 100644 --- a/packages/types/dbinfo.d.ts +++ b/packages/types/dbinfo.d.ts @@ -167,8 +167,6 @@ export interface SchedulerEventInfo extends SqlObjectInfo { intervalField: string; starts: string; executeAt: string; - enableSql: string; - disableSql: string; } export interface SchemaInfo { diff --git a/packages/web/src/appobj/DatabaseObjectAppObject.svelte b/packages/web/src/appobj/DatabaseObjectAppObject.svelte index 11a578c08..58702e440 100644 --- a/packages/web/src/appobj/DatabaseObjectAppObject.svelte +++ b/packages/web/src/appobj/DatabaseObjectAppObject.svelte @@ -498,10 +498,10 @@ ); }); } else if (menu.isDisableEvent) { - const { conid, database, disableSql } = data; + const { conid, database, pureName } = data; const driver = await getDriver(); const dmp = driver.createDumper(); - dmp.put(disableSql); + dmp.put('^alter ^event %i ^disable', pureName); const sql = dmp.s; @@ -513,10 +513,10 @@ engine: driver.engine, }); } else if (menu.isEnableEvent) { - const { conid, database, enableSql } = data; + const { conid, database, pureName } = data; const driver = await getDriver(); const dmp = driver.createDumper(); - dmp.put(enableSql); + dmp.put('^alter ^event %i ^enable', pureName); const sql = dmp.s; diff --git a/plugins/dbgate-plugin-mysql/src/backend/Analyser.js b/plugins/dbgate-plugin-mysql/src/backend/Analyser.js index 1e7ae1b42..c51bd310a 100644 --- a/plugins/dbgate-plugin-mysql/src/backend/Analyser.js +++ b/plugins/dbgate-plugin-mysql/src/backend/Analyser.js @@ -256,8 +256,6 @@ class Analyser extends DatabaseAnalyser { contentHash: _.isDate(row.LAST_ALTERED) ? row.LAST_ALTERED.toISOString() : row.LAST_ALTERED, pureName: row.EVENT_NAME, createSql: row.CREATE_SQL, - enableSql: row.ENABLE_SQL, - disableSql: row.DISABLE_SQL, objectId: row.EVENT_NAME, intervalValue: row.INTERVAL_VALUE, intervalField: row.INTERVAL_FIELD, @@ -310,8 +308,6 @@ class Analyser extends DatabaseAnalyser { contentHash: _.isDate(row.LAST_ALTERED) ? row.LAST_ALTERED.toISOString() : row.LAST_ALTERED, pureName: row.EVENT_NAME, createSql: row.CREATE_SQL, - enableSql: row.ENABLE_SQL, - disableSql: row.DISABLE_SQL, objectId: row.EVENT_NAME, intervalValue: row.INTERVAL_VALUE, intervalField: row.INTERVAL_FIELD, diff --git a/plugins/dbgate-plugin-mysql/src/backend/sql/schedulerEvents.js b/plugins/dbgate-plugin-mysql/src/backend/sql/schedulerEvents.js index 9558eb70f..29ccf67e1 100644 --- a/plugins/dbgate-plugin-mysql/src/backend/sql/schedulerEvents.js +++ b/plugins/dbgate-plugin-mysql/src/backend/sql/schedulerEvents.js @@ -26,9 +26,7 @@ SELECT END, ' DO ', EVENT_DEFINITION - ) AS CREATE_SQL, - CONCAT('ALTER EVENT ', EVENT_NAME, ' DISABLE;') AS DISABLE_SQL, - CONCAT('ALTER EVENT ', EVENT_NAME, ' ENABLE;') AS ENABLE_SQL + ) AS CREATE_SQL FROM INFORMATION_SCHEMA.EVENTS WHERE EVENT_SCHEMA = '#DATABASE#' AND EVENT_NAME =OBJECT_ID_CONDITION `;