Skip to content

Report merge conflict when merging a JSON document that is NULL in the common ancestor. #10178

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nicktobey merged 2 commits into from
Dec 5, 2025
Merged

Report merge conflict when merging a JSON document that is NULL in the common ancestor. #10178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
09b5037
Add json merge tests with NULLs
nicktobey Dec 5, 2025
984eeba
Report conflicts in JSON merge when one value is NULL
nicktobey Dec 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions go/libraries/doltcore/merge/merge_prolly_rows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2154,6 +2154,10 @@ func (m *valueMerger) processColumn(ctx *sql.Context, i int, left, right, base v
return nil, true, err
}
if _, ok := sqlType.(types.JsonType); ok && !disallowJsonMerge {
// if any of the values are NULL, this is an unresolvable conflict
if baseCol == nil || leftCol == nil || rightCol == nil {
return nil, true, nil
}
return m.mergeJSONAddr(ctx, baseCol, leftCol, rightCol)
}
// otherwise, this is a conflict.
Expand Down
14 changes: 14 additions & 0 deletions go/libraries/doltcore/merge/schema_merge_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1250,6 +1250,20 @@ var jsonMergeTests = []schemaMergeTest{
right: singleRow(1, 1, 2, `{ "key1": "value3" }`),
dataConflict: true,
},
{
name: `divergent modification with NULL ancestor`,
ancestor: singleRow(1, 1, 1, nil),
left: singleRow(1, 2, 1, `{ "key1": "value2" }`),
right: singleRow(1, 1, 2, `{ "key1": "value3" }`),
dataConflict: true,
},
{
name: `divergent modification with NULL child`,
ancestor: singleRow(1, 1, 1, `{ "key1": "value1"}`),
left: singleRow(1, 2, 1, nil),
right: singleRow(1, 1, 2, `{ "key1": "value3" }`),
dataConflict: true,
},
{
name: `divergent modification and deletion`,
ancestor: singleRow(1, 1, 1, `{ "key1": "value1"}`),
Expand Down
Loading