From d45fbcb8c84abb96bc9d1f6b8accab01a1ed7b79 Mon Sep 17 00:00:00 2001 From: Jan Prochazka Date: Sat, 27 Mar 2021 19:57:03 +0100 Subject: [PATCH] sqlgen --- packages/api/src/controllers/sqlgen.js | 4 ++-- packages/tools/src/SqlGenerator.ts | 2 +- packages/web/src/modals/SqlGeneratorModal.svelte | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/api/src/controllers/sqlgen.js b/packages/api/src/controllers/sqlgen.js index a7756a8d4..f065a70db 100644 --- a/packages/api/src/controllers/sqlgen.js +++ b/packages/api/src/controllers/sqlgen.js @@ -11,9 +11,9 @@ module.exports = { const structure = await databaseConnections.structure({ conid, database }) const connection = await connections.get({ conid }) const driver = requireEngineDriver(connection); - const dmp = driver.createDumper() + const dmp = driver.createDumper(); const generator = new SqlGenerator(structure, options, objects, dmp); - generator.dump(); + await generator.dump(); return dmp.s; }, }; diff --git a/packages/tools/src/SqlGenerator.ts b/packages/tools/src/SqlGenerator.ts index ab5a0791a..b1fc11b63 100644 --- a/packages/tools/src/SqlGenerator.ts +++ b/packages/tools/src/SqlGenerator.ts @@ -43,7 +43,7 @@ export class SqlGenerator { return false; } - dump() { + async dump() { if (this.options.createTables) { for (const table of this.tables) { this.dmp.createTable(table); diff --git a/packages/web/src/modals/SqlGeneratorModal.svelte b/packages/web/src/modals/SqlGeneratorModal.svelte index 9d2a0601c..e2c4a4e8d 100644 --- a/packages/web/src/modals/SqlGeneratorModal.svelte +++ b/packages/web/src/modals/SqlGeneratorModal.svelte @@ -53,10 +53,12 @@ ); async function generatePreview(options, objects) { + busy = true; const response = await axiosInstance.post('sqlgen/preview', { conid, database, objects, options }); if (_.isString(response.data)) { sqlPreview = response.data; } + busy = false; }