Changing sqlcmdvars to records because JSON.stringify can't handle Ma…

…ps (#17683) (#17684)
microsoft · May 11, 2023 · 5f50530 · 5f50530
1 parent 4cc2604
commit 5f50530
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/services/dacFxService.ts b/src/services/dacFxService.ts
@@ -93,7 +93,7 @@ export class DacFxService implements mssql.IDacFxService {
 			packageFilePath: packageFilePath,
 			databaseName: targetDatabaseName,
 			upgradeExisting: upgradeExisting,
-			sqlCommandVariableValues: sqlCommandVariableValues,
+			sqlCommandVariableValues: Object.fromEntries(sqlCommandVariableValues),
 			deploymentOptions: deploymentOptions,
 			ownerUri: ownerUri,
 			taskExecutionMode: taskExecutionMode
@@ -111,7 +111,7 @@ export class DacFxService implements mssql.IDacFxService {
 		const params: mssql.GenerateDeployScriptParams = {
 			packageFilePath: packageFilePath,
 			databaseName: targetDatabaseName,
-			sqlCommandVariableValues: sqlCommandVariableValues,
+			sqlCommandVariableValues: Object.fromEntries(sqlCommandVariableValues),
 			deploymentOptions: deploymentOptions,
 			ownerUri: ownerUri,
 			taskExecutionMode: taskExecutionMode
@@ -151,7 +151,7 @@ export class DacFxService implements mssql.IDacFxService {
 			profilePath: profilePath,
 			databaseName: databaseName,
 			connectionString: connectionString,
-			sqlCommandVariableValues: sqlCommandVariableValues,
+			sqlCommandVariableValues: Object.fromEntries(sqlCommandVariableValues),
 			deploymentOptions: deploymentOptions
 		};
 		return this._client.sendRequest(dacFxContracts.SavePublishProfileRequest.type, params);

diff --git a/typings/vscode-mssql.d.ts b/typings/vscode-mssql.d.ts
@@ -1112,7 +1112,7 @@ declare module 'vscode-mssql' {
 		packageFilePath: string;
 		databaseName: string;
 		upgradeExisting: boolean;
-		sqlCommandVariableValues?: Map<string, string>;
+		sqlCommandVariableValues?: Record<string, string>;
 		deploymentOptions?: DeploymentOptions;
 		ownerUri: string;
 		taskExecutionMode: TaskExecutionMode;
@@ -1121,7 +1121,7 @@ declare module 'vscode-mssql' {
 	export interface GenerateDeployScriptParams {
 		packageFilePath: string;
 		databaseName: string;
-		sqlCommandVariableValues?: Map<string, string>;
+		sqlCommandVariableValues?: Record<string, string>;
 		deploymentOptions?: DeploymentOptions;
 		ownerUri: string;
 		taskExecutionMode: TaskExecutionMode;
@@ -1153,7 +1153,7 @@ declare module 'vscode-mssql' {
 		profilePath: string;
 		databaseName: string;
 		connectionString: string;
-		sqlCommandVariableValues?: Map<string, string>;
+		sqlCommandVariableValues?: Record<string, string>;
 		deploymentOptions?: DeploymentOptions;
 	}