mirror of
https://github.com/dolthub/dolt.git
synced 2026-02-11 18:49:14 -06:00
614 lines
20 KiB
Bash
614 lines
20 KiB
Bash
#!/usr/bin/env bats
|
||
load $BATS_TEST_DIRNAME/helper/common.bash
|
||
|
||
setup() {
|
||
setup_common
|
||
|
||
dolt sql <<SQL
|
||
CREATE TABLE test(pk BIGINT PRIMARY KEY, v varchar(10), index(v));
|
||
INSERT INTO dolt_ignore VALUES ('generated_*', 1);
|
||
SQL
|
||
dolt add .
|
||
dolt commit -am "Created table"
|
||
dolt checkout -b branch1
|
||
dolt sql -q "INSERT INTO test VALUES (1, 'a')"
|
||
dolt commit -am "Inserted 1"
|
||
dolt sql -q "INSERT INTO test VALUES (2, 'b')"
|
||
dolt commit -am "Inserted 2"
|
||
dolt sql -q "INSERT INTO test VALUES (3, 'c')"
|
||
dolt commit -am "Inserted 3"
|
||
dolt sql -q "CREATE TABLE generated_foo (pk int PRIMARY KEY);"
|
||
|
||
run dolt sql -q "SELECT * FROM test" -r csv
|
||
[[ "$output" =~ "1,a" ]] || false
|
||
[[ "$output" =~ "2,b" ]] || false
|
||
[[ "$output" =~ "3,c" ]] || false
|
||
}
|
||
|
||
teardown() {
|
||
assert_feature_version
|
||
teardown_common
|
||
}
|
||
|
||
@test "cherry-pick: simple cherry pick with the latest commit" {
|
||
dolt checkout main
|
||
|
||
run dolt cherry-pick branch1
|
||
[ "$status" -eq "0" ]
|
||
|
||
run dolt sql -q "SELECT * FROM test" -r csv
|
||
[[ ! "$output" =~ "1,a" ]] || false
|
||
[[ ! "$output" =~ "2,b" ]] || false
|
||
[[ "$output" =~ "3,c" ]] || false
|
||
}
|
||
|
||
@test "cherry-pick: multiple simple cherry-picks" {
|
||
dolt sql -q "UPDATE test SET v = 'x' WHERE pk = 2"
|
||
dolt sql -q "INSERT INTO test VALUES (5, 'g'), (8, 'u');"
|
||
dolt commit -am "Updated 2b to 2x and inserted more rows"
|
||
|
||
dolt checkout main
|
||
run dolt cherry-pick branch1~2
|
||
[ "$status" -eq "0" ]
|
||
|
||
run dolt sql -q "SELECT * FROM test" -r csv
|
||
[[ "$output" =~ "2,b" ]] || false
|
||
[[ ! "$output" =~ "1,a" ]] || false
|
||
[[ ! "$output" =~ "2,x" ]] || false
|
||
[[ ! "$output" =~ "3,c" ]] || false
|
||
|
||
run dolt cherry-pick branch1
|
||
[ "$status" -eq "0" ]
|
||
|
||
run dolt sql -q "SELECT * FROM test" -r csv
|
||
[[ ! "$output" =~ "1,a" ]] || false
|
||
[[ "$output" =~ "2,x" ]] || false
|
||
[[ ! "$output" =~ "3,c" ]] || false
|
||
[[ "$output" =~ "5,g" ]] || false
|
||
[[ "$output" =~ "8,u" ]] || false
|
||
}
|
||
|
||
@test "cherry-pick: too far back" {
|
||
dolt checkout main
|
||
run dolt cherry-pick branch1~10
|
||
[ "$status" -eq "1" ]
|
||
[[ "$output" =~ "ancestor" ]] || false
|
||
}
|
||
|
||
@test "cherry-pick: no changes" {
|
||
dolt commit --allow-empty -am "empty commit"
|
||
dolt checkout main
|
||
run dolt cherry-pick branch1
|
||
[ "$status" -eq "0" ]
|
||
[[ "$output" =~ "No changes were made" ]] || false
|
||
}
|
||
|
||
@test "cherry-pick: invalid hash" {
|
||
run dolt cherry-pick aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
|
||
[ "$status" -eq "1" ]
|
||
[[ "$output" =~ "target commit not found" ]] || false
|
||
}
|
||
|
||
@test "cherry-pick: has changes in the working set" {
|
||
dolt checkout main
|
||
dolt sql -q "INSERT INTO test VALUES (4, 'f')"
|
||
run dolt cherry-pick branch1~2
|
||
[ "$status" -eq "1" ]
|
||
[[ "$output" =~ "your local changes would be overwritten by cherry-pick" ]] || false
|
||
}
|
||
|
||
@test "cherry-pick: staged changes" {
|
||
dolt checkout main
|
||
dolt sql -q "INSERT INTO test VALUES (4, 'f')"
|
||
dolt add -A
|
||
run dolt cherry-pick branch1~2
|
||
[ "$status" -eq "1" ]
|
||
[[ "$output" =~ "Please commit your staged changes before using cherry-pick." ]] || false
|
||
}
|
||
|
||
@test "cherry-pick: insert, update, delete rows and schema changes on non existent table in working set" {
|
||
dolt sql -q "CREATE TABLE branch1table (id int primary key, col1 int)"
|
||
dolt add .
|
||
dolt sql -q "INSERT INTO branch1table VALUES (9,8),(7,6),(5,4)"
|
||
dolt commit -am "create table with rows"
|
||
|
||
dolt sql -q "INSERT INTO branch1table VALUES (1,2)"
|
||
dolt commit -am "Insert a row"
|
||
|
||
dolt checkout main
|
||
run dolt cherry-pick branch1
|
||
[ "$status" -eq "1" ]
|
||
[[ "$output" =~ "conflict: table with same name deleted and modified" ]] || false
|
||
|
||
run dolt sql -q "SHOW TABLES" -r csv
|
||
[[ ! "$output" =~ "branch1table" ]] || false
|
||
|
||
dolt checkout branch1
|
||
dolt sql -q "UPDATE branch1table SET col1 = 0 WHERE id > 6"
|
||
dolt commit -am "Update a rows"
|
||
|
||
dolt checkout main
|
||
run dolt cherry-pick branch1
|
||
[ "$status" -eq "1" ]
|
||
[[ "$output" =~ "conflict: table with same name deleted and modified" ]] || false
|
||
|
||
run dolt sql -q "SHOW TABLES" -r csv
|
||
[[ ! "$output" =~ "branch1table" ]] || false
|
||
|
||
dolt checkout branch1
|
||
dolt sql -q "DELETE FROM branch1table WHERE id > 8"
|
||
dolt commit -am "Update and delete rows"
|
||
|
||
dolt checkout main
|
||
run dolt cherry-pick branch1
|
||
[ "$status" -eq "1" ]
|
||
[[ "$output" =~ "conflict: table with same name deleted and modified" ]] || false
|
||
|
||
run dolt sql -q "SHOW TABLES" -r csv
|
||
[[ ! "$output" =~ "branch1table" ]] || false
|
||
|
||
dolt checkout branch1
|
||
dolt sql -q "ALTER TABLE branch1table ADD COLUMN col2 int"
|
||
dolt commit -am "Alter table add column"
|
||
|
||
dolt checkout main
|
||
run dolt cherry-pick branch1
|
||
[ "$status" -eq "1" ]
|
||
[[ "$output" =~ "merge aborted: schema conflict found for table branch1table" ]] || false
|
||
[[ "$output" =~ "table was modified in one branch and deleted in the other" ]] || false
|
||
|
||
run dolt sql -q "SHOW TABLES" -r csv
|
||
[[ ! "$output" =~ "branch1table" ]] || false
|
||
}
|
||
|
||
@test "cherry-pick: error when using --abort with no in-progress cherry-pick" {
|
||
run dolt cherry-pick --abort
|
||
[ $status -eq 1 ]
|
||
[[ $output =~ "error: There is no cherry-pick merge to abort" ]] || false
|
||
[[ ! $output =~ "usage: dolt cherry-pick" ]] || false
|
||
}
|
||
|
||
@test "cherry-pick: schema change, with data conflict" {
|
||
dolt checkout main
|
||
dolt sql -q "CREATE TABLE other (pk int primary key, c1 int, c2 int)"
|
||
dolt sql -q "INSERT INTO other VALUES (1, 2, 3)"
|
||
dolt commit -Am "add other table (on main)"
|
||
|
||
# Create two commits on branch2: one to assert does NOT get included, and one to cherry pick
|
||
dolt checkout -b branch2
|
||
dolt sql -q "INSERT INTO other VALUES (100, 200, 300);"
|
||
dolt commit -am "add row 100 to other (on branch2)"
|
||
|
||
# This ALTER TABLE statement modifies other rows that aren't included in the cherry-picked
|
||
# commit – row (100, 200, 300) is modified to (100, 400). This shows up as a conflict
|
||
# in the cherry-pick (modified row on one side, row doesn't exist on the other side).
|
||
dolt sql -q "ALTER TABLE other DROP COLUMN c1;"
|
||
dolt sql -q "UPDATE other SET c2 = 400 WHERE pk = 100"
|
||
dolt sql -q "INSERT INTO other VALUES (10, 30);"
|
||
dolt sql -q "INSERT INTO test VALUES (100, 'q');"
|
||
dolt commit -am "alter table, add row 10 to other, add row 100 to test (on branch2)"
|
||
|
||
dolt checkout main
|
||
run dolt cherry-pick branch2
|
||
[ $status -eq 1 ]
|
||
[[ $output =~ "Unable to apply commit cleanly due to conflicts or constraint violations" ]] || false
|
||
|
||
# Assert that table 'test' is staged, but table 'other' is not staged, since it had conflicts
|
||
run dolt sql -q "SELECT * from dolt_status;"
|
||
[ $status -eq 0 ]
|
||
[[ $output =~ "| test | true | modified |" ]] || false
|
||
[[ $output =~ "| other | false | modified |" ]] || false
|
||
[[ $output =~ "| other | false | conflict |" ]] || false
|
||
[[ $output =~ "| generated_foo | false | new table |" ]] || false
|
||
|
||
# Make sure the data conflict shows up correctly
|
||
run dolt conflicts cat .
|
||
[ $status -eq 0 ]
|
||
[[ $output =~ "| - | ours | 100 | 200 | 300 |" ]] || false
|
||
[[ $output =~ "| * | theirs | 100 | NULL | 400 |" ]] || false
|
||
|
||
# Asert the data we expect is in the table
|
||
run dolt sql -r csv -q "SELECT * from other;"
|
||
[ $status -eq 0 ]
|
||
[[ $output =~ "1,3" ]] || false
|
||
[[ $output =~ "10,30" ]] || false
|
||
[[ ! $output =~ "100,300" ]] || false
|
||
|
||
# Resolve the conflict and commit
|
||
dolt conflicts resolve --ours other
|
||
run dolt sql -r csv -q "SELECT count(*) from dolt_conflicts;"
|
||
[ $status -eq 0 ]
|
||
[[ $output =~ "0" ]] || false
|
||
dolt commit -m "cherry-picked HEAD commit from branch2"
|
||
}
|
||
|
||
@test "cherry-pick: foreign key violation" {
|
||
dolt checkout branch1
|
||
dolt sql -q "CREATE TABLE other (pk int primary key, v varchar(10), FOREIGN KEY (v) REFERENCES test(v))"
|
||
dolt sql -q "INSERT INTO other VALUES (1, 'a')"
|
||
dolt commit -Am "add other table (on branch1)"
|
||
|
||
dolt checkout -b branch2
|
||
dolt sql -q "SET @@foreign_key_checks=0; UPDATE other SET v = 'z' where pk = 1;"
|
||
dolt sql -q "INSERT INTO test VALUES (100, 'q');"
|
||
dolt commit -Am "update row 1 in other and insert row 100 into test (on branch2)"
|
||
|
||
dolt checkout branch1
|
||
dolt sql -q "SET @@foreign_key_checks=1;"
|
||
run dolt cherry-pick branch2
|
||
[ $status -eq 1 ]
|
||
[[ $output =~ "Unable to apply commit cleanly due to conflicts or constraint violations" ]] || false
|
||
|
||
# Assert that only 'test' is staged for commit ('other' has a constraint violation)
|
||
run dolt sql -q "SELECT * from dolt_status;"
|
||
[ $status -eq 0 ]
|
||
[[ $output =~ "| other | false | modified " ]] || false
|
||
[[ $output =~ "| test | true | modified " ]] || false
|
||
[[ $output =~ "| generated_foo | false | new table " ]] || false
|
||
|
||
# Assert the expected constraint violations
|
||
run dolt sql -q "SELECT * FROM dolt_constraint_violations;"
|
||
[ $status -eq 0 ]
|
||
[[ $output =~ "| other | 1 " ]] || false
|
||
run dolt sql -q "SELECT * FROM dolt_constraint_violations_other;"
|
||
[ $status -eq 0 ]
|
||
[[ $output =~ "foreign key | 1 | z " ]] || false
|
||
|
||
# Abort the cherry-pick and assert that all state has been properly cleared
|
||
dolt cherry-pick --abort
|
||
run dolt sql -q "SELECT * from dolt_status;"
|
||
[ $status -eq 0 ]
|
||
[[ ! $output =~ "other" ]] || false
|
||
[[ ! $output =~ "test" ]] || false
|
||
run dolt sql -q "SELECT * FROM dolt_constraint_violations;"
|
||
[ $status -eq 0 ]
|
||
[[ ! $output =~ "other" ]] || false
|
||
run dolt sql -r csv -q "SELECT * from other;"
|
||
[ $status -eq 0 ]
|
||
[[ $output =~ "1,a" ]] || false
|
||
[[ ! $output =~ "100,q" ]] || false
|
||
}
|
||
|
||
@test "cherry-pick: conflict resolution" {
|
||
dolt sql -q "CREATE TABLE other (pk int primary key, v int)"
|
||
dolt add .
|
||
dolt sql -q "INSERT INTO other VALUES (1, 2)"
|
||
dolt sql -q "INSERT INTO test VALUES (4,'f')"
|
||
dolt commit -am "add other table"
|
||
|
||
dolt checkout main
|
||
dolt sql -q "CREATE TABLE other (pk int primary key, v int)"
|
||
dolt add .
|
||
dolt sql -q "INSERT INTO other VALUES (1, 3)"
|
||
dolt sql -q "INSERT INTO test VALUES (4,'k')"
|
||
dolt commit -am "add other table with conflict and test with conflict"
|
||
|
||
run dolt cherry-pick branch1
|
||
[ $status -eq 1 ]
|
||
[[ $output =~ "Unable to apply commit cleanly due to conflicts or constraint violations" ]] || false
|
||
|
||
run dolt conflicts cat .
|
||
[ $status -eq 0 ]
|
||
[[ $output =~ "| + | ours | 1 | 3 |" ]] || false
|
||
[[ $output =~ "| + | theirs | 1 | 2 |" ]] || false
|
||
[[ $output =~ "| + | ours | 4 | k |" ]] || false
|
||
[[ $output =~ "| + | theirs | 4 | f |" ]] || false
|
||
|
||
dolt cherry-pick --abort
|
||
|
||
run dolt status
|
||
[ $status -eq 0 ]
|
||
[[ ! $output =~ "Unmerged paths" ]] || false
|
||
|
||
run dolt cherry-pick branch1
|
||
[ $status -eq 1 ]
|
||
[[ $output =~ "Unable to apply commit cleanly due to conflicts or constraint violations" ]] || false
|
||
|
||
run dolt status
|
||
[ $status -eq 0 ]
|
||
[[ ! $output =~ "Changes to be committed" ]] || false
|
||
[[ $output =~ "Unmerged paths" ]] || false
|
||
[[ $output =~ "both modified: other" ]] || false
|
||
[[ $output =~ "both modified: test" ]] || false
|
||
|
||
dolt conflicts resolve --theirs .
|
||
|
||
run dolt sql -q "select * from other"
|
||
[ $status -eq 0 ]
|
||
[[ $output =~ "1 | 2" ]] || false
|
||
|
||
run dolt sql -q "select * from test"
|
||
[ $status -eq 0 ]
|
||
[[ $output =~ "4 | f" ]] || false
|
||
|
||
dolt commit -m "committing cherry-picked change"
|
||
}
|
||
|
||
@test "cherry-pick: commit with CREATE TABLE" {
|
||
dolt sql -q "CREATE TABLE table_a (pk BIGINT PRIMARY KEY, v varchar(10))"
|
||
dolt add .
|
||
dolt sql -q "INSERT INTO table_a VALUES (11, 'aa'), (22, 'ab'), (33, 'ac')"
|
||
dolt sql -q "DELETE FROM test WHERE pk = 2"
|
||
dolt commit -am "Added table_a with rows and delete pk=2 from test"
|
||
|
||
dolt checkout main
|
||
run dolt cherry-pick branch1
|
||
[ "$status" -eq "0" ]
|
||
|
||
run dolt sql -q "SHOW TABLES" -r csv
|
||
[[ "$output" =~ "table_a" ]] || false
|
||
|
||
run dolt sql -q "SELECT * FROM test" -r csv
|
||
[[ ! "$output" =~ "1,a" ]] || false
|
||
[[ ! "$output" =~ "2,b" ]] || false
|
||
[[ ! "$output" =~ "3,c" ]] || false
|
||
|
||
run dolt sql -q "SELECT * FROM table_a" -r csv
|
||
[[ "$output" =~ "11,aa" ]] || false
|
||
[[ "$output" =~ "22,ab" ]] || false
|
||
[[ "$output" =~ "33,ac" ]] || false
|
||
}
|
||
|
||
@test "cherry-pick: commit with DROP TABLE" {
|
||
skip # drop or rename case
|
||
dolt sql -q "DROP TABLE test"
|
||
dolt commit -am "Drop table test"
|
||
|
||
run dolt sql -q "SHOW TABLES" -r csv
|
||
[[ ! "$output" =~ "test" ]] || false
|
||
|
||
dolt checkout main
|
||
run dolt sql -q "SHOW TABLES" -r csv
|
||
[[ "$output" =~ "test" ]] || false
|
||
|
||
run dolt cherry-pick branch1
|
||
[ "$status" -eq "1" ]
|
||
[[ "$output" =~ "table was renamed or dropped" ]] || false
|
||
|
||
run dolt sql -q "SHOW TABLES" -r csv
|
||
[[ "$output" =~ "test" ]] || false
|
||
}
|
||
|
||
@test "cherry-pick: commit with ALTER TABLE rename table name" {
|
||
skip "flake in CI"
|
||
|
||
# get main and branch1 in sync, so that the data on branch1 doesn't
|
||
# cause a conflict when we cherry pick the table rename statement
|
||
dolt checkout main
|
||
dolt merge branch1
|
||
|
||
dolt checkout branch1
|
||
dolt sql -q "ALTER TABLE test RENAME TO new_name"
|
||
dolt commit -Am "rename table test to new_name"
|
||
|
||
dolt checkout main
|
||
dolt cherry-pick branch1
|
||
|
||
run dolt sql -q "show tables;"
|
||
[ $status -eq 0 ]
|
||
[[ ! $output =~ "test" ]] || false
|
||
[[ $output =~ "new_name" ]] || false
|
||
}
|
||
|
||
@test "cherry-pick: cherry-pick commit is a merge commit" {
|
||
dolt checkout -b branch2
|
||
dolt sql -q "INSERT INTO test VALUES (4, 'd'), (5, 'e')"
|
||
dolt commit -am "add more rows in branch2"
|
||
|
||
dolt checkout branch1
|
||
dolt sql -q "INSERT INTO test VALUES (6, 'f'), (7, 'g')"
|
||
dolt commit -am "add more rows in branch1"
|
||
dolt merge branch2 -m "merge branch2"
|
||
|
||
dolt checkout main
|
||
run dolt cherry-pick branch1
|
||
[ $status -eq 1 ]
|
||
[[ $output =~ "cherry-picking a merge commit is not supported" ]] || false
|
||
}
|
||
|
||
@test "cherry-pick: cherry-pick commit is a cherry-picked commit" {
|
||
dolt checkout -b branch2
|
||
dolt sql -q "INSERT INTO test VALUES (4, 'd'), (5, 'e')"
|
||
dolt commit -am "add more rows in branch2"
|
||
|
||
dolt checkout branch1
|
||
dolt sql -q "INSERT INTO test VALUES (6, 'f'), (7, 'g')"
|
||
dolt commit -am "add more rows in branch1"
|
||
run dolt cherry-pick branch2
|
||
[ "$status" -eq "0" ]
|
||
|
||
run dolt sql -q "SELECT * FROM test" -r csv
|
||
[[ "$output" =~ "4,d" ]] || false
|
||
[[ "$output" =~ "5,e" ]] || false
|
||
|
||
dolt checkout main
|
||
run dolt cherry-pick branch1
|
||
[ "$status" -eq "0" ]
|
||
|
||
run dolt sql -q "SELECT * FROM test" -r csv
|
||
[[ "$output" =~ "4,d" ]] || false
|
||
[[ "$output" =~ "5,e" ]] || false
|
||
}
|
||
|
||
@test "cherry-pick: add triggers" {
|
||
dolt sql -q "CREATE TRIGGER trigger1 BEFORE INSERT ON test FOR EACH ROW SET new.v = concat(new.v, ' inserted')"
|
||
dolt sql -q "CREATE view two as select 1+1"
|
||
dolt sql -q "INSERT INTO test VALUES (4,'z')"
|
||
run dolt sql -q "SELECT * FROM test"
|
||
[[ "$output" =~ "z inserted" ]] || false
|
||
|
||
dolt add .
|
||
dolt commit -am "add trigger"
|
||
|
||
dolt checkout main
|
||
run dolt sql -q "SHOW TRIGGERS"
|
||
[[ ! "$output" =~ "trigger1" ]] || false
|
||
|
||
dolt cherry-pick branch1
|
||
|
||
run dolt sql -q "SELECT * FROM test"
|
||
[[ "$output" =~ "z inserted" ]] || false
|
||
|
||
run dolt sql -q "SHOW TRIGGERS"
|
||
[[ "$output" =~ "trigger1" ]] || false
|
||
|
||
dolt checkout branch1
|
||
dolt sql -q "DROP TRIGGER trigger1"
|
||
dolt commit -am "drop trigger"
|
||
dolt checkout main
|
||
dolt cherry-pick branch1
|
||
|
||
run dolt sql -q "SHOW TRIGGERS"
|
||
[[ ! "$output" =~ "trigger1" ]] || false
|
||
}
|
||
|
||
@test "cherry-pick: drop triggers" {
|
||
dolt sql -q "CREATE TRIGGER trigger1 BEFORE INSERT ON test FOR EACH ROW SET new.v = concat(new.v, ' inserted')"
|
||
dolt sql -q "INSERT INTO test VALUES (4,'z')"
|
||
run dolt sql -q "SELECT * FROM test"
|
||
[[ "$output" =~ "z inserted" ]] || false
|
||
|
||
dolt add .
|
||
dolt commit -am "add trigger"
|
||
|
||
dolt checkout main
|
||
run dolt sql -q "SHOW TRIGGERS"
|
||
[[ ! "$output" =~ "trigger1" ]] || false
|
||
|
||
dolt cherry-pick branch1
|
||
|
||
run dolt sql -q "SELECT * FROM test"
|
||
[[ "$output" =~ "z inserted" ]] || false
|
||
|
||
run dolt sql -q "SHOW TRIGGERS"
|
||
[[ "$output" =~ "trigger1" ]] || false
|
||
|
||
dolt checkout branch1
|
||
dolt sql -q "DROP TRIGGER trigger1"
|
||
dolt commit -am "drop trigger"
|
||
dolt checkout main
|
||
|
||
skip "merge cannot handle dropped dolt_schemas" table
|
||
dolt cherry-pick branch1
|
||
|
||
run dolt sql -q "SHOW TRIGGERS"
|
||
[[ ! "$output" =~ "trigger1" ]] || false
|
||
}
|
||
|
||
@test "cherry-pick: add procedures" {
|
||
dolt sql -q "CREATE PROCEDURE proc1 (in x int) select x from dual"
|
||
run dolt sql -q "CALL proc1(434)"
|
||
[[ "$output" =~ "434" ]] || false
|
||
|
||
dolt add .
|
||
dolt commit -am "add procedure"
|
||
|
||
dolt checkout main
|
||
run dolt sql -q "SHOW PROCEDURE STATUS"
|
||
[[ ! "$output" =~ "proc1" ]] || false
|
||
|
||
run dolt cherry-pick branch1
|
||
[ "$status" -eq "0" ]
|
||
|
||
run dolt sql -q "SHOW PROCEDURE STATUS"
|
||
[[ "$output" =~ "proc1" ]] || false
|
||
|
||
run dolt sql -q "CALL proc1(434)"
|
||
[[ "$output" =~ "434" ]] || false
|
||
}
|
||
|
||
@test "cherry-pick: keyless table" {
|
||
dolt checkout main
|
||
dolt sql -q "CREATE TABLE keyless (id int, name varchar(10))"
|
||
dolt add .
|
||
dolt commit -am "add keyless table"
|
||
|
||
dolt checkout -b branch2
|
||
dolt sql -q "INSERT INTO keyless VALUES (1,'1'), (2,'3')"
|
||
dolt commit -am "insert into keyless table"
|
||
|
||
dolt checkout main
|
||
run dolt cherry-pick branch1
|
||
[ "$status" -eq "0" ]
|
||
|
||
dolt sql -q "SELECT * FROM keyless" -r csv
|
||
[[ ! "$output" =~ "1,1" ]] || false
|
||
[[ ! "$output" =~ "2,3" ]] || false
|
||
}
|
||
|
||
@test "cherry-pick: commit with ALTER TABLE add column" {
|
||
dolt sql -q "ALTER TABLE test ADD COLUMN c int"
|
||
dolt commit -am "alter table test add column c"
|
||
|
||
dolt checkout main
|
||
dolt cherry-pick branch1
|
||
|
||
run dolt sql -q "SHOW CREATE TABLE test;"
|
||
[ $status -eq 0 ]
|
||
[[ $output =~ '`c` int' ]] || false
|
||
}
|
||
|
||
@test "cherry-pick: commit with ALTER TABLE change column" {
|
||
dolt sql -q "ALTER TABLE test CHANGE COLUMN v c varchar(100)"
|
||
dolt commit -am "alter table test change column v"
|
||
|
||
dolt checkout main
|
||
dolt cherry-pick branch1
|
||
|
||
run dolt sql -q "SHOW CREATE TABLE test;"
|
||
[ $status -eq 0 ]
|
||
[[ $output =~ '`c` varchar(100)' ]] || false
|
||
[[ ! $output =~ '`v` varchar(10)' ]] || false
|
||
}
|
||
|
||
@test "cherry-pick: commit with ALTER TABLE modify column" {
|
||
dolt sql -q "UPDATE test SET v = '1' WHERE pk < 4"
|
||
dolt sql -q "ALTER TABLE test MODIFY COLUMN v int"
|
||
dolt commit -am "alter table test modify column v"
|
||
|
||
# TODO: Incompatible type changes currently trigger an error response, instead of
|
||
# being tracked as a schema conflict artifact. Once we fix that, update this test.
|
||
dolt checkout main
|
||
run dolt cherry-pick branch1
|
||
[ $status -eq 1 ]
|
||
[[ $output =~ "merge aborted: schema conflict found for table test" ]] || false
|
||
}
|
||
|
||
@test "cherry-pick: commit with ALTER TABLE drop column" {
|
||
dolt sql -q "ALTER TABLE test DROP COLUMN v"
|
||
dolt commit -am "alter table test drop column v"
|
||
|
||
# Dropping column v on branch1 modifies all rows in the table, and those rows
|
||
# don't exist on main, so they would be a conflict. However, cell-wise merging is able to resolve the conflict.
|
||
dolt checkout main
|
||
run dolt cherry-pick branch1
|
||
[ $status -eq 0 ]
|
||
|
||
run dolt sql -q "SHOW CREATE TABLE test;"
|
||
[ $status -eq 0 ]
|
||
[[ ! $output =~ '`v` varchar(10)' ]] || false
|
||
}
|
||
|
||
@test "cherry-pick: commit with ALTER TABLE rename column" {
|
||
dolt sql -q "ALTER TABLE test RENAME COLUMN v TO c"
|
||
dolt commit -am "alter table test rename column v"
|
||
|
||
dolt checkout main
|
||
dolt cherry-pick branch1
|
||
|
||
run dolt sql -q "SHOW CREATE TABLE test;"
|
||
[ $status -eq 0 ]
|
||
[[ ! $output =~ '`v` varchar(10)' ]] || false
|
||
[[ $output =~ '`c` varchar(10)' ]] || false
|
||
}
|
||
|
||
@test "cherry-pick: commit with ALTER TABLE drop and add primary key" {
|
||
dolt sql -q "ALTER TABLE test DROP PRIMARY KEY, ADD PRIMARY KEY (pk, v)"
|
||
dolt commit -am "alter table test drop and add primary key"
|
||
|
||
dolt checkout main
|
||
run dolt cherry-pick branch1
|
||
[ $status -eq 1 ]
|
||
[[ $output =~ "error: cannot merge because table test has different primary keys" ]] || false
|
||
}
|