ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 10:58:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixing bug where SQLCMD vars weren't getting JSONified (#23082)

Browse Source 
* changing param for sqlcmdvars back to Record since Json.stringify doesn't handle Maps

* swapping over savePublishProfile
This commit is contained in:
Benjin Dubishar
2023-05-10 21:12:21 -07:00
committed by GitHub
parent c592c74958
commit 0158bd9861
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
extensions/mssql/src/contracts.ts
View File

@@ -515,7 +515,7 @@ export interface DeployParams {
packageFilePath: string; packageFilePath: string;
databaseName: string; databaseName: string;
upgradeExisting: boolean; upgradeExisting: boolean;
sqlCommandVariableValues?: Map<string, string>; sqlCommandVariableValues?: Record<string, string>;
deploymentOptions?: mssql.DeploymentOptions; deploymentOptions?: mssql.DeploymentOptions;
ownerUri: string; ownerUri: string;
taskExecutionMode: TaskExecutionMode; taskExecutionMode: TaskExecutionMode;
@@ -524,7 +524,7 @@ export interface DeployParams {
export interface GenerateDeployScriptParams { export interface GenerateDeployScriptParams {
packageFilePath: string; packageFilePath: string;
databaseName: string; databaseName: string;
sqlCommandVariableValues?: Map<string, string>; sqlCommandVariableValues?: Record<string, string>;
deploymentOptions?: mssql.DeploymentOptions deploymentOptions?: mssql.DeploymentOptions
ownerUri: string; ownerUri: string;
taskExecutionMode: TaskExecutionMode; taskExecutionMode: TaskExecutionMode;
@@ -555,7 +555,7 @@ export interface SavePublishProfileParams {
profilePath: string; profilePath: string;
databaseName: string; databaseName: string;
connectionString: string; connectionString: string;
sqlCommandVariableValues?: Map<string, string>; sqlCommandVariableValues?: Record<string, string>;
deploymentOptions?: mssql.DeploymentOptions; deploymentOptions?: mssql.DeploymentOptions;
} }

6
extensions/mssql/src/dacfx/dacFxService.ts
View File

@@ -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<string, string>, deploymentOptions?: mssql.DeploymentOptions): Promise<mssql.DacFxResult> { public async deployDacpac(packageFilePath: string, targetDatabaseName: string, upgradeExisting: boolean, ownerUri: string, taskExecutionMode: azdata.TaskExecutionMode, sqlCommandVariableValues?: Map<string, string>, deploymentOptions?: mssql.DeploymentOptions): Promise<mssql.DacFxResult> {
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); return this.runWithErrorHandling(contracts.DeployRequest.type, params);
} }
public async generateDeployScript(packageFilePath: string, targetDatabaseName: string, ownerUri: string, taskExecutionMode: azdata.TaskExecutionMode, sqlCommandVariableValues?: Map<string, string>, deploymentOptions?: mssql.DeploymentOptions): Promise<mssql.DacFxResult> { public async generateDeployScript(packageFilePath: string, targetDatabaseName: string, ownerUri: string, taskExecutionMode: azdata.TaskExecutionMode, sqlCommandVariableValues?: Map<string, string>, deploymentOptions?: mssql.DeploymentOptions): Promise<mssql.DacFxResult> {
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); 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<string, string>, deploymentOptions?: mssql.DeploymentOptions): Promise<azdata.ResultStatus> { public async savePublishProfile(profilePath: string, databaseName: string, connectionString: string, sqlCommandVariableValues?: Map<string, string>, deploymentOptions?: mssql.DeploymentOptions): Promise<azdata.ResultStatus> {
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); return this.runWithErrorHandling(contracts.SavePublishProfileRequest.type, params);
} }
} }