From 017bbe61d587aa4fdf54c473c9e01c3b8a51ac4e Mon Sep 17 00:00:00 2001 From: Benjin Dubishar Date: Thu, 11 May 2023 22:03:31 -0700 Subject: [PATCH] Fix deploy/generatePlan/saveProfile when no sqlcmdvars are defined (#23112) * fix deploy/generate when no sqlcmdvars are defined * saveProfile --- extensions/mssql/src/dacfx/dacFxService.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/extensions/mssql/src/dacfx/dacFxService.ts b/extensions/mssql/src/dacfx/dacFxService.ts index ff41c9da4e..1a5a320ce3 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: Object.fromEntries(sqlCommandVariableValues), deploymentOptions: deploymentOptions, ownerUri: ownerUri, taskExecutionMode: taskExecutionMode }; + const params: contracts.DeployParams = { packageFilePath: packageFilePath, databaseName: targetDatabaseName, upgradeExisting: upgradeExisting, sqlCommandVariableValues: sqlCommandVariableValues ? Object.fromEntries(sqlCommandVariableValues) : undefined, 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: Object.fromEntries(sqlCommandVariableValues), deploymentOptions: deploymentOptions, ownerUri: ownerUri, taskExecutionMode: taskExecutionMode }; + const params: contracts.GenerateDeployScriptParams = { packageFilePath: packageFilePath, databaseName: targetDatabaseName, sqlCommandVariableValues: sqlCommandVariableValues ? Object.fromEntries(sqlCommandVariableValues) : undefined, 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: Object.fromEntries(sqlCommandVariableValues), deploymentOptions }; + const params: contracts.SavePublishProfileParams = { profilePath, databaseName, connectionString, sqlCommandVariableValues: sqlCommandVariableValues ? Object.fromEntries(sqlCommandVariableValues) : undefined, deploymentOptions }; return this.runWithErrorHandling(contracts.SavePublishProfileRequest.type, params); } }