ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-17 02:51:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add only non null changes to difference dictionary to ensure index doesnt mismatch (#6236)

Browse Source
This commit is contained in:
Udeesha Gautam
2019-07-03 10:08:14 -07:00
committed by GitHub
parent cc6dea0631
commit a8b3f056a0
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
extensions/schema-compare/src/schemaCompareResult.ts
View File

@@ -468,17 +468,19 @@ export class SchemaCompareResult {
private getAllDifferences(differences: azdata.DiffEntry[]): string[][] { private getAllDifferences(differences: azdata.DiffEntry[]): string[][] {
let data = []; let data = [];
let finalDifferences: azdata.DiffEntry[] = [];
if (differences) { if (differences) {
differences.forEach(difference => { differences.forEach(difference => {
if (difference.differenceType === azdata.SchemaDifferenceType.Object) { if (difference.differenceType === azdata.SchemaDifferenceType.Object) {
if ((difference.sourceValue !== null && difference.sourceValue.length > 0) || (difference.targetValue !== null && difference.targetValue.length > 0)) { if ((difference.sourceValue !== null && difference.sourceValue.length > 0) || (difference.targetValue !== null && difference.targetValue.length > 0)) {
finalDifferences.push(difference); // Add only non-null changes to ensure index does not mismatch between dictionay and UI - #6234
let state: boolean = this.shouldDiffBeIncluded(difference); let state: boolean = this.shouldDiffBeIncluded(difference);
data.push([difference.name, this.createName(difference.sourceValue), state, this.SchemaCompareActionMap[difference.updateAction], this.createName(difference.targetValue)]); data.push([difference.name, this.createName(difference.sourceValue), state, this.SchemaCompareActionMap[difference.updateAction], this.createName(difference.targetValue)]);
} }
} }
}); });
} }
this.comparisonResult.differences = finalDifferences;
return data; return data;
} }