diff --git a/plugins/dbgate-plugin-mssql/src/backend/MsSqlAnalyser.js b/plugins/dbgate-plugin-mssql/src/backend/MsSqlAnalyser.js index 84b8168c3..4d51a4339 100644 --- a/plugins/dbgate-plugin-mssql/src/backend/MsSqlAnalyser.js +++ b/plugins/dbgate-plugin-mssql/src/backend/MsSqlAnalyser.js @@ -132,6 +132,9 @@ class MsSqlAnalyser extends DatabaseAnalyser { const procedureParameterRows = await this.analyserQuery('proceduresParameters'); const functionParameterRows = await this.analyserQuery('functionParameters'); + this.feedback({ analysingMessage: 'Loading triggers' }); + const triggerRows = await this.analyserQuery('triggers'); + this.feedback({ analysingMessage: 'Loading view columns' }); const viewColumnRows = await this.analyserQuery('viewColumns', ['views']); @@ -214,8 +217,6 @@ class MsSqlAnalyser extends DatabaseAnalyser { parameters: functionToParameters[row.objectId], })); - const triggerRows = await this.analyserQuery('triggers'); - const triggers = triggerRows.rows.map(row => ({ objectId: `triggers:${row.objectId}`, contentHash: row.modifyDate && row.modifyDate.toISOString(), diff --git a/plugins/dbgate-plugin-mysql/src/backend/Analyser.js b/plugins/dbgate-plugin-mysql/src/backend/Analyser.js index 30363106b..d85b7c3c6 100644 --- a/plugins/dbgate-plugin-mysql/src/backend/Analyser.js +++ b/plugins/dbgate-plugin-mysql/src/backend/Analyser.js @@ -161,6 +161,7 @@ class Analyser extends DatabaseAnalyser { const indexes = await this.analyserQuery('indexes', ['tables']); this.feedback({ analysingMessage: 'Loading uniques' }); + this.feedback({ analysingMessage: 'Loading triggers' }); const triggers = await this.analyserQuery('triggers'); const uniqueNames = await this.analyserQuery('uniqueNames', ['tables']); diff --git a/plugins/dbgate-plugin-oracle/src/backend/Analyser.js b/plugins/dbgate-plugin-oracle/src/backend/Analyser.js index c2617bc4f..d4f204e71 100644 --- a/plugins/dbgate-plugin-oracle/src/backend/Analyser.js +++ b/plugins/dbgate-plugin-oracle/src/backend/Analyser.js @@ -73,6 +73,7 @@ class Analyser extends DatabaseAnalyser { this.feedback({ analysingMessage: 'Loading unique names' }); const triggers = await this.analyserQuery('triggers', undefined, { $owner: this.dbhan.database }); + this.feedback({ analysingMessage: 'Loading triggers' }); const uniqueNames = await this.analyserQuery('uniqueNames', ['tables'], { $owner: this.dbhan.database }); this.feedback({ analysingMessage: 'Finalizing DB structure' }); diff --git a/plugins/dbgate-plugin-postgres/src/backend/Analyser.js b/plugins/dbgate-plugin-postgres/src/backend/Analyser.js index 428fef847..784fde489 100644 --- a/plugins/dbgate-plugin-postgres/src/backend/Analyser.js +++ b/plugins/dbgate-plugin-postgres/src/backend/Analyser.js @@ -185,6 +185,9 @@ class Analyser extends DatabaseAnalyser { geographyColumns = await this.analyserQuery('geographyColumns', ['tables']); } + this.feedback({ analysingMessage: 'Loading triggers' }); + const triggers = await this.analyserQuery('triggers'); + this.feedback({ analysingMessage: 'Finalizing DB structure' }); const columnColumnsMapped = fkColumns.rows.map(x => ({ @@ -241,8 +244,6 @@ class Analyser extends DatabaseAnalyser { return acc; }, {}); - const triggers = await this.analyserQuery('triggers'); - const res = { tables: tables.rows.map(table => { const newTable = {