Skip to content

[NDB_BVL_Instrument] Conflict detecting fix#10313

Open
CamilleBeau wants to merge 1 commit intoaces:mainfrom
CamilleBeau:2026_01_27_conflict_detecting
Open

[NDB_BVL_Instrument] Conflict detecting fix#10313
CamilleBeau wants to merge 1 commit intoaces:mainfrom
CamilleBeau:2026_01_27_conflict_detecting

Conversation

@CamilleBeau
Copy link
Collaborator

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).

  • Have you updated related documentation?

Testing instructions (if applicable)

  1. From this PR, run the recreate_conflcits.php script for a JSON instrument, and make sure there is a case where values are populated for DDE but not for FDE
  2. Go to the conflict resolver and make sure there are conflicts for this case.

Link(s) to related issue(s)

  • Resolves #NO ISSUE

@github-actions github-actions bot added the Language: PHP PR or issue that update PHP code label Jan 27, 2026
@CamilleBeau CamilleBeau changed the title [NDB_BVL_Instrument] Clonflict detecting fix [NDB_BVL_Instrument] Conflict detecting fix Jan 27, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Language: PHP PR or issue that update PHP code

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants