mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-04-24 11:39:03 -05:00
Code Issues Packages Projects Releases 157 Wiki Activity

flip status code for merge with conflicts in bats tests

Browse Source
This commit is contained in:
Stephanie You
2023-10-09 15:09:58 -07:00
parent 4f6e198558
commit f5e1c03a6c
15 changed files with 300 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files
integration-tests/bats/1pk5col-ints.bats
+11 -5
View File
@@ -406,7 +406,7 @@ teardown() {
dolt commit -m "added conflicting test row"
dolt checkout main
run dolt merge test-branch --no-commit
[ "$status" -eq 0 ]
[ "$status" -eq 1 ]
[[ "$output" =~ "CONFLICT (content)" ]] || false
run dolt conflicts cat test
[ "$status" -eq 0 ]
@@ -450,7 +450,7 @@ teardown() {
dolt commit -m "added conflicting test row"
dolt checkout main
run dolt merge test-branch --no-commit
[ "$status" -eq 0 ]
[ "$status" -eq 1 ]
[[ "$output" =~ "CONFLICT (content)" ]] || false
run dolt conflicts cat test
[ "$status" -eq 0 ]
@@ -492,7 +492,9 @@ teardown() {
dolt add test
dolt commit -m "added conflicting test row"
dolt checkout main
dolt merge test-branch
run dolt merge test-branch
[ "$status" -eq 1 ]
[[ "$output" =~ "CONFLICT (content)" ]] || false
run dolt sql -q "select * from test"
[[ "$output" =~ \|[[:space:]]+5 ]] || false
run dolt conflicts cat test
@@ -520,7 +522,9 @@ teardown() {
dolt add test
dolt commit -m "added conflicting test row"
dolt checkout main
dolt merge test-branch
run dolt merge test-branch
[ "$status" -eq 1 ]
[[ "$output" =~ "CONFLICT (content)" ]] || false
run dolt conflicts resolve --theirs test
[ "$status" -eq 0 ]
[ "$output" = "" ]
@@ -541,7 +545,9 @@ teardown() {
dolt add test
dolt commit -m "added conflicting test row"
dolt checkout main
dolt merge test-branch
run dolt merge test-branch
[ "$status" -eq 1 ]
[[ "$output" =~ "CONFLICT (content)" ]] || false
run dolt sql -q "call dolt_conflicts_resolve('--theirs', 'test')"
[ "$status" -eq 0 ]
run dolt sql -q "select * from test"
integration-tests/bats/checkout.bats
+7 -2
View File
@@ -392,7 +392,9 @@ SQL
# remove special characters (color)
shaparent2=$(echo $shaparent2 | sed -E "s/[[:cntrl:]]\[[0-9]{1,3}m//g")
dolt merge test-branch
run dolt merge test-branch
[ "$status" -eq 1 ]
[[ "$output" =~ "CONFLICT (content):" ]] || false
dolt conflicts resolve --theirs .
dolt commit -m "final merge"
@@ -424,7 +426,10 @@ SQL
# remove special characters (color)
shaparent2=$(echo $shaparent2 | sed -E "s/[[:cntrl:]]\[[0-9]{1,3}m//g")
dolt merge test-branch
run dolt merge test-branch
[ "$status" -eq 1 ]
echo "$output"
[[ "$output" =~ "CONFLICT (content):" ]] || false
dolt conflicts resolve --theirs .
dolt commit -m "final merge"
integration-tests/bats/column_tags.bats
+6 -2
View File
@@ -103,7 +103,9 @@ SQL
dolt commit -m "Added column c2 longtext"
dolt checkout main
dolt merge branch1
dolt merge branch2
run dolt merge branch2
[ "$status" -eq 1 ]
[[ "$output" =~ "CONFLICT (schema):" ]] || false
}
@test "column_tags: Merging branches that use the same tag referring to different column names fails" {
@@ -128,7 +130,9 @@ SQL
dolt commit -m "Added column c0 bigint"
dolt checkout main
dolt merge branch1
dolt merge branch2
run dolt merge branch2
[ "$status" -eq 1 ]
[[ "$output" =~ "CONFLICT (schema):" ]] || false
}
@test "column_tags: Merging branches that both created the same column succeeds" {
integration-tests/bats/conflict-cat.bats
+12 -4
View File
@@ -37,7 +37,9 @@ MODIFY COLUMN age BIGINT;
SQL
dolt commit -am "left"
dolt merge right -m "merge right"
run dolt merge right -m "merge right"
[ "$status" -eq 1 ]
[[ "$output" =~ "CONFLICT (schema):" ]] || false
run dolt conflicts cat .
[ "$status" -eq 0 ]
@@ -78,7 +80,9 @@ UPDATE t set col1 = 0 where pk = 3;
INSERT INTO t VALUES (4, 4);
SQL
dolt commit -am 'left edit'
dolt merge other -m "merge other"
run dolt merge other -m "merge other"
[ "$status" -eq 1 ]
[[ "$output" =~ "CONFLICT (schema):" ]] || false
# trick to disable colors
dolt conflicts cat . > output.txt
@@ -112,7 +116,9 @@ SQL
dolt sql -q "INSERT INTO t values (1, 3);"
dolt commit -am "left"
dolt merge right -m "merge right"
run dolt merge right -m "merge right"
[ "$status" -eq 1 ]
[[ "$output" =~ "CONFLICT (schema):" ]] || false
run dolt conflicts cat .
[[ "$output" =~ "| a" ]] || false
@@ -135,7 +141,9 @@ ALTER TABLE t ADD c INT;
INSERT INTO t VALUES (1, 3, 1);
SQL
dolt commit -am "left"
dolt merge right -m "merge left"
run dolt merge right -m "merge left"
[ "$status" -eq 1 ]
[[ "$output" =~ "CONFLICT (schema):" ]] || false
run dolt conflicts cat .
[[ "$output" =~ "| a" ]] || false
integration-tests/bats/conflict-detection-2.bats
+34 -14
View File
@@ -399,7 +399,7 @@ SQL
dolt checkout -b merge-into-modified modifier
run dolt merge deleter -m "merge"
[ "$status" -eq 0 ]
[ "$status" -eq 1 ]
[[ "$output" =~ "CONFLICT" ]] || false
dolt merge --abort
@@ -407,7 +407,9 @@ SQL
dolt checkout main
dolt branch -d -f merge-into-modified
dolt checkout -b merge-into-modified modifier
dolt merge deleter -m "merge"
run dolt merge deleter -m "merge"
[ "$status" -eq 1 ]
[[ "$output" =~ "CONFLICT (content):" ]] || false
dolt conflicts resolve --theirs foo
run dolt sql -q 'select count(*) from foo'
@@ -420,7 +422,9 @@ SQL
dolt checkout main
dolt branch -d -f merge-into-modified
dolt checkout -b merge-into-modified modifier
dolt merge deleter -m "merge"
run dolt merge deleter -m "merge"
[ "$status" -eq 1 ]
[[ "$output" =~ "CONFLICT (content):" ]] || false
dolt conflicts resolve --ours foo
run dolt sql -q 'select count(*) from foo'
[ "$status" -eq 0 ]
@@ -430,7 +434,7 @@ SQL
dolt checkout -b merge-into-deleter deleter
run dolt merge modifier -m "merge"
[ "$status" -eq 0 ]
[ "$status" -eq 1 ]
[[ "$output" =~ "CONFLICT" ]] || false
dolt merge --abort
@@ -438,7 +442,9 @@ SQL
dolt checkout main
dolt branch -d -f merge-into-deleter
dolt checkout -b merge-into-deleter deleter
dolt merge modifier -m "merge"
run dolt merge modifier -m "merge"
[ "$status" -eq 1 ]
[[ "$output" =~ "CONFLICT (content):" ]] || false
dolt conflicts resolve --ours foo
run dolt sql -q 'select count(*) from foo'
[ "$status" -eq 0 ]
@@ -450,7 +456,9 @@ SQL
dolt checkout main
dolt branch -d -f merge-into-deleter
dolt checkout -b merge-into-deleter deleter
dolt merge modifier -m "merge"
run dolt merge modifier -m "merge"
[ "$status" -eq 1 ]
[[ "$output" =~ "CONFLICT (content):" ]] || false
dolt conflicts resolve --theirs foo
run dolt sql -q 'select count(*) from foo'
[ "$status" -eq 0 ]
@@ -477,7 +485,7 @@ SQL
dolt checkout -b merge-into-modified modifier
run dolt merge deleter -m "merge"
[ "$status" -eq 0 ]
[ "$status" -eq 1 ]
[[ "$output" =~ "CONFLICT" ]] || false
dolt merge --abort
@@ -485,7 +493,9 @@ SQL
dolt checkout main
dolt branch -d -f merge-into-modified
dolt checkout -b merge-into-modified modifier
dolt merge deleter -m "merge"
run dolt merge deleter -m "merge"
[ "$status" -eq 1 ]
[[ "$output" =~ "CONFLICT (content):" ]] || false
dolt sql -q "call dolt_conflicts_resolve('--theirs', 'foo')"
run dolt sql -q 'select count(*) from foo'
@@ -498,7 +508,9 @@ SQL
dolt checkout main
dolt branch -d -f merge-into-modified
dolt checkout -b merge-into-modified modifier
dolt merge deleter -m "merge"
run dolt merge deleter -m "merge"
[ "$status" -eq 1 ]
[[ "$output" =~ "CONFLICT (content):" ]] || false
dolt sql -q "call dolt_conflicts_resolve('--ours', 'foo')"
run dolt sql -q 'select count(*) from foo'
[ "$status" -eq 0 ]
@@ -508,7 +520,7 @@ SQL
dolt checkout -b merge-into-deleter deleter
run dolt merge modifier -m "merge"
[ "$status" -eq 0 ]
[ "$status" -eq 1 ]
[[ "$output" =~ "CONFLICT" ]] || false
dolt merge --abort
@@ -516,7 +528,9 @@ SQL
dolt checkout main
dolt branch -d -f merge-into-deleter
dolt checkout -b merge-into-deleter deleter
dolt merge modifier -m "merge"
run dolt merge modifier -m "merge"
[ "$status" -eq 1 ]
[[ "$output" =~ "CONFLICT (content):" ]] || false
dolt sql -q "call dolt_conflicts_resolve('--ours', 'foo')"
run dolt sql -q 'select count(*) from foo'
[ "$status" -eq 0 ]
@@ -528,7 +542,9 @@ SQL
dolt checkout main
dolt branch -d -f merge-into-deleter
dolt checkout -b merge-into-deleter deleter
dolt merge modifier -m "merge"
run dolt merge modifier -m "merge"
[ "$status" -eq 1 ]
[[ "$output" =~ "CONFLICT (content):" ]] || false
dolt sql -q "call dolt_conflicts_resolve('--theirs', 'foo')"
run dolt sql -q 'select count(*) from foo'
[ "$status" -eq 0 ]
@@ -586,7 +602,9 @@ SQL
dolt add .
dolt commit -m "inserted 0,1"
dolt checkout main
dolt merge branch1 -m "merge"
run dolt merge branch1 -m "merge"
[ "$status" -eq 1 ]
[[ "$output" =~ "CONFLICT (content):" ]] || false
dolt conflicts resolve --ours test
run dolt conflicts cat test
@@ -626,7 +644,9 @@ SQL
dolt add .
dolt commit -m "inserted 0,1"
dolt checkout main
dolt merge branch1 -m "merge"
run dolt merge branch1 -m "merge"
[ "$status" -eq 1 ]
[[ "$output" =~ "CONFLICT (content):" ]] || false
run dolt sql -q "call dolt_conflicts_resolve('--ours', 'test')"
[ $status -eq 0 ]
integration-tests/bats/conflict-detection.bats
+1 -1
View File
@@ -154,7 +154,7 @@ SQL
dolt commit -m "changed pk=0 all cells to 11"
dolt checkout main
run dolt merge change-cell -m "merge"
[ "$status" -eq 0 ]
[ "$status" -eq 1 ]
[[ "$output" =~ "CONFLICT" ]] || false
run dolt status
[[ "$output" =~ "You have unmerged tables." ]] || false
integration-tests/bats/conflicts-resolve.bats
+8 -8
View File
@@ -89,7 +89,7 @@ teardown() {
[[ $output =~ "main" ]] || false
run dolt merge other
[ $status -eq 0 ]
[ $status -eq 1 ]
[[ $output =~ "Automatic merge failed" ]] || false
run dolt conflicts resolve --ours .
@@ -108,7 +108,7 @@ teardown() {
[[ $output =~ "main" ]] || false
run dolt merge other
[ $status -eq 0 ]
[ $status -eq 1 ]
[[ $output =~ "Automatic merge failed" ]] || false
run dolt conflicts resolve --ours t
@@ -127,7 +127,7 @@ teardown() {
[[ $output =~ "main" ]] || false
run dolt merge other
[ $status -eq 0 ]
[ $status -eq 1 ]
[[ $output =~ "Automatic merge failed" ]] || false
run dolt conflicts resolve --theirs .
@@ -146,7 +146,7 @@ teardown() {
[[ $output =~ "main" ]] || false
run dolt merge other
[ $status -eq 0 ]
[ $status -eq 1 ]
[[ $output =~ "Automatic merge failed" ]] || false
run dolt conflicts resolve --theirs t
@@ -165,7 +165,7 @@ teardown() {
[[ $output =~ "other" ]] || false
run dolt merge main
[ $status -eq 0 ]
[ $status -eq 1 ]
[[ $output =~ "Automatic merge failed" ]] || false
run dolt conflicts resolve --ours .
@@ -184,7 +184,7 @@ teardown() {
[[ $output =~ "other" ]] || false
run dolt merge main
[ $status -eq 0 ]
[ $status -eq 1 ]
[[ $output =~ "Automatic merge failed" ]] || false
run dolt conflicts resolve --ours t
@@ -203,7 +203,7 @@ teardown() {
[[ $output =~ "other" ]] || false
run dolt merge main
[ $status -eq 0 ]
[ $status -eq 1 ]
[[ $output =~ "Automatic merge failed" ]] || false
run dolt conflicts resolve --theirs .
@@ -222,7 +222,7 @@ teardown() {
[[ $output =~ "other" ]] || false
run dolt merge main
[ $status -eq 0 ]
[ $status -eq 1 ]
[[ $output =~ "Automatic merge failed" ]] || false
run dolt conflicts resolve --theirs t
integration-tests/bats/constraint-violations.bats
+149 -51
View File
@@ -28,7 +28,7 @@ SQL
dolt checkout main
run dolt merge other
log_status_eq "0"
log_status_eq "1"
[[ "$output" =~ "Fix constraint violations" ]] || false
run dolt sql -q "SELECT * FROM dolt_constraint_violations" -r=csv
log_status_eq "0"
@@ -111,7 +111,9 @@ SQL
dolt add -A
dolt commit -m "OC1"
dolt checkout main
dolt merge other
run dolt merge other
[ "$status" -eq 1 ]
[[ "$output" =~ "CONFLICT (content):" ]] || false
run dolt sql -q "SELECT * FROM dolt_constraint_violations" -r=csv
log_status_eq "0"
@@ -158,7 +160,9 @@ SQL
dolt add -A
dolt commit -m "OC1"
dolt checkout main
dolt merge other
run dolt merge other
[ "$status" -eq 1 ]
[[ "$output" =~ "CONFLICT (content):" ]] || false
run dolt sql -q "SELECT * FROM dolt_constraint_violations" -r=csv
log_status_eq "0"
@@ -212,7 +216,9 @@ SQL
dolt add -A
dolt commit -m "OC1"
dolt checkout main
dolt merge other
run dolt merge other
[ "$status" -eq 1 ]
[[ "$output" =~ "CONFLICT (content):" ]] || false
run dolt sql -q "SELECT * FROM dolt_constraint_violations" -r=csv
log_status_eq "0"
@@ -265,7 +271,9 @@ SQL
dolt add -A
dolt commit -m "OC1"
dolt checkout main
dolt merge other
run dolt merge other
[ "$status" -eq 1 ]
[[ "$output" =~ "CONFLICT (content):" ]] || false
run dolt sql -q "SELECT * FROM dolt_constraint_violations" -r=csv
log_status_eq "0"
@@ -321,7 +329,9 @@ SQL
dolt add -A
dolt commit --force -m "OC1"
dolt checkout main
dolt merge other
run dolt merge other
[ "$status" -eq 1 ]
[[ "$output" =~ "CONFLICT (content):" ]] || false
run dolt sql -q "SELECT * FROM dolt_constraint_violations" -r=csv
log_status_eq "0"
@@ -372,7 +382,9 @@ SQL
dolt add -A
dolt commit --force -m "OC1"
dolt checkout main
dolt merge other
run dolt merge other
[ "$status" -eq 1 ]
[[ "$output" =~ "CONFLICT (content):" ]] || false
run dolt sql -q "SELECT * FROM dolt_constraint_violations" -r=csv
log_status_eq "0"
@@ -421,7 +433,9 @@ SQL
dolt add -A
dolt commit -m "OC1"
dolt checkout main
dolt merge other
run dolt merge other
[ "$status" -eq 1 ]
[[ "$output" =~ "CONFLICT (content):" ]] || false
run dolt sql -q "SELECT * FROM dolt_constraint_violations" -r=csv
log_status_eq "0"
@@ -468,7 +482,9 @@ SQL
dolt add -A
dolt commit -m "OC1"
dolt checkout main
dolt merge other
run dolt merge other
[ "$status" -eq 1 ]
[[ "$output" =~ "CONFLICT (content):" ]] || false
run dolt sql -q "SELECT * FROM dolt_constraint_violations" -r=csv
log_status_eq "0"
@@ -521,7 +537,9 @@ SQL
dolt add -A
dolt commit -m "OC1"
dolt checkout main
dolt merge other
run dolt merge other
[ "$status" -eq 1 ]
[[ "$output" =~ "CONFLICT (content):" ]] || false
run dolt sql -q "SELECT * FROM dolt_constraint_violations" -r=csv
log_status_eq "0"
@@ -574,7 +592,9 @@ SQL
dolt add -A
dolt commit -m "OC1"
dolt checkout main
dolt merge other
run dolt merge other
[ "$status" -eq 1 ]
[[ "$output" =~ "CONFLICT (content):" ]] || false
run dolt sql -q "SELECT * FROM dolt_constraint_violations" -r=csv
log_status_eq "0"
@@ -630,7 +650,9 @@ SQL
dolt add -A
dolt commit --force -m "OC1"
dolt checkout main
dolt merge other
run dolt merge other
[ "$status" -eq 1 ]
[[ "$output" =~ "CONFLICT (content):" ]] || false
run dolt sql -q "SELECT * FROM dolt_constraint_violations" -r=csv
log_status_eq "0"
@@ -681,7 +703,9 @@ SQL
dolt add -A
dolt commit --force -m "OC1"
dolt checkout main
dolt merge other
run dolt merge other
[ "$status" -eq 1 ]
[[ "$output" =~ "CONFLICT (content):" ]] || false
run dolt sql -q "SELECT * FROM dolt_constraint_violations" -r=csv
log_status_eq "0"
@@ -730,7 +754,9 @@ SQL
dolt add -A
dolt commit -m "OC1"
dolt checkout main
dolt merge other
run dolt merge other
[ "$status" -eq 1 ]
[[ "$output" =~ "CONFLICT (content):" ]] || false
run dolt sql -q "SELECT * FROM dolt_constraint_violations" -r=csv
log_status_eq "0"
@@ -777,7 +803,9 @@ SQL
dolt add -A
dolt commit -m "OC1"
dolt checkout main
dolt merge other
run dolt merge other
[ "$status" -eq 1 ]
[[ "$output" =~ "CONFLICT (content):" ]] || false
run dolt sql -q "SELECT * FROM dolt_constraint_violations" -r=csv
log_status_eq "0"
@@ -830,7 +858,9 @@ SQL
dolt add -A
dolt commit -m "OC1"
dolt checkout main
dolt merge other
run dolt merge other
[ "$status" -eq 1 ]
[[ "$output" =~ "CONFLICT (content):" ]] || false
run dolt sql -q "SELECT * FROM dolt_constraint_violations" -r=csv
log_status_eq "0"
@@ -883,7 +913,9 @@ SQL
dolt add -A
dolt commit -m "OC1"
dolt checkout main
dolt merge other
run dolt merge other
[ "$status" -eq 1 ]
[[ "$output" =~ "CONFLICT (content):" ]] || false
run dolt sql -q "SELECT * FROM dolt_constraint_violations" -r=csv
log_status_eq "0"
@@ -939,7 +971,9 @@ SQL
dolt add -A
dolt commit --force -m "OC1"
dolt checkout main
dolt merge other
run dolt merge other
[ "$status" -eq 1 ]
[[ "$output" =~ "CONFLICT (content):" ]] || false
run dolt sql -q "SELECT * FROM dolt_constraint_violations" -r=csv
log_status_eq "0"
@@ -990,7 +1024,9 @@ SQL
dolt add -A
dolt commit --force -m "OC1"
dolt checkout main
dolt merge other
run dolt merge other
[ "$status" -eq 1 ]
[[ "$output" =~ "CONFLICT (content):" ]] || false
run dolt sql -q "SELECT * FROM dolt_constraint_violations" -r=csv
log_status_eq "0"
@@ -1134,7 +1170,9 @@ SQL
dolt add -A
dolt commit -m "OC1"
dolt checkout main
dolt merge other
run dolt merge other
[ "$status" -eq 1 ]
[[ "$output" =~ "CONFLICT (content):" ]] || false
run dolt sql -q "SELECT * FROM dolt_constraint_violations" -r=csv
log_status_eq "0"
@@ -1184,7 +1222,9 @@ SQL
dolt add -A
dolt commit -m "OC1"
dolt checkout main
dolt merge other
run dolt merge other
[ "$status" -eq 1 ]
[[ "$output" =~ "CONFLICT (content):" ]] || false
run dolt sql -q "SELECT * FROM dolt_constraint_violations" -r=csv
log_status_eq "0"
@@ -1238,7 +1278,9 @@ SQL
dolt add -A
dolt commit -m "OC1"
dolt checkout main
dolt merge other
run dolt merge other
[ "$status" -eq 1 ]
[[ "$output" =~ "CONFLICT (content):" ]] || false
run dolt sql -q "SELECT * FROM dolt_constraint_violations" -r=csv
log_status_eq "0"
@@ -1294,7 +1336,9 @@ SQL
dolt add -A
dolt commit -m "OC1"
dolt checkout main
dolt merge other
run dolt merge other
[ "$status" -eq 1 ]
[[ "$output" =~ "CONFLICT (content):" ]] || false
run dolt sql -q "SELECT * FROM dolt_constraint_violations" -r=csv
log_status_eq "0"
@@ -1351,7 +1395,9 @@ SQL
dolt add -A
dolt commit --force -m "OC1"
dolt checkout main
dolt merge other
run dolt merge other
[ "$status" -eq 1 ]
[[ "$output" =~ "CONFLICT (content):" ]] || false
run dolt sql -q "SELECT * FROM dolt_constraint_violations" -r=csv
log_status_eq "0"
@@ -1403,7 +1449,9 @@ SQL
dolt add -A
dolt commit --force -m "OC1"
dolt checkout main
dolt merge other
run dolt merge other
[ "$status" -eq 1 ]
[[ "$output" =~ "CONFLICT (content):" ]] || false
run dolt sql -q "SELECT * FROM dolt_constraint_violations" -r=csv
log_status_eq "0"
@@ -1455,7 +1503,9 @@ SQL
dolt add -A
dolt commit -m "OC1"
dolt checkout main
dolt merge other
run dolt merge other
[ "$status" -eq 1 ]
[[ "$output" =~ "CONFLICT (content):" ]] || false
run dolt sql -q "SELECT * FROM dolt_constraint_violations" -r=csv
log_status_eq "0"
@@ -1505,7 +1555,9 @@ SQL
dolt add -A
dolt commit -m "OC1"
dolt checkout main
dolt merge other
run dolt merge other
[ "$status" -eq 1 ]
[[ "$output" =~ "CONFLICT (content):" ]] || false
run dolt sql -q "SELECT * FROM dolt_constraint_violations" -r=csv
log_status_eq "0"
@@ -1559,7 +1611,9 @@ SQL
dolt add -A
dolt commit -m "OC1"
dolt checkout main
dolt merge other
run dolt merge other
[ "$status" -eq 1 ]
[[ "$output" =~ "CONFLICT (content):" ]] || false
run dolt sql -q "SELECT * FROM dolt_constraint_violations" -r=csv
log_status_eq "0"
@@ -1615,7 +1669,9 @@ SQL
dolt add -A
dolt commit -m "OC1"
dolt checkout main
dolt merge other
run dolt merge other
[ "$status" -eq 1 ]
[[ "$output" =~ "CONFLICT (content):" ]] || false
run dolt sql -q "SELECT * FROM dolt_constraint_violations" -r=csv
log_status_eq "0"
@@ -1672,7 +1728,9 @@ SQL
dolt add -A
dolt commit --force -m "OC1"
dolt checkout main
dolt merge other
run dolt merge other
[ "$status" -eq 1 ]
[[ "$output" =~ "CONFLICT (content):" ]] || false
run dolt sql -q "SELECT * FROM dolt_constraint_violations" -r=csv
log_status_eq "0"
@@ -1724,7 +1782,9 @@ SQL
dolt add -A
dolt commit --force -m "OC1"
dolt checkout main
dolt merge other
run dolt merge other
[ "$status" -eq 1 ]
[[ "$output" =~ "CONFLICT (content):" ]] || false
run dolt sql -q "SELECT * FROM dolt_constraint_violations" -r=csv
log_status_eq "0"
@@ -1776,7 +1836,9 @@ SQL
dolt add -A
dolt commit -m "OC1"
dolt checkout main
dolt merge other
run dolt merge other
[ "$status" -eq 1 ]
[[ "$output" =~ "CONFLICT (content):" ]] || false
run dolt sql -q "SELECT * FROM dolt_constraint_violations" -r=csv
log_status_eq "0"
@@ -1826,7 +1888,9 @@ SQL
dolt add -A
dolt commit -m "OC1"
dolt checkout main
dolt merge other
run dolt merge other
[ "$status" -eq 1 ]
[[ "$output" =~ "CONFLICT (content):" ]] || false
run dolt sql -q "SELECT * FROM dolt_constraint_violations" -r=csv
log_status_eq "0"
@@ -1880,7 +1944,9 @@ SQL
dolt add -A
dolt commit -m "OC1"
dolt checkout main
dolt merge other
run dolt merge other
[ "$status" -eq 1 ]
[[ "$output" =~ "CONFLICT (content):" ]] || false
run dolt sql -q "SELECT * FROM dolt_constraint_violations" -r=csv
log_status_eq "0"
@@ -1936,7 +2002,9 @@ SQL
dolt add -A
dolt commit -m "OC1"
dolt checkout main
dolt merge other
run dolt merge other
[ "$status" -eq 1 ]
[[ "$output" =~ "CONFLICT (content):" ]] || false
run dolt sql -q "SELECT * FROM dolt_constraint_violations" -r=csv
log_status_eq "0"
@@ -1993,7 +2061,9 @@ SQL
dolt add -A
dolt commit --force -m "OC1"
dolt checkout main
dolt merge other
run dolt merge other
[ "$status" -eq 1 ]
[[ "$output" =~ "CONFLICT (content):" ]] || false
run dolt sql -q "SELECT * FROM dolt_constraint_violations" -r=csv
log_status_eq "0"
@@ -2045,7 +2115,9 @@ SQL
dolt add -A
dolt commit --force -m "OC1"
dolt checkout main
dolt merge other
run dolt merge other
[ "$status" -eq 1 ]
[[ "$output" =~ "CONFLICT (content):" ]] || false
run dolt sql -q "SELECT * FROM dolt_constraint_violations" -r=csv
log_status_eq "0"
@@ -2096,7 +2168,9 @@ SQL
dolt add -A
dolt commit -m "OC1"
dolt checkout main
dolt merge other
run dolt merge other
[ "$status" -eq 1 ]
[[ "$output" =~ "CONFLICT (content):" ]] || false
run dolt sql -q "SELECT * FROM dolt_constraint_violations" -r=csv
log_status_eq "0"
@@ -2145,7 +2219,9 @@ SQL
dolt add -A
dolt commit -m "OC1"
dolt checkout main
dolt merge other
run dolt merge other
[ "$status" -eq 1 ]
[[ "$output" =~ "CONFLICT (content):" ]] || false
run dolt sql -q "SELECT * FROM dolt_constraint_violations" -r=csv
log_status_eq "0"
@@ -2194,7 +2270,9 @@ SQL
dolt add -A
dolt commit -m "OC1"
dolt checkout main
dolt merge other
run dolt merge other
[ "$status" -eq 1 ]
[[ "$output" =~ "CONFLICT (content):" ]] || false
run dolt sql -q "SELECT * FROM dolt_constraint_violations" -r=csv
log_status_eq "0"
@@ -2242,7 +2320,9 @@ SQL
dolt add -A
dolt commit -m "OC1"
dolt checkout main
dolt merge other
run dolt merge other
[ "$status" -eq 1 ]
[[ "$output" =~ "CONFLICT (content):" ]] || false
run dolt sql -q "SELECT * FROM dolt_constraint_violations" -r=csv
log_status_eq "0"
@@ -2290,7 +2370,9 @@ SQL
dolt add -A
dolt commit -m "OC1"
dolt checkout main
dolt merge other
run dolt merge other
[ "$status" -eq 1 ]
[[ "$output" =~ "CONFLICT (content):" ]] || false
run dolt sql -q "SELECT * FROM dolt_constraint_violations" -r=csv
log_status_eq "0"
@@ -2338,7 +2420,9 @@ SQL
dolt add -A
dolt commit -m "OC1"
dolt checkout main
dolt merge other
run dolt merge other
[ "$status" -eq 1 ]
[[ "$output" =~ "CONFLICT (content):" ]] || false
run dolt sql -q "SELECT * FROM dolt_constraint_violations" -r=csv
log_status_eq "0"
@@ -2390,7 +2474,9 @@ SQL
dolt add -A
dolt commit --force -m "OC1"
dolt checkout main
dolt merge other
run dolt merge other
[ "$status" -eq 1 ]
[[ "$output" =~ "CONFLICT (content):" ]] || false
run dolt sql -q "SELECT * FROM dolt_constraint_violations" -r=csv
log_status_eq "0"
@@ -2441,7 +2527,9 @@ SQL
dolt add -A
dolt commit -m "OC1"
dolt checkout main
dolt merge other
run dolt merge other
[ "$status" -eq 1 ]
[[ "$output" =~ "CONFLICT (content):" ]] || false
run dolt sql -q "SELECT * FROM dolt_constraint_violations" -r=csv
log_status_eq "0"
@@ -2501,7 +2589,9 @@ SQL
dolt add -A
dolt commit -m "OC1"
dolt checkout main
dolt merge other
run dolt merge other
[ "$status" -eq 1 ]
[[ "$output" =~ "CONFLICT (content):" ]] || false
run dolt sql -q "SELECT * FROM dolt_constraint_violations" -r=csv
log_status_eq "0"
@@ -2561,7 +2651,9 @@ SQL
dolt add -A
dolt commit -m "OC1"
dolt checkout main
dolt merge other
run dolt merge other
[ "$status" -eq 1 ]
[[ "$output" =~ "CONFLICT (content):" ]] || false
run dolt sql -q "SELECT * FROM dolt_constraint_violations" -r=csv
log_status_eq "0"
@@ -2622,7 +2714,9 @@ SQL
dolt add -A
dolt commit -m "OC1"
dolt checkout main
dolt merge other
run dolt merge other
[ "$status" -eq 1 ]
[[ "$output" =~ "CONFLICT (content):" ]] || false
run dolt sql -q "SELECT * FROM dolt_constraint_violations" -r=csv
log_status_eq "0"
@@ -2779,7 +2873,9 @@ SQL
dolt add -A
dolt commit -m "OC1"
dolt checkout main
dolt merge other
run dolt merge other
[ "$status" -eq 1 ]
[[ "$output" =~ "CONFLICT (content):" ]] || false
run dolt sql -q "SELECT * FROM dolt_constraint_violations" -r=csv
log_status_eq "0"
@@ -2816,7 +2912,9 @@ SQL
dolt add -A
dolt commit -m "OC1"
dolt checkout main
dolt merge other
run dolt merge other
[ "$status" -eq 1 ]
[[ "$output" =~ "CONFLICT (content):" ]] || false
run dolt sql -q "SELECT * FROM dolt_constraint_violations" -r=csv
log_status_eq "0"
@@ -2857,7 +2955,7 @@ CALL DOLT_COMMIT('-am', 'add unique key constraint');
CALL DOLT_CHECKOUT('main');
SQL
run dolt merge right
log_status_eq 0
log_status_eq 1
[[ $output =~ "CONSTRAINT VIOLATION (content): Merge created constraint violation in t" ]] || false
[[ $output =~ "Automatic merge failed; 1 table(s) are unmerged." ]] || false
}
integration-tests/bats/foreign-keys.bats
+15 -5
View File
@@ -1121,7 +1121,9 @@ SQL
dolt add -A
dolt commit --force -m "updated parent"
dolt checkout main
dolt merge other -m "merge other"
run dolt merge other -m "merge other"
[ "$status" -eq 1 ]
[[ "$output" =~ "CONSTRAINT VIOLATION (content):" ]] || false
run dolt sql -q "SELECT * FROM dolt_constraint_violations" -r=csv
[ "$status" -eq "0" ]
[[ "$output" =~ "table,num_violations" ]] || false
@@ -1197,7 +1199,9 @@ SQL
dolt add -A
dolt commit --force -m "updated child"
dolt checkout main
dolt merge other -m "merge other"
run dolt merge other -m "merge other"
[ "$status" -eq 1 ]
[[ "$output" =~ "CONSTRAINT VIOLATION (content):" ]] || false
run dolt sql -q "SELECT * FROM dolt_constraint_violations" -r=csv
[ "$status" -eq "0" ]
[[ "$output" =~ "table,num_violations" ]] || false
@@ -1276,7 +1280,9 @@ SQL
dolt add -A
dolt commit --force -m "updated both"
dolt checkout main
dolt merge other -m "merge other"
run dolt merge other -m "merge other"
[ "$status" -eq 1 ]
[[ "$output" =~ "CONSTRAINT VIOLATION (content):" ]] || false
run dolt sql -q "SELECT * FROM dolt_constraint_violations" -r=csv
[ "$status" -eq "0" ]
[[ "$output" =~ "table,num_violations" ]] || false
@@ -1306,7 +1312,9 @@ SQL
dolt add -A
dolt commit -m "added 2s"
dolt checkout main
dolt merge other -m "merge other"
run dolt merge other -m "merge other"
[ "$status" -eq 1 ]
[[ "$output" =~ "CONFLICT (content):" ]] || false
run dolt conflicts resolve --theirs parent
[ "$status" -eq "1" ]
[[ "$output" =~ "violation" ]] || false
@@ -1338,7 +1346,9 @@ SQL
dolt add -A
dolt commit -m "added 2s"
dolt checkout main
dolt merge other -m "merge other"
run dolt merge other -m "merge other"
[ "$status" -eq 1 ]
[[ "$output" =~ "CONFLICT (content):" ]] || false
run dolt sql <<SQL
set @@dolt_allow_commit_conflicts = 1;
call dolt_conflicts_resolve('--theirs', 'parent');
integration-tests/bats/garbage_collection.bats
+15 -5
View File
@@ -195,7 +195,9 @@ setup_merge_with_cv() {
@test "garbage_collection: leave conflicts" {
setup_merge
dolt merge other -m "merge"
run dolt merge other -m "merge"
[ "$status" -eq 1 ]
[[ "$output" =~ "CONFLICT (content):" ]] || false
run dolt sql -r csv -q "select base_pk, base_c0, our_pk, our_c0, their_pk, their_c0 from dolt_conflicts_test;"
[ $status -eq 0 ]
@@ -214,7 +216,9 @@ setup_merge_with_cv() {
@test "garbage_collection: leave constraint violations" {
setup_merge_with_cv
dolt merge other -m "merge"
run dolt merge other -m "merge"
[ "$status" -eq 1 ]
[[ "$output" =~ "CONFLICT (content):" ]] || false
run dolt sql -r csv -q "select pk, fk from dolt_constraint_violations_child;"
[ $status -eq 0 ]
@@ -229,7 +233,9 @@ setup_merge_with_cv() {
@test "garbage_collection: leave merge commit" {
setup_merge
dolt merge other -m "merge"
run dolt merge other -m "merge"
[ "$status" -eq 1 ]
[[ "$output" =~ "CONFLICT (content):" ]] || false
dolt gc
@@ -246,7 +252,9 @@ setup_merge_with_cv() {
@test "garbage_collection: leave merge commit with stored procedure" {
setup_merge
dolt merge other -m "merge"
run dolt merge other -m "merge"
[ "$status" -eq 1 ]
[[ "$output" =~ "CONFLICT (content):" ]] || false
dolt gc
@@ -267,7 +275,9 @@ setup_merge_with_cv() {
# make a dirty working set with table quiz
dolt sql -q "INSERT INTO quiz VALUES (9,99)"
dolt merge other -m "merge"
run dolt merge other -m "merge"
[ "$status" -eq 1 ]
[[ "$output" =~ "CONFLICT (content):" ]] || false
dolt gc
run dolt merge --abort
[ "$status" -eq 0 ]
integration-tests/bats/index.bats
+21 -7
View File
@@ -2196,7 +2196,9 @@ SQL
dolt add -A
dolt commit -m "other changes"
dolt checkout main
dolt merge other -m "merge"
run dolt merge other -m "merge"
[ "$status" -eq 1 ]
[[ "$output" =~ "CONFLICT (content):" ]] || false
run dolt index cat onepk idx_v1 -r=csv
[ "$status" -eq "0" ]
[[ "$output" =~ "v1,pk1" ]] || false
@@ -2232,7 +2234,9 @@ SQL
dolt add -A
dolt commit -m "other changes"
dolt checkout main
dolt merge other -m "merge"
run dolt merge other -m "merge"
[ "$status" -eq 1 ]
[[ "$output" =~ "CONFLICT (content):" ]] || false
dolt conflicts resolve --ours onepk
run dolt index cat onepk idx_v1 -r=csv
[ "$status" -eq "0" ]
@@ -2259,7 +2263,9 @@ SQL
dolt add -A
dolt commit -m "other changes"
dolt checkout main
dolt merge other -m "merge"
run dolt merge other -m "merge"
[ "$status" -eq 1 ]
[[ "$output" =~ "CONFLICT (content):" ]] || false
dolt sql -q "call dolt_conflicts_resolve('--ours', 'onepk')"
run dolt index cat onepk idx_v1 -r=csv
[ "$status" -eq "0" ]
@@ -2287,7 +2293,9 @@ SQL
dolt add -A
dolt commit -m "other changes"
dolt checkout main
dolt merge other -m "merge"
run dolt merge other -m "merge"
[ "$status" -eq 1 ]
[[ "$output" =~ "CONFLICT (content):" ]] || false
dolt conflicts resolve --theirs onepk
run dolt index cat onepk idx_v1 -r=csv
[ "$status" -eq "0" ]
@@ -2314,7 +2322,9 @@ SQL
dolt add -A
dolt commit -m "other changes"
dolt checkout main
dolt merge other -m "merge"
run dolt merge other -m "merge"
[ "$status" -eq 1 ]
[[ "$output" =~ "CONFLICT (content):" ]] || false
dolt sql -q "call dolt_conflicts_resolve('--theirs', 'onepk')"
run dolt index cat onepk idx_v1 -r=csv
[ "$status" -eq "0" ]
@@ -2342,7 +2352,9 @@ SQL
dolt add -A
dolt commit -m "other changes"
dolt checkout main
dolt merge other -m "merge"
run dolt merge other -m "merge"
[ "$status" -eq 1 ]
[[ "$output" =~ "CONFLICT (content):" ]] || false
run dolt sql <<SQL
SET dolt_allow_commit_conflicts = on;
DELETE from dolt_conflicts_onepk where our_pk1 = 4;
@@ -2379,7 +2391,9 @@ SQL
dolt checkout main
dolt merge other -m "merge"
run dolt merge other -m "merge"
[ "$status" -eq 1 ]
[[ "$output" =~ "CONSTRAINT VIOLATION (content):" ]] || false
run dolt sql -q "SELECT * FROM dolt_constraint_violations" -r=csv
[ "$status" -eq "0" ]
[[ "$output" =~ "table,num_violations" ]] || false
integration-tests/bats/json-new-fmt.bats
+2 -2
View File
@@ -163,7 +163,7 @@ SQL
dolt commit -am "made changes on branch another"
run dolt merge other -m "merge"
[ "$status" -eq 0 ]
[ "$status" -eq 1 ]
[[ "$output" =~ "CONFLICT" ]] || false
run dolt conflicts resolve --ours js
[ "$status" -eq 0 ]
@@ -213,7 +213,7 @@ SQL
dolt commit -am "made changes on branch another"
run dolt merge other -m "merge"
[ "$status" -eq 0 ]
[ "$status" -eq 1 ]
[[ "$output" =~ "CONFLICT" ]] || false
run dolt sql -q "call dolt_conflicts_resolve('--ours', 'js')"
[ "$status" -eq 0 ]
integration-tests/bats/json.bats
+2 -2
View File
@@ -159,7 +159,7 @@ SQL
dolt commit -am "made changes on branch another"
run dolt merge other -m "merge"
[ "$status" -eq 0 ]
[ "$status" -eq 1 ]
[[ "$output" =~ "CONFLICT" ]] || false
run dolt conflicts resolve --ours js
[ "$status" -eq 0 ]
@@ -209,7 +209,7 @@ SQL
dolt commit -am "made changes on branch another"
run dolt merge other -m "merge"
[ "$status" -eq 0 ]
[ "$status" -eq 1 ]
[[ "$output" =~ "CONFLICT" ]] || false
run dolt sql -q "call dolt_conflicts_resolve('--ours', 'js')"
[ "$status" -eq 0 ]
integration-tests/bats/keyless.bats
+13 -13
View File
@@ -305,7 +305,7 @@ SQL
dolt commit -am "inserted on other"
run dolt merge main
[ $status -eq 0 ]
[ $status -eq 1 ]
run dolt sql -q "SELECT * FROM keyless WHERE c0 > 6 ORDER BY c0;" -r csv
[ $status -eq 0 ]
[[ "${lines[1]}" = "7,7" ]] || false
@@ -414,7 +414,7 @@ SQL
dolt commit -am "deleted four rows on left"
run dolt merge right -m "merge"
[ $status -eq 0 ]
[ $status -eq 1 ]
[[ "$output" =~ "CONFLICT" ]] || false
run dolt conflicts resolve --ours dupe
@@ -439,7 +439,7 @@ SQL
dolt commit -am "deleted four rows on left"
run dolt merge right -m "merge"
[ $status -eq 0 ]
[ $status -eq 1 ]
[[ "$output" =~ "CONFLICT" ]] || false
run dolt sql -q "call dolt_conflicts_resolve('--ours', 'dupe')"
@@ -487,7 +487,7 @@ SQL
dolt commit -am "updated four rows on left"
run dolt merge right -m "merge"
[ $status -eq 0 ]
[ $status -eq 1 ]
[[ "$output" =~ "CONFLICT" ]] || false
run dolt conflicts resolve --theirs dupe
@@ -512,7 +512,7 @@ SQL
dolt commit -am "updated four rows on left"
run dolt merge right -m "merge"
[ $status -eq 0 ]
[ $status -eq 1 ]
[[ "$output" =~ "CONFLICT" ]] || false
run dolt sql -q "call dolt_conflicts_resolve('--theirs', 'dupe')"
@@ -676,7 +676,7 @@ CSV
dolt commit -am "updated on other"
run dolt merge main -m "merge"
[ $status -eq 0 ]
[ $status -eq 1 ]
[[ "$output" =~ "CONFLICT" ]] || false
run dolt conflicts resolve --ours keyless
@@ -723,7 +723,7 @@ CSV
dolt commit -am "inserted on other"
run dolt merge main -m "merge"
[ $status -eq 0 ]
[ $status -eq 1 ]
run dolt sql -q "SELECT count(*) FROM keyless WHERE c0 > 6;" -r csv
[ $status -eq 0 ]
[[ "${lines[1]}" = "3" ]] || false
@@ -770,7 +770,7 @@ SQL
dolt commit -am "inserted on other"
run dolt merge main -m "merge"
[ $status -eq 0 ]
[ $status -eq 1 ]
[[ "$output" =~ "CONFLICT" ]] || false
run dolt conflicts resolve --theirs keyless
@@ -798,7 +798,7 @@ SQL
dolt commit -am "inserted on other"
run dolt merge main -m "merge"
[ $status -eq 0 ]
[ $status -eq 1 ]
[[ "$output" =~ "CONFLICT" ]] || false
run dolt sql -q "call dolt_conflicts_resolve('--theirs', 'keyless')"
@@ -838,7 +838,7 @@ SQL
dolt commit -am "inserted on other"
run dolt merge main -m "merge"
[ $status -eq 0 ]
[ $status -eq 1 ]
[[ "$output" =~ "CONFLICT" ]] || false
run dolt conflicts resolve --ours keyless
@@ -863,7 +863,7 @@ SQL
dolt commit -am "inserted on other"
run dolt merge main -m "merge"
[ $status -eq 0 ]
[ $status -eq 1 ]
[[ "$output" =~ "CONFLICT" ]] || false
run dolt sql -q "call dolt_conflicts_resolve('--ours', 'keyless')"
@@ -921,7 +921,7 @@ SQL
dolt commit -am "inserted twos on left"
run dolt merge right -m "merge"
[ $status -eq 0 ]
[ $status -eq 1 ]
[[ "$output" =~ "CONFLICT" ]] || false
run dolt conflicts resolve --theirs keyless
@@ -947,7 +947,7 @@ SQL
dolt commit -am "inserted twos on left"
run dolt merge right -m "merge"
[ $status -eq 0 ]
[ $status -eq 1 ]
[[ "$output" =~ "CONFLICT" ]] || false
run dolt sql -q "call dolt_conflicts_resolve('--theirs', 'keyless')"
integration-tests/compatibility/test_files/bats/compatibility.bats
+4 -11
View File
@@ -193,16 +193,10 @@ EOF
}
@test "dolt merge other into $DEFAULT_BRANCH" {
run dolt version
if [[ $output =~ "__DOLT__" ]]; then
run dolt merge other
[ $status -eq 0 ]
[[ $output =~ "Merge conflict in abc" ]] || false
[[ $output =~ "Automatic merge failed" ]] || false
else
# throws a conflict
dolt merge other
fi
run dolt merge other
[ $status -eq 1 ]
[[ $output =~ "Merge conflict in abc" ]] || false
[[ $output =~ "Automatic merge failed" ]] || false
}
@test "dolt table import" {
@@ -212,4 +206,3 @@ EOF
dolt sql -q 'drop table abc2'
}