fix sql project generate script (#10697)

This commit is contained in:
Kim Santiago
2020-06-03 16:43:02 -07:00
committed by GitHub
parent fbe0f91a9f
commit e80aec586b
2 changed files with 5 additions and 4 deletions

View File

@@ -201,11 +201,11 @@ export class ProjectsController {
const dacFxService = await ProjectsController.getDaxFxService();
if (profile as IDeploymentProfile) {
if ((<IDeploymentProfile>profile).upgradeExisting) {
return await dacFxService.deployDacpac(dacpacPath, profile.databaseName, (<IDeploymentProfile>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);
}
}

View File

@@ -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<void> {
@@ -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 {