Skip to content

Fix merge test to properly test for a constraint violation #9275

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
timsehn merged 1 commit into from
May 30, 2025
Merged

Fix merge test to properly test for a constraint violation #9275

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 9 additions & 2 deletions integration-tests/bats/merge.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -564,8 +564,15 @@ SQL
dolt sql -q "INSERT INTO test VALUES (1,19);"
dolt commit -am "added row"

skip "merge fails on unique index violation, should log conflict"
dolt merge other
run dolt merge other
[ "$status" -eq 1 ]
[[ "$output" =~ "CONSTRAINT VIOLATION" ]] || false
[[ "$output" =~ "Automatic merge failed" ]] || false

run dolt status
[ "$status" -eq 0 ]
[[ "$output" =~ "You have unmerged tables" ]] || false
[[ "$output" =~ "test" ]] || false
}

@test "merge: composite unique index conflict" {
Expand Down
Loading