From e80aec586b8ef61c0341b92c073e9a91c5051861 Mon Sep 17 00:00:00 2001 From: Kim Santiago <31145923+kisantia@users.noreply.github.com> Date: Wed, 3 Jun 2020 16:43:02 -0700 Subject: [PATCH] fix sql project generate script (#10697) --- .../src/controllers/projectController.ts | 4 ++-- .../src/dialogs/deployDatabaseDialog.ts | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/extensions/sql-database-projects/src/controllers/projectController.ts b/extensions/sql-database-projects/src/controllers/projectController.ts index 7142b8b6ae..bbb59cf64e 100644 --- a/extensions/sql-database-projects/src/controllers/projectController.ts +++ b/extensions/sql-database-projects/src/controllers/projectController.ts @@ -201,11 +201,11 @@ export class ProjectsController { const dacFxService = await ProjectsController.getDaxFxService(); - if (profile as IDeploymentProfile) { + if ((profile).upgradeExisting) { return await dacFxService.deployDacpac(dacpacPath, profile.databaseName, (profile).upgradeExisting, profile.connectionUri, TaskExecutionMode.execute, profile.sqlCmdVariables); } else { - return await dacFxService.generateDeployScript(dacpacPath, profile.databaseName, profile.connectionUri, TaskExecutionMode.execute, profile.sqlCmdVariables); + return await dacFxService.generateDeployScript(dacpacPath, profile.databaseName, profile.connectionUri, TaskExecutionMode.script, profile.sqlCmdVariables); } } diff --git a/extensions/sql-database-projects/src/dialogs/deployDatabaseDialog.ts b/extensions/sql-database-projects/src/dialogs/deployDatabaseDialog.ts index 463daeb25d..370caa4376 100644 --- a/extensions/sql-database-projects/src/dialogs/deployDatabaseDialog.ts +++ b/extensions/sql-database-projects/src/dialogs/deployDatabaseDialog.ts @@ -161,10 +161,10 @@ export class DeployDatabaseDialog { sqlCmdVariables: this.project.sqlCmdVariables }; + azdata.window.closeDialog(this.dialog); await this.deploy!(this.project, profile); this.dispose(); - azdata.window.closeDialog(this.dialog); } public async generateScriptClick(): Promise { @@ -173,12 +173,13 @@ export class DeployDatabaseDialog { connectionUri: await this.getConnectionUri() }; + azdata.window.closeDialog(this.dialog); + if (this.generateScript) { await this.generateScript!(this.project, profile); } this.dispose(); - azdata.window.closeDialog(this.dialog); } private getTargetDatabaseName(): string {