mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-02-11 18:49:14 -06:00
Code Issues Packages Projects Releases 128 Wiki Activity

Merge pull request #9393 from dolthub/elianddb/fix-483-unable-to-checkout-table-branch

Browse Source 
Fixes #483
Removed extra bats test
This commit is contained in:
Elian
2025-06-25 10:14:50 -07:00
committed by GitHub
parent af8a3f728a 05843c704c
commit e43ad09636
1 changed files with 25 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
integration-tests/bats/1pk5col-ints.bats
View File

@@ -729,42 +729,29 @@ DELIM
}
@test "1pk5col-ints: display correct merge stats" {
dolt checkout -b test-branch
dolt add test
dolt commit -m "added test table"
dolt checkout main
dolt branch test-branch-m
dolt branch test-branch-alt
dolt checkout test-branch-m
dolt merge test-branch --no-commit
dolt checkout test-branch-alt
dolt sql -q "CREATE TABLE test_alt (pk BIGINT NOT NULL, c1 BIGINT, PRIMARY KEY (pk));"
dolt add test_alt
dolt commit -m 'add test_alt'
dolt checkout test-branch-m
dolt merge test-branch-alt --no-commit
dolt add test_alt
dolt commit -m 'merge test_alt'
dolt checkout test-branch
dolt sql -q "insert into test values (0, 1, 2, 3, 4, 5)"
dolt add test
dolt commit -m "added row to test"
dolt checkout test-branch-m
run dolt merge test-branch -m "merge"
[ "$status" -eq 0 ]
[ "${lines[6]}" = "test | 1 +" ]
[ "${lines[7]}" = "1 tables changed, 1 rows added(+), 0 rows modified(*), 0 rows deleted(-)" ]
}
@test "1pk5col-ints: checkout table with branch of same name" {
dolt checkout -b test
dolt add .
dolt commit -m "added test table"
dolt sql -q "insert into test values (0, 1, 2, 3, 4, 5)"
run dolt checkout test
skip "Should distinguish between branch name and table name" [ "$status" -eq 0 ]
[ "${lines[0]}" != "Already on branch 'test'" ]
run dolt status
[ "$status" -eq 0 ]
[ "${lines[4]}" != " modified: test" ]
dolt checkout -b test-branch
dolt add test
dolt commit -m "added test table"
dolt checkout main
dolt branch test-branch-m
dolt branch test-branch-alt
dolt checkout test-branch-m
dolt merge test-branch --no-commit
dolt checkout test-branch-alt
dolt sql -q "CREATE TABLE test_alt (pk BIGINT NOT NULL, c1 BIGINT, PRIMARY KEY (pk));"
dolt add test_alt
dolt commit -m 'add test_alt'
dolt checkout test-branch-m
dolt merge test-branch-alt --no-commit
dolt add test_alt
dolt commit -m 'merge test_alt'
dolt checkout test-branch
dolt sql -q "insert into test values (0, 1, 2, 3, 4, 5)"
dolt add test
dolt commit -m "added row to test"
dolt checkout test-branch-m
run dolt merge test-branch -m "merge"
[ "$status" -eq 0 ]
[ "${lines[6]}" = "test | 1 +" ]
[ "${lines[7]}" = "1 tables changed, 1 rows added(+), 0 rows modified(*), 0 rows deleted(-)" ]
}