fix bug in merge logic that caused duplicate edges in the databae #5605
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.
Fixes #5569
IFC-1182
there was a bug in the logic to merge a branch into
main
that could cause duplicateIS_VISIBLE
andIS_PROTECTED
relationships to be created. this would cause theRelationshipGetPeerQuery
to return the wrong number of relationships and would make the number of relationships appear incorrectly highthe test updates included in this PR use a plain cypher query to verify that no duplicate relationships exist, which is not how most of our tests operate, but it seems like the most thorough way to prevent the problem going forward