[NDB_BVL_Instrument] Conflict detecting fix#10313
Open
CamilleBeau wants to merge 1 commit intoaces:mainfrom
Open
[NDB_BVL_Instrument] Conflict detecting fix#10313CamilleBeau wants to merge 1 commit intoaces:mainfrom
CamilleBeau wants to merge 1 commit intoaces:mainfrom
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Brief summary of changes
This PR fixes the "diff" function in NDB_BVL_Instrument.class.inc which is used for recreating conflicts. This function was reporting the difference between one instrument and another, but only doing so by considering the fields in the primary instrument. For SQL instruments this isn't a problem because the fields are determined by the SQL table. However, for JSON instruments this can result in conflicts going undetected because if a field is null it does not necessarily show up in getInstanceData, so it will not be considered.
The PR fixes the issue by checking values from a unique array of the keys from both the FDE and DDE (or from the primary and secondary instrument).
Testing instructions (if applicable)
Link(s) to related issue(s)