diff --git a/extensions/mssql/src/contracts.ts b/extensions/mssql/src/contracts.ts index d983a09e7e..1518dfaedb 100644 --- a/extensions/mssql/src/contracts.ts +++ b/extensions/mssql/src/contracts.ts @@ -515,7 +515,7 @@ export interface DeployParams { packageFilePath: string; databaseName: string; upgradeExisting: boolean; - sqlCommandVariableValues?: Map; + sqlCommandVariableValues?: Record; deploymentOptions?: mssql.DeploymentOptions; ownerUri: string; taskExecutionMode: TaskExecutionMode; @@ -524,7 +524,7 @@ export interface DeployParams { export interface GenerateDeployScriptParams { packageFilePath: string; databaseName: string; - sqlCommandVariableValues?: Map; + sqlCommandVariableValues?: Record; deploymentOptions?: mssql.DeploymentOptions ownerUri: string; taskExecutionMode: TaskExecutionMode; @@ -555,7 +555,7 @@ export interface SavePublishProfileParams { profilePath: string; databaseName: string; connectionString: string; - sqlCommandVariableValues?: Map; + sqlCommandVariableValues?: Record; deploymentOptions?: mssql.DeploymentOptions; } diff --git a/extensions/mssql/src/dacfx/dacFxService.ts b/extensions/mssql/src/dacfx/dacFxService.ts index 1e6ba0050e..ff41c9da4e 100644 --- a/extensions/mssql/src/dacfx/dacFxService.ts +++ b/extensions/mssql/src/dacfx/dacFxService.ts @@ -55,12 +55,12 @@ export class DacFxService extends BaseService implements mssql.IDacFxService { } public async deployDacpac(packageFilePath: string, targetDatabaseName: string, upgradeExisting: boolean, ownerUri: string, taskExecutionMode: azdata.TaskExecutionMode, sqlCommandVariableValues?: Map, deploymentOptions?: mssql.DeploymentOptions): Promise { - const params: contracts.DeployParams = { packageFilePath: packageFilePath, databaseName: targetDatabaseName, upgradeExisting: upgradeExisting, sqlCommandVariableValues: sqlCommandVariableValues, deploymentOptions: deploymentOptions, ownerUri: ownerUri, taskExecutionMode: taskExecutionMode }; + const params: contracts.DeployParams = { packageFilePath: packageFilePath, databaseName: targetDatabaseName, upgradeExisting: upgradeExisting, sqlCommandVariableValues: Object.fromEntries(sqlCommandVariableValues), deploymentOptions: deploymentOptions, ownerUri: ownerUri, taskExecutionMode: taskExecutionMode }; return this.runWithErrorHandling(contracts.DeployRequest.type, params); } public async generateDeployScript(packageFilePath: string, targetDatabaseName: string, ownerUri: string, taskExecutionMode: azdata.TaskExecutionMode, sqlCommandVariableValues?: Map, deploymentOptions?: mssql.DeploymentOptions): Promise { - const params: contracts.GenerateDeployScriptParams = { packageFilePath: packageFilePath, databaseName: targetDatabaseName, sqlCommandVariableValues: sqlCommandVariableValues, deploymentOptions: deploymentOptions, ownerUri: ownerUri, taskExecutionMode: taskExecutionMode }; + const params: contracts.GenerateDeployScriptParams = { packageFilePath: packageFilePath, databaseName: targetDatabaseName, sqlCommandVariableValues: Object.fromEntries(sqlCommandVariableValues), deploymentOptions: deploymentOptions, ownerUri: ownerUri, taskExecutionMode: taskExecutionMode }; return this.runWithErrorHandling(contracts.GenerateDeployScriptRequest.type, params); } @@ -85,7 +85,7 @@ export class DacFxService extends BaseService implements mssql.IDacFxService { } public async savePublishProfile(profilePath: string, databaseName: string, connectionString: string, sqlCommandVariableValues?: Map, deploymentOptions?: mssql.DeploymentOptions): Promise { - const params: contracts.SavePublishProfileParams = { profilePath, databaseName, connectionString, sqlCommandVariableValues, deploymentOptions }; + const params: contracts.SavePublishProfileParams = { profilePath, databaseName, connectionString, sqlCommandVariableValues: Object.fromEntries(sqlCommandVariableValues), deploymentOptions }; return this.runWithErrorHandling(contracts.SavePublishProfileRequest.type, params); } }