From 9116f66ca49220bd51c37dbb4d34e40ea1cbeb78 Mon Sep 17 00:00:00 2001 From: Benjin Dubishar Date: Thu, 11 May 2023 22:03:41 -0700 Subject: [PATCH] Fixing issue where sqlcmdvars wouldn't load from publish profile in ADS (#23116) * fixing issue where sqlcmdvars wouldn't load from publish profile in ADS * in -> of --- .../src/dialogs/publishDatabaseDialog.ts | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/extensions/sql-database-projects/src/dialogs/publishDatabaseDialog.ts b/extensions/sql-database-projects/src/dialogs/publishDatabaseDialog.ts index 6affd14a9a..b59654280e 100644 --- a/extensions/sql-database-projects/src/dialogs/publishDatabaseDialog.ts +++ b/extensions/sql-database-projects/src/dialogs/publishDatabaseDialog.ts @@ -20,6 +20,7 @@ import { TelemetryActions, TelemetryReporter, TelemetryViews } from '../common/t import { Deferred } from '../common/promise'; import { PublishOptionsDialog } from './publishOptionsDialog'; import { IPublishToDockerSettings, ISqlProjectPublishSettings } from '../models/deploy/publishSettings'; +import { PublishProfile } from '../models/publishProfile/publishProfile'; interface DataSourceDropdownValue extends azdataType.CategoryValue { dataSource: SqlConnectionDataSource; @@ -69,7 +70,7 @@ export class PublishDatabaseDialog { public publish: ((proj: Project, profile: ISqlProjectPublishSettings) => any) | undefined; public publishToContainer: ((proj: Project, profile: IPublishToDockerSettings) => any) | undefined; public generateScript: ((proj: Project, profile: ISqlProjectPublishSettings) => any) | undefined; - public readPublishProfile: ((profileUri: vscode.Uri) => any) | undefined; + public readPublishProfile: ((profileUri: vscode.Uri) => Promise) | undefined; public savePublishProfile: ((profilePath: string, databaseName: string, connectionString: string, sqlCommandVariableValues?: Map, deploymentOptions?: DeploymentOptions) => any) | undefined; constructor(private project: Project) { @@ -814,8 +815,8 @@ export class PublishDatabaseDialog { this.formBuilder?.removeFormItem(this.sqlCmdVariablesFormComponentGroup); } - for (let key in result.sqlCmdVariables) { - this.sqlCmdVars?.set(key, result.sqlCmdVariableColumn.get(key)); + for (let key of result.sqlCmdVariables.keys()) { + this.sqlCmdVars?.set(key, result.sqlCmdVariables.get(key)!); } this.updateRevertSqlCmdVarsButtonState(); @@ -983,7 +984,7 @@ export class PublishDatabaseDialog { /* * Sets the default deployment options to deployment options model object */ - public setDeploymentOptions(deploymentOptions: DeploymentOptions): void { + public setDeploymentOptions(deploymentOptions: DeploymentOptions | undefined): void { this.deploymentOptions = deploymentOptions; } }