mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-03-03 10:08:59 -06:00
Code Issues Packages Projects Releases 141 Wiki Activity

fix tests again

Browse Source
This commit is contained in:
James Cor
2022-09-28 14:11:45 -07:00
parent 149720fcaa
commit 786e892f1c
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
integration-tests/bats/foreign-keys.bats
View File

@@ -1314,11 +1314,16 @@ SQL
dolt commit -m "added 2s"
dolt checkout main
dolt merge other -m "merge other"
dolt sql -q "set @@dolt_allow_commit_conflicts = 1"
run dolt sql -q "call dolt_conflicts_resolve('--theirs', 'parent')"
run dolt sql <<SQL
set @@dolt_allow_commit_conflicts = 1;
call dolt_conflicts_resolve('--theirs', 'parent');
SQL
[ "$status" -eq 1 ]
[[ "$output" =~ "violation" ]] || false
run dolt sql -q "call dolt_conflicts_resolve('--theirs', 'child')"
run dolt sql <<SQL
set @@dolt_allow_commit_conflicts = 1;
call dolt_conflicts_resolve('--theirs', 'child');
SQL
[ "$status" -eq 1 ]
[[ "$output" =~ "violation" ]] || false
}