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

Benjin/project update bug (#18532)

Browse Source 
* correct result.success

* shifting success message to actually check success

* keying on errorMessage rather than success
This commit is contained in:
Benjin Dubishar
2022-02-25 16:59:28 -08:00
committed by GitHub
parent 5e93f2ca9b
commit c64655ae71
2 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
extensions/schema-compare/src/schemaCompareMainWindow.ts
View File

@@ -898,8 +898,7 @@ export class SchemaCompareMainWindow {
throw new Error(`Unsupported SchemaCompareEndpointType: ${getSchemaCompareEndpointString(this.targetEndpointInfo.endpointType)}`); throw new Error(`Unsupported SchemaCompareEndpointType: ${getSchemaCompareEndpointString(this.targetEndpointInfo.endpointType)}`);
} }
if (!result || !result.success) { if (!result || !result.success || result.errorMessage !== '') {
TelemetryReporter.createErrorEvent(TelemetryViews.SchemaCompareMainWindow, 'SchemaCompareApplyFailed', undefined, getTelemetryErrorType(result?.errorMessage)) TelemetryReporter.createErrorEvent(TelemetryViews.SchemaCompareMainWindow, 'SchemaCompareApplyFailed', undefined, getTelemetryErrorType(result?.errorMessage))
.withAdditionalProperties({ .withAdditionalProperties({
'operationId': this.comparisonResult.operationId, 'operationId': this.comparisonResult.operationId,
@@ -912,6 +911,11 @@ export class SchemaCompareMainWindow {
this.generateScriptButton.title = loc.generateScriptEnabledMessage; this.generateScriptButton.title = loc.generateScriptEnabledMessage;
this.applyButton.enabled = true; this.applyButton.enabled = true;
this.applyButton.title = loc.applyEnabledMessage; this.applyButton.title = loc.applyEnabledMessage;
} else if (this.targetEndpointInfo.endpointType === mssql.SchemaCompareEndpointType.Project) {
const workspaceApi = getDataWorkspaceExtensionApi();
workspaceApi.showProjectsView();
void vscode.window.showInformationMessage(loc.applySuccess);
} }
TelemetryReporter.createActionEvent(TelemetryViews.SchemaCompareMainWindow, 'SchemaCompareApplyEnded') TelemetryReporter.createActionEvent(TelemetryViews.SchemaCompareMainWindow, 'SchemaCompareApplyEnded')
@@ -920,13 +924,6 @@ export class SchemaCompareMainWindow {
'operationId': this.comparisonResult.operationId, 'operationId': this.comparisonResult.operationId,
'targetType': getSchemaCompareEndpointString(this.targetEndpointInfo.endpointType) 'targetType': getSchemaCompareEndpointString(this.targetEndpointInfo.endpointType)
}).send(); }).send();
if (this.targetEndpointInfo.endpointType === mssql.SchemaCompareEndpointType.Project) {
const workspaceApi = getDataWorkspaceExtensionApi();
workspaceApi.showProjectsView();
void vscode.window.showInformationMessage(loc.applySuccess);
}
} }
}); });
} }

22
extensions/sql-database-projects/src/controllers/projectController.ts
View File

@@ -534,21 +534,23 @@ export class ProjectsController {
const result: mssql.SchemaComparePublishProjectResult = await service.schemaComparePublishProjectChanges(operationId, projectPath, fs, utils.getAzdataApi()!.TaskExecutionMode.execute); const result: mssql.SchemaComparePublishProjectResult = await service.schemaComparePublishProjectChanges(operationId, projectPath, fs, utils.getAzdataApi()!.TaskExecutionMode.execute);
const project = await Project.openProject(projectFilePath); if (result.errorMessage === '') {
const project = await Project.openProject(projectFilePath);
let toAdd: vscode.Uri[] = []; let toAdd: vscode.Uri[] = [];
result.addedFiles.forEach((f: any) => toAdd.push(vscode.Uri.file(f))); result.addedFiles.forEach((f: any) => toAdd.push(vscode.Uri.file(f)));
await project.addToProject(toAdd); await project.addToProject(toAdd);
let toRemove: vscode.Uri[] = []; let toRemove: vscode.Uri[] = [];
result.deletedFiles.forEach((f: any) => toRemove.push(vscode.Uri.file(f))); result.deletedFiles.forEach((f: any) => toRemove.push(vscode.Uri.file(f)));
let toRemoveEntries: FileProjectEntry[] = []; let toRemoveEntries: FileProjectEntry[] = [];
toRemove.forEach(f => toRemoveEntries.push(new FileProjectEntry(f, f.path.replace(projectPath + '\\', ''), EntryType.File))); toRemove.forEach(f => toRemoveEntries.push(new FileProjectEntry(f, f.path.replace(projectPath + '\\', ''), EntryType.File)));
toRemoveEntries.forEach(async f => await project.exclude(f)); toRemoveEntries.forEach(async f => await project.exclude(f));
await this.buildProject(project); await this.buildProject(project);
}
return result; return result;
} }