mirror of
https://github.com/dolthub/dolt.git
synced 2026-04-24 03:16:12 -05:00
Brian Hendriks
974 lines
26 KiB
Bash
974 lines
26 KiB
Bash
#!/usr/bin/env bats
|
|
load $BATS_TEST_DIRNAME/helper/common.bash
|
|
|
|
setup() {
|
|
setup_common
|
|
}
|
|
|
|
teardown() {
|
|
teardown_common
|
|
}
|
|
|
|
@test "merge non-existant branch errors" {
|
|
run dolt merge batmans-parents
|
|
[ $status -eq 1 ]
|
|
[[ "$output" =~ "unknown branch" ]] || false
|
|
[[ ! "$output" =~ "panic" ]] || false
|
|
}
|
|
|
|
@test "cannot merge into dirty working table" {
|
|
dolt sql <<SQL
|
|
CREATE TABLE test (
|
|
pk BIGINT NOT NULL,
|
|
c1 BIGINT,
|
|
c2 BIGINT,
|
|
c3 BIGINT,
|
|
c4 BIGINT,
|
|
c5 BIGINT,
|
|
PRIMARY KEY (pk)
|
|
);
|
|
SQL
|
|
dolt sql -q "insert into test values (0, 0, 0, 0, 0, 0)"
|
|
dolt sql -q "insert into test values (1, 1, 1, 1, 1, 1)"
|
|
dolt add test
|
|
dolt commit -m "table created"
|
|
|
|
dolt checkout -b other
|
|
dolt sql -q "replace into test values (1, 1, 1, 1, 1, 11)"
|
|
dolt add test
|
|
dolt commit -m "changed pk=1 c5 to 11"
|
|
|
|
dolt checkout master
|
|
dolt sql -q "replace into test values (0, 11, 0, 0, 0, 0)"
|
|
|
|
run dolt merge other
|
|
[ "$status" -ne 0 ]
|
|
[[ "$output" =~ "error: Your local changes to the following tables would be overwritten by merge:" ]] || false
|
|
[[ "$output" =~ "test" ]] || false
|
|
[[ "$output" =~ "Please commit your changes before you merge." ]] || false
|
|
|
|
dolt add test
|
|
dolt commit -m "changes pk=0 c1 t0 11"
|
|
run dolt merge other
|
|
[ "$status" -eq 0 ]
|
|
[[ "$output" =~ "Updating" ]] || false
|
|
[[ "$output" =~ "1 tables changed" ]] || false
|
|
[[ "$output" =~ "1 rows modified" ]] || false
|
|
|
|
}
|
|
|
|
@test "two branches modify different cell different row. merge. no conflict" {
|
|
dolt sql <<SQL
|
|
CREATE TABLE test (
|
|
pk BIGINT NOT NULL,
|
|
c1 BIGINT,
|
|
c2 BIGINT,
|
|
c3 BIGINT,
|
|
c4 BIGINT,
|
|
c5 BIGINT,
|
|
PRIMARY KEY (pk)
|
|
);
|
|
SQL
|
|
dolt sql -q "insert into test values (0, 0, 0, 0, 0, 0)"
|
|
dolt sql -q "insert into test values (1, 1, 1, 1, 1, 1)"
|
|
dolt add test
|
|
dolt commit -m "table created"
|
|
dolt branch change-cell
|
|
dolt sql -q "replace into test values (0, 11, 0, 0, 0, 0)"
|
|
dolt add test
|
|
dolt commit -m "changed pk=0 c1 to 11"
|
|
dolt checkout change-cell
|
|
dolt sql -q "replace into test values (1, 1, 1, 1, 1, 11)"
|
|
dolt add test
|
|
dolt commit -m "changed pk=1 c5 to 11"
|
|
dolt checkout master
|
|
run dolt merge change-cell
|
|
[ "$status" -eq 0 ]
|
|
[[ "$output" =~ "Updating" ]] || false
|
|
[[ "$output" =~ "1 tables changed" ]] || false
|
|
[[ "$output" =~ "1 rows modified" ]] || false
|
|
[[ ! "$output" =~ "CONFLICT" ]] || false
|
|
run dolt status
|
|
[[ "$output" =~ "All conflicts fixed" ]] || false
|
|
[[ "$output" =~ "Changes to be committed:" ]] || false
|
|
}
|
|
|
|
@test "two branches modify different cell same row. merge. no conflict" {
|
|
dolt sql <<SQL
|
|
CREATE TABLE test (
|
|
pk BIGINT NOT NULL,
|
|
c1 BIGINT,
|
|
c2 BIGINT,
|
|
c3 BIGINT,
|
|
c4 BIGINT,
|
|
c5 BIGINT,
|
|
PRIMARY KEY (pk)
|
|
);
|
|
SQL
|
|
dolt sql -q "insert into test values (0, 0, 0, 0, 0, 0)"
|
|
dolt add test
|
|
dolt commit -m "table created"
|
|
dolt branch change-cell
|
|
dolt sql -q "replace into test values (0, 11, 0, 0, 0, 0)"
|
|
dolt add test
|
|
dolt commit -m "changed pk=0 c1 to 11"
|
|
dolt checkout change-cell
|
|
dolt sql -q "replace into test values (0, 0, 0, 0, 0, 11)"
|
|
dolt add test
|
|
dolt commit -m "changed pk=0 c5 to 11"
|
|
dolt checkout master
|
|
run dolt merge change-cell
|
|
[ "$status" -eq 0 ]
|
|
[[ "$output" =~ "Updating" ]] || false
|
|
[[ "$output" =~ "1 tables changed" ]] || false
|
|
[[ "$output" =~ "1 rows modified" ]] || false
|
|
[[ ! "$output" =~ "CONFLICT" ]] || false
|
|
run dolt status
|
|
[[ "$output" =~ "All conflicts fixed" ]] || false
|
|
[[ "$output" =~ "Changes to be committed:" ]] || false
|
|
}
|
|
|
|
@test "two branches modify same cell. merge. conflict" {
|
|
dolt sql <<SQL
|
|
CREATE TABLE test (
|
|
pk BIGINT NOT NULL,
|
|
c1 BIGINT,
|
|
c2 BIGINT,
|
|
c3 BIGINT,
|
|
c4 BIGINT,
|
|
c5 BIGINT,
|
|
PRIMARY KEY (pk)
|
|
);
|
|
SQL
|
|
dolt sql -q "insert into test values (0, 0, 0, 0, 0, 0)"
|
|
dolt add test
|
|
dolt commit -m "table created"
|
|
dolt branch change-cell
|
|
dolt sql -q "replace into test values (0, 1, 1, 1, 1, 1)"
|
|
dolt add test
|
|
dolt commit -m "changed pk=0 all cells to 1"
|
|
dolt checkout change-cell
|
|
dolt sql -q "replace into test values (0, 11, 11, 11, 11, 11)"
|
|
dolt add test
|
|
dolt commit -m "changed pk=0 all cells to 11"
|
|
dolt checkout master
|
|
run dolt merge change-cell
|
|
[ "$status" -eq 0 ]
|
|
[[ "$output" =~ "CONFLICT" ]] || false
|
|
run dolt status
|
|
[[ "$output" =~ "You have unmerged tables." ]] || false
|
|
[[ "$output" =~ "Unmerged paths:" ]] || false
|
|
}
|
|
|
|
@test "two branches add a different row. merge. no conflict" {
|
|
dolt sql <<SQL
|
|
CREATE TABLE test (
|
|
pk BIGINT NOT NULL,
|
|
c1 BIGINT,
|
|
c2 BIGINT,
|
|
c3 BIGINT,
|
|
c4 BIGINT,
|
|
c5 BIGINT,
|
|
PRIMARY KEY (pk)
|
|
);
|
|
SQL
|
|
dolt add test
|
|
dolt commit -m "table created"
|
|
dolt branch add-row
|
|
dolt sql -q "insert into test values (0, 0, 0, 0, 0, 0)"
|
|
dolt add test
|
|
dolt commit -m "added pk=0 row"
|
|
dolt checkout add-row
|
|
dolt sql -q "insert into test values (1, 1, 1, 1, 1, 1)"
|
|
dolt add test
|
|
dolt commit -m "added pk=1 row"
|
|
dolt checkout master
|
|
run dolt merge add-row
|
|
[ "$status" -eq 0 ]
|
|
[[ "$output" =~ "Updating" ]] || false
|
|
[[ "$output" =~ "1 tables changed" ]] || false
|
|
[[ "$output" =~ "1 rows added" ]] || false
|
|
[[ ! "$output" =~ "CONFLICT" ]] || false
|
|
}
|
|
|
|
@test "two branches add same row. merge. no conflict" {
|
|
dolt sql <<SQL
|
|
CREATE TABLE test (
|
|
pk BIGINT NOT NULL,
|
|
c1 BIGINT,
|
|
c2 BIGINT,
|
|
c3 BIGINT,
|
|
c4 BIGINT,
|
|
c5 BIGINT,
|
|
PRIMARY KEY (pk)
|
|
);
|
|
SQL
|
|
dolt add test
|
|
dolt commit -m "table created"
|
|
dolt branch add-row
|
|
dolt sql -q "insert into test values (0, 0, 0, 0, 0, 0)"
|
|
dolt add test
|
|
dolt commit -m "added pk=0 row"
|
|
dolt checkout add-row
|
|
dolt sql -q "insert into test values (0, 0, 0, 0, 0, 0)"
|
|
dolt add test
|
|
dolt commit -m "added pk=0 row"
|
|
dolt checkout master
|
|
run dolt merge add-row
|
|
[ $status -eq 0 ]
|
|
[[ "$output" =~ "Updating" ]] || false
|
|
[[ ! "$output" =~ "CONFLICT" ]] || false
|
|
}
|
|
|
|
@test "one branch add table, other modifies table. merge. no conflict" {
|
|
dolt sql <<SQL
|
|
CREATE TABLE test (
|
|
pk BIGINT NOT NULL,
|
|
c1 BIGINT,
|
|
c2 BIGINT,
|
|
c3 BIGINT,
|
|
c4 BIGINT,
|
|
c5 BIGINT,
|
|
PRIMARY KEY (pk)
|
|
);
|
|
SQL
|
|
dolt add test
|
|
dolt commit -m "table created"
|
|
dolt branch add-table
|
|
dolt sql -q "insert into test values (0, 0, 0, 0, 0, 0)"
|
|
dolt add test
|
|
dolt commit -m "added row"
|
|
dolt checkout add-table
|
|
dolt sql <<SQL
|
|
CREATE TABLE test2 (
|
|
pk BIGINT NOT NULL,
|
|
c1 BIGINT,
|
|
c2 BIGINT,
|
|
c3 BIGINT,
|
|
c4 BIGINT,
|
|
c5 BIGINT,
|
|
PRIMARY KEY (pk)
|
|
);
|
|
SQL
|
|
dolt add test2
|
|
dolt commit -m "added new table test2"
|
|
dolt checkout master
|
|
run dolt merge add-table
|
|
[ $status -eq 0 ]
|
|
[[ "$output" =~ "Updating" ]] || false
|
|
skip "should have a merge summary section that says 1 table changed"
|
|
[[ "$output" =~ "1 tables changed" ]] || false
|
|
[[ ! "$output" =~ "CONFLICT" ]] || false
|
|
}
|
|
|
|
@test "two branches add same column. merge. no conflict" {
|
|
dolt sql <<SQL
|
|
CREATE TABLE test (
|
|
pk BIGINT NOT NULL,
|
|
c1 BIGINT,
|
|
c2 BIGINT,
|
|
c3 BIGINT,
|
|
c4 BIGINT,
|
|
c5 BIGINT,
|
|
PRIMARY KEY (pk)
|
|
);
|
|
SQL
|
|
dolt add test
|
|
dolt commit -m "table created"
|
|
dolt branch add-column
|
|
dolt sql -q "alter table test add c0 bigint"
|
|
dolt add test
|
|
dolt commit -m "added column c0"
|
|
dolt checkout add-column
|
|
dolt sql -q "alter table test add c0 bigint"
|
|
dolt add test
|
|
dolt commit -m "added same column c0"
|
|
dolt checkout master
|
|
run dolt merge add-column
|
|
[ $status -eq 0 ]
|
|
[[ "$output" =~ "Updating" ]] || false
|
|
[[ ! "$output" =~ "CONFLICT" ]] || false
|
|
}
|
|
|
|
@test "two branches add different column. merge. no conflict" {
|
|
skip https://github.com/dolthub/dolt/issues/773
|
|
dolt sql <<SQL
|
|
CREATE TABLE test (
|
|
pk BIGINT NOT NULL,
|
|
c1 BIGINT,
|
|
c2 BIGINT,
|
|
c3 BIGINT,
|
|
c4 BIGINT,
|
|
c5 BIGINT,
|
|
PRIMARY KEY (pk)
|
|
);
|
|
SQL
|
|
dolt sql -q 'insert into test (pk, c1, c2, c3, c4, c5) values (0,1,2,3,4,5);'
|
|
dolt add test
|
|
dolt commit -m "table created"
|
|
dolt branch add-column
|
|
dolt sql -q "alter table test add c0 bigint"
|
|
dolt add test
|
|
dolt commit -m "added column c0"
|
|
dolt checkout add-column
|
|
dolt sql -q "alter table test add c6 bigint"
|
|
dolt add test
|
|
dolt commit -m "added column c6"
|
|
dolt checkout master
|
|
run dolt merge add-column
|
|
[ $status -eq 0 ]
|
|
[[ "$output" =~ "Updating" ]] || false
|
|
[[ "$output" =~ "1 tables changed" ]] || false
|
|
[[ ! "$output" =~ "CONFLICT" ]] || false
|
|
|
|
run dolt sql -q 'select * from test;'
|
|
[ $status -eq 0 ]
|
|
[[ "${lines[3]}" =~ "| 0 | 1 | 2 | 3 | 4 | 5 | NULL | NULL |" ]] || false
|
|
}
|
|
|
|
@test "two branches add same column, different types. merge. conflict" {
|
|
dolt sql <<SQL
|
|
CREATE TABLE test (
|
|
pk BIGINT NOT NULL COMMENT 'tag:0',
|
|
c1 BIGINT COMMENT 'tag:1',
|
|
c2 BIGINT COMMENT 'tag:2',
|
|
c3 BIGINT COMMENT 'tag:3',
|
|
c4 BIGINT COMMENT 'tag:4',
|
|
c5 BIGINT COMMENT 'tag:5',
|
|
PRIMARY KEY (pk)
|
|
);
|
|
SQL
|
|
dolt add test
|
|
dolt commit -m "table created"
|
|
dolt branch add-column
|
|
dolt sql -q "alter table test add c0 longtext"
|
|
dolt add test
|
|
dolt commit -m "added column c0 as string"
|
|
dolt checkout add-column
|
|
dolt sql -q "alter table test add c0 bigint"
|
|
dolt add test
|
|
dolt commit -m "added column c0 as int"
|
|
dolt checkout master
|
|
skip "This created two c0 columns with different types and tag numbers. Bug I think."
|
|
run dolt merge add-column
|
|
[ $status -eq 0 ]
|
|
[[ "$output" =~ "CONFLICT" ]] || false
|
|
}
|
|
|
|
@test "two branches delete same column. merge. no conflict" {
|
|
dolt sql <<SQL
|
|
CREATE TABLE test (
|
|
pk BIGINT NOT NULL,
|
|
c1 BIGINT,
|
|
c2 BIGINT,
|
|
c3 BIGINT,
|
|
c4 BIGINT,
|
|
c5 BIGINT,
|
|
PRIMARY KEY (pk)
|
|
);
|
|
SQL
|
|
dolt add test
|
|
dolt commit -m "table created"
|
|
dolt branch delete-column
|
|
dolt sql -q "alter table test drop column c5"
|
|
dolt add test
|
|
dolt commit -m "deleted c5 column"
|
|
dolt checkout delete-column
|
|
dolt sql -q "alter table test drop column c5"
|
|
dolt add test
|
|
dolt commit -m "deleted c5 again"
|
|
dolt checkout master
|
|
run dolt merge delete-column
|
|
[ $status -eq 0 ]
|
|
[[ "$output" =~ "Updating" ]] || false
|
|
[[ ! "$output" =~ "CONFLICT" ]] || false
|
|
}
|
|
|
|
@test "two branches delete different column. merge. no conflict" {
|
|
skip https://github.com/dolthub/dolt/issues/773
|
|
dolt sql <<SQL
|
|
CREATE TABLE test (
|
|
pk BIGINT NOT NULL COMMENT 'tag:0',
|
|
c1 BIGINT COMMENT 'tag:1',
|
|
c2 BIGINT COMMENT 'tag:2',
|
|
c3 BIGINT COMMENT 'tag:3',
|
|
c4 BIGINT COMMENT 'tag:4',
|
|
c5 BIGINT COMMENT 'tag:5',
|
|
PRIMARY KEY (pk)
|
|
);
|
|
SQL
|
|
dolt add test
|
|
dolt commit -m "table created"
|
|
|
|
dolt checkout -b one
|
|
dolt sql -q "alter table test drop column c5"
|
|
dolt add test
|
|
dolt commit -m "deleted column c5"
|
|
|
|
dolt checkout master
|
|
dolt checkout -b two
|
|
dolt sql -q "alter table test drop column c4"
|
|
dolt add test
|
|
dolt commit -m "deleted column c4"
|
|
|
|
run dolt merge one
|
|
[ $status -eq 0 ]
|
|
[[ "$output" =~ "Updating" ]] || false
|
|
[[ ! "$output" =~ "CONFLICT" ]] || false
|
|
|
|
run dolt schema show
|
|
[[ "${lines[0]}" =~ "test @ working" ]] || false
|
|
[[ "${lines[1]}" =~ "CREATE TABLE \`test\` (" ]] || false
|
|
[[ "${lines[2]}" =~ "\`pk\` BIGINT NOT NULL COMMENT 'tag:0'," ]] || false
|
|
[[ "${lines[3]}" =~ "\`c1\` BIGINT COMMENT 'tag:1'," ]] || false
|
|
[[ "${lines[4]}" =~ "\`c2\` BIGINT COMMENT 'tag:2'," ]] || false
|
|
[[ "${lines[5]}" =~ "\`c3\` BIGINT COMMENT 'tag:3'," ]] || false
|
|
[[ "${lines[6]}" =~ "PRIMARY KEY (\`pk\`)" ]] || false
|
|
[[ "${lines[7]}" =~ ");" ]] || false
|
|
}
|
|
|
|
@test "two branches rename same column to same name. merge. no conflict" {
|
|
dolt sql <<SQL
|
|
CREATE TABLE test (
|
|
pk BIGINT NOT NULL,
|
|
c1 BIGINT,
|
|
c2 BIGINT,
|
|
c3 BIGINT,
|
|
c4 BIGINT,
|
|
c5 BIGINT,
|
|
PRIMARY KEY (pk)
|
|
);
|
|
SQL
|
|
dolt add test
|
|
dolt commit -m "table created"
|
|
dolt branch rename-column
|
|
dolt sql -q "alter table test rename column c5 to c0"
|
|
dolt add test
|
|
dolt commit -m "renamed c5 to c0"
|
|
dolt checkout rename-column
|
|
dolt sql -q "alter table test rename column c5 to c0"
|
|
dolt add test
|
|
dolt commit -m "renamed c5 to c0 again"
|
|
dolt checkout master
|
|
run dolt merge rename-column
|
|
[ $status -eq 0 ]
|
|
[[ "$output" =~ "Updating" ]] || false
|
|
[[ ! "$output" =~ "CONFLICT" ]] || false
|
|
}
|
|
|
|
@test "two branches rename same column to different name. merge. conflict" {
|
|
dolt sql <<SQL
|
|
CREATE TABLE test (
|
|
pk BIGINT NOT NULL,
|
|
c1 BIGINT,
|
|
c2 BIGINT,
|
|
c3 BIGINT,
|
|
c4 BIGINT,
|
|
c5 BIGINT,
|
|
PRIMARY KEY (pk)
|
|
);
|
|
SQL
|
|
skip "This currently is a failed merge. I think it should be a conflict that you can resolve by modifying the schema. Basically choose a column name for the tag. The data is the same."
|
|
dolt add test
|
|
dolt commit -m "table created"
|
|
dolt branch rename-column
|
|
dolt sql -q "alter table test rename column c5 to c0"
|
|
dolt add test
|
|
dolt commit -m "renamed c5 to c0"
|
|
dolt checkout rename-column
|
|
dolt sql -q "alter table test rename column c5 to c6"
|
|
dolt add test
|
|
dolt commit -m "renamed c5 to c6"
|
|
dolt checkout master
|
|
run dolt merge rename-column
|
|
[ $status -eq 1 ]
|
|
[[ "$output" =~ "Bad merge" ]] || false
|
|
[ $status -eq 0 ]
|
|
[[ "$output" =~ "CONFLICT" ]] || false
|
|
}
|
|
|
|
@test "two branches rename different column to same name. merge. conflict" {
|
|
dolt sql <<SQL
|
|
CREATE TABLE test (
|
|
pk BIGINT NOT NULL,
|
|
c1 BIGINT,
|
|
c2 BIGINT,
|
|
c3 BIGINT,
|
|
c4 BIGINT,
|
|
c5 BIGINT,
|
|
PRIMARY KEY (pk)
|
|
);
|
|
SQL
|
|
skip "Same as test above. This case needs some thought. My initial instinct was that this generates a tag conflict. Pick one tag and then you have a data conflict because the schemas are the same on both branches."
|
|
dolt add test
|
|
dolt commit -m "table created"
|
|
dolt branch rename-column
|
|
dolt sql -q "alter table test rename column c5 to c0"
|
|
dolt add test
|
|
dolt commit -m "renamed c5 to c0"
|
|
dolt checkout rename-column
|
|
dolt sql -q "alter table test rename column c4 to c0"
|
|
dolt add test
|
|
dolt commit -m "renamed c5 to c6"
|
|
dolt checkout master
|
|
run dolt merge rename-column
|
|
[ $status -eq 1 ]
|
|
[[ "$output" =~ "Bad merge" ]] || false
|
|
[ $status -eq 0 ]
|
|
[[ "$output" =~ "CONFLICT" ]] || false
|
|
}
|
|
|
|
# Altering types and properties of the schema are not really supported by the
|
|
# command line. Have to upload schema files for these next few tests.
|
|
@test "two branches change type of same column to same type. merge. no conflict" {
|
|
skip "type changes are not allowed without changing tag"
|
|
dolt sql <<SQL
|
|
CREATE TABLE test (
|
|
pk BIGINT NOT NULL COMMENT 'tag:0',
|
|
c1 BIGINT COMMENT 'tag:1',
|
|
c2 BIGINT COMMENT 'tag:2',
|
|
c3 BIGINT COMMENT 'tag:3',
|
|
c4 BIGINT COMMENT 'tag:4',
|
|
c5 BIGINT COMMENT 'tag:5',
|
|
PRIMARY KEY (pk)
|
|
);
|
|
SQL
|
|
dolt add test
|
|
dolt commit -m "table created"
|
|
dolt branch change-types
|
|
dolt table rm test
|
|
dolt sql <<SQL
|
|
CREATE TABLE test (
|
|
pk BIGINT NOT NULL COMMENT 'tag:0',
|
|
c1 BIGINT UNSIGNED COMMENT 'tag:1',
|
|
c2 BIGINT COMMENT 'tag:2',
|
|
c3 BIGINT COMMENT 'tag:3',
|
|
c4 BIGINT COMMENT 'tag:4',
|
|
c5 BIGINT COMMENT 'tag:5',
|
|
PRIMARY KEY (pk)
|
|
);
|
|
SQL
|
|
dolt add test
|
|
dolt commit -m "changed c1 to type uint"
|
|
dolt checkout change-types
|
|
dolt table rm test
|
|
dolt sql <<SQL
|
|
CREATE TABLE test (
|
|
pk BIGINT NOT NULL COMMENT 'tag:0',
|
|
c1 BIGINT UNSIGNED COMMENT 'tag:1',
|
|
c2 BIGINT COMMENT 'tag:2',
|
|
c3 BIGINT COMMENT 'tag:3',
|
|
c4 BIGINT COMMENT 'tag:4',
|
|
c5 BIGINT COMMENT 'tag:5',
|
|
PRIMARY KEY (pk)
|
|
);
|
|
SQL
|
|
dolt add test
|
|
dolt commit -m "changed c1 to type uint again"
|
|
dolt checkout master
|
|
run dolt merge change-types
|
|
[ $status -eq 0 ]
|
|
[[ "$output" =~ "Updating" ]] || false
|
|
[[ ! "$output" =~ "CONFLICT" ]] || false
|
|
}
|
|
|
|
@test "two branches change type of same column to different type. merge. conflict" {
|
|
skip "type changes are not allowed without changing tag"
|
|
dolt sql <<SQL
|
|
CREATE TABLE test (
|
|
pk BIGINT NOT NULL COMMENT 'tag:0',
|
|
c1 BIGINT COMMENT 'tag:1',
|
|
c2 BIGINT COMMENT 'tag:2',
|
|
c3 BIGINT COMMENT 'tag:3',
|
|
c4 BIGINT COMMENT 'tag:4',
|
|
c5 BIGINT COMMENT 'tag:5',
|
|
PRIMARY KEY (pk)
|
|
);
|
|
SQL
|
|
dolt add test
|
|
dolt commit -m "table created"
|
|
dolt branch change-types
|
|
dolt table rm test
|
|
dolt sql <<SQL
|
|
CREATE TABLE test (
|
|
pk BIGINT NOT NULL COMMENT 'tag:0',
|
|
c1 BIGINT UNSIGNED COMMENT 'tag:1',
|
|
c2 BIGINT COMMENT 'tag:2',
|
|
c3 BIGINT COMMENT 'tag:3',
|
|
c4 BIGINT COMMENT 'tag:4',
|
|
c5 BIGINT COMMENT 'tag:5',
|
|
PRIMARY KEY (pk)
|
|
);
|
|
SQL
|
|
dolt add test
|
|
dolt commit -m "changed c1 to type uint"
|
|
dolt checkout change-types
|
|
dolt table rm test
|
|
dolt sql <<SQL
|
|
CREATE TABLE test (
|
|
pk BIGINT NOT NULL COMMENT 'tag:0',
|
|
c1 DOUBLE COMMENT 'tag:1',
|
|
c2 BIGINT COMMENT 'tag:2',
|
|
c3 BIGINT COMMENT 'tag:3',
|
|
c4 BIGINT COMMENT 'tag:4',
|
|
c5 BIGINT COMMENT 'tag:5',
|
|
PRIMARY KEY (pk)
|
|
);
|
|
SQL
|
|
skip "I think changing a type to two different types should throw a conflict"
|
|
dolt add test
|
|
dolt commit -m "changed c1 to type float"
|
|
dolt checkout master
|
|
run dolt merge change-types
|
|
[ $status -eq 1 ]
|
|
[[ "$output" =~ "Bad merge" ]] || false
|
|
[ $status -eq 0 ]
|
|
[[ "$output" =~ "CONFLICT" ]] || false
|
|
}
|
|
|
|
@test "two branches make same column primary key. merge. no conflict" {
|
|
skip "cannot resuse tags on table drop/add"
|
|
dolt sql <<SQL
|
|
CREATE TABLE test (
|
|
pk BIGINT NOT NULL COMMENT 'tag:0',
|
|
c1 BIGINT COMMENT 'tag:1',
|
|
c2 BIGINT COMMENT 'tag:2',
|
|
c3 BIGINT COMMENT 'tag:3',
|
|
c4 BIGINT COMMENT 'tag:4',
|
|
c5 BIGINT COMMENT 'tag:5',
|
|
PRIMARY KEY (pk)
|
|
);
|
|
SQL
|
|
dolt add test
|
|
dolt commit -m "table created"
|
|
dolt branch add-pk
|
|
dolt table rm test
|
|
dolt sql <<SQL
|
|
CREATE TABLE test (
|
|
pk BIGINT NOT NULL COMMENT 'tag:0',
|
|
c1 BIGINT COMMENT 'tag:1',
|
|
c2 BIGINT COMMENT 'tag:2',
|
|
c3 BIGINT COMMENT 'tag:3',
|
|
c4 BIGINT COMMENT 'tag:4',
|
|
c5 BIGINT COMMENT 'tag:5',
|
|
PRIMARY KEY (pk,c1)
|
|
);
|
|
SQL
|
|
dolt add test
|
|
dolt commit -m "made c1 a pk"
|
|
dolt checkout add-pk
|
|
dolt table rm test
|
|
dolt sql <<SQL
|
|
CREATE TABLE test (
|
|
pk BIGINT NOT NULL COMMENT 'tag:0',
|
|
c1 BIGINT COMMENT 'tag:1',
|
|
c2 BIGINT COMMENT 'tag:2',
|
|
c3 BIGINT COMMENT 'tag:3',
|
|
c4 BIGINT COMMENT 'tag:4',
|
|
c5 BIGINT COMMENT 'tag:5',
|
|
PRIMARY KEY (pk,c1)
|
|
);
|
|
SQL
|
|
dolt add test
|
|
dolt commit -m "made c1 a pk again"
|
|
dolt checkout master
|
|
run dolt merge add-pk
|
|
[ $status -eq 0 ]
|
|
[[ "$output" =~ "Updating" ]] || false
|
|
[[ ! "$output" =~ "CONFLICT" ]] || false
|
|
}
|
|
|
|
@test "two branches add same primary key column. merge. no conflict" {
|
|
dolt sql <<SQL
|
|
CREATE TABLE test (
|
|
pk BIGINT NOT NULL COMMENT 'tag:0',
|
|
c1 BIGINT COMMENT 'tag:1',
|
|
c2 BIGINT COMMENT 'tag:2',
|
|
c3 BIGINT COMMENT 'tag:3',
|
|
c4 BIGINT COMMENT 'tag:4',
|
|
c5 BIGINT COMMENT 'tag:5',
|
|
PRIMARY KEY (pk)
|
|
);
|
|
SQL
|
|
dolt add test
|
|
dolt commit -m "table created"
|
|
dolt branch add-pk
|
|
dolt table rm test
|
|
skip "cannot add change primary keys"
|
|
dolt sql <<SQL
|
|
CREATE TABLE test (
|
|
pk BIGINT NOT NULL COMMENT 'tag:0',
|
|
pk1 BIGINT NOT NULL COMMENT 'tag:6',
|
|
c1 BIGINT COMMENT 'tag:1',
|
|
c2 BIGINT COMMENT 'tag:2',
|
|
c3 BIGINT COMMENT 'tag:3',
|
|
c4 BIGINT COMMENT 'tag:4',
|
|
c5 BIGINT COMMENT 'tag:5',
|
|
PRIMARY KEY (pk,pk1)
|
|
);
|
|
SQL
|
|
dolt add test
|
|
dolt commit -m "added pk pk1"
|
|
dolt checkout add-pk
|
|
dolt table rm test
|
|
dolt sql <<SQL
|
|
CREATE TABLE test (
|
|
pk BIGINT NOT NULL COMMENT 'tag:0',
|
|
pk1 BIGINT NOT NULL COMMENT 'tag:6',
|
|
c1 BIGINT COMMENT 'tag:1',
|
|
c2 BIGINT COMMENT 'tag:2',
|
|
c3 BIGINT COMMENT 'tag:3',
|
|
c4 BIGINT COMMENT 'tag:4',
|
|
c5 BIGINT COMMENT 'tag:5',
|
|
PRIMARY KEY (pk,pk1)
|
|
);
|
|
SQL
|
|
dolt add test
|
|
dolt commit -m "added pk pk1 again"
|
|
dolt checkout master
|
|
run dolt merge add-pk
|
|
[ $status -eq 0 ]
|
|
[[ "$output" =~ "Updating" ]] || false
|
|
[[ ! "$output" =~ "CONFLICT" ]] || false
|
|
}
|
|
|
|
@test "two branches make different columns primary key. merge. conflict" {
|
|
dolt sql <<SQL
|
|
CREATE TABLE test (
|
|
pk BIGINT NOT NULL COMMENT 'tag:0',
|
|
c1 BIGINT COMMENT 'tag:1',
|
|
c2 BIGINT COMMENT 'tag:2',
|
|
c3 BIGINT COMMENT 'tag:3',
|
|
c4 BIGINT COMMENT 'tag:4',
|
|
c5 BIGINT COMMENT 'tag:5',
|
|
PRIMARY KEY (pk)
|
|
);
|
|
SQL
|
|
dolt add test
|
|
dolt commit -m "table created"
|
|
dolt branch add-pk
|
|
dolt table rm test
|
|
skip "cannot change primary keys"
|
|
dolt sql <<SQL
|
|
CREATE TABLE test (
|
|
pk BIGINT NOT NULL COMMENT 'tag:0',
|
|
pk1 BIGINT NOT NULL COMMENT 'tag:6',
|
|
c1 BIGINT COMMENT 'tag:1',
|
|
c2 BIGINT COMMENT 'tag:2',
|
|
c3 BIGINT COMMENT 'tag:3',
|
|
c4 BIGINT COMMENT 'tag:4',
|
|
c5 BIGINT COMMENT 'tag:5',
|
|
PRIMARY KEY (pk,pk1)
|
|
);
|
|
SQL
|
|
dolt add test
|
|
dolt commit -m "added pk pk1"
|
|
dolt checkout add-pk
|
|
dolt table rm test
|
|
dolt sql <<SQL
|
|
CREATE TABLE test (
|
|
pk BIGINT NOT NULL COMMENT 'tag:0',
|
|
pk2 BIGINT NOT NULL COMMENT 'tag:7',
|
|
c1 BIGINT COMMENT 'tag:1',
|
|
c2 BIGINT COMMENT 'tag:2',
|
|
c3 BIGINT COMMENT 'tag:3',
|
|
c4 BIGINT COMMENT 'tag:4',
|
|
c5 BIGINT COMMENT 'tag:5',
|
|
PRIMARY KEY (pk,pk2)
|
|
);
|
|
SQL
|
|
dolt add test
|
|
dolt commit -m "added pk pk2"
|
|
dolt checkout master
|
|
run dolt merge add-pk
|
|
[ $status -eq 0 ]
|
|
skip "This merges fine right now. Should throw conflict."
|
|
[[ "$output" =~ "CONFLICT" ]] || false
|
|
}
|
|
|
|
@test "two branches both create different tables. merge. no conflict" {
|
|
dolt branch table1
|
|
dolt branch table2
|
|
dolt checkout table1
|
|
dolt sql <<SQL
|
|
CREATE TABLE table1 (
|
|
pk BIGINT NOT NULL,
|
|
c1 BIGINT,
|
|
c2 BIGINT,
|
|
c3 BIGINT,
|
|
c4 BIGINT,
|
|
c5 BIGINT,
|
|
PRIMARY KEY (pk)
|
|
);
|
|
SQL
|
|
dolt add table1
|
|
dolt commit -m "first table"
|
|
dolt checkout table2
|
|
dolt sql <<SQL
|
|
CREATE TABLE table2 (
|
|
pk1 BIGINT NOT NULL,
|
|
pk2 BIGINT NOT NULL,
|
|
c1 BIGINT,
|
|
c2 BIGINT,
|
|
c3 BIGINT,
|
|
c4 BIGINT,
|
|
c5 BIGINT,
|
|
PRIMARY KEY (pk1,pk2)
|
|
);
|
|
SQL
|
|
dolt add table2
|
|
dolt commit -m "second table"
|
|
dolt checkout master
|
|
run dolt merge table1
|
|
[ "$status" -eq 0 ]
|
|
[[ "$output" =~ "Fast-forward" ]] || false
|
|
run dolt merge table2
|
|
[ "$status" -eq 0 ]
|
|
[[ "$output" =~ "Updating" ]] || false
|
|
[[ ! "$output" =~ "CONFLICT" ]] || false
|
|
}
|
|
|
|
@test "two branches drop different tables. merge. no conflict" {
|
|
dolt sql <<SQL
|
|
CREATE TABLE foo (
|
|
pk BIGINT NOT NULL PRIMARY KEY
|
|
);
|
|
CREATE TABLE bar (
|
|
pk BIGINT NOT NULL PRIMARY KEY
|
|
);
|
|
SQL
|
|
dolt add .
|
|
dolt commit -m "created two tables"
|
|
|
|
dolt branch other
|
|
|
|
dolt sql -q 'drop table foo'
|
|
dolt add .
|
|
dolt commit -m "dropped table foo"
|
|
|
|
dolt checkout other
|
|
dolt sql -q 'drop table bar'
|
|
dolt add .
|
|
dolt commit -m "dropped table bar"
|
|
|
|
dolt checkout master
|
|
skip "test currently panics on merge at doltcore/env/actions/merge.go:79"
|
|
run dolt merge other
|
|
[ "$status" -eq 0 ]
|
|
[[ "$output" =~ "Updating" ]] || false
|
|
[[ ! "$output" =~ "CONFLICT" ]] || false
|
|
}
|
|
|
|
@test "two branch rename different tables. merge. no conflict" {
|
|
dolt sql <<SQL
|
|
CREATE TABLE foo (
|
|
pk BIGINT NOT NULL PRIMARY KEY
|
|
);
|
|
CREATE TABLE bar (
|
|
pk BIGINT NOT NULL PRIMARY KEY
|
|
);
|
|
SQL
|
|
dolt add .
|
|
dolt commit -m "created two tables"
|
|
|
|
dolt branch other
|
|
|
|
dolt sql -q 'alter table foo rename to foofoo;'
|
|
dolt add .
|
|
dolt commit -m "renamed table foo to foofoo"
|
|
|
|
dolt checkout other
|
|
dolt sql -q 'alter table bar rename to barbar'
|
|
dolt add .
|
|
dolt commit -m "renamed table bar to barbar"
|
|
|
|
dolt checkout master
|
|
skip "test currently panics on merge at doltcore/env/actions/merge.go:79"
|
|
run dolt merge other
|
|
[ "$status" -eq 0 ]
|
|
[[ "$output" =~ "Updating" ]] || false
|
|
[[ ! "$output" =~ "CONFLICT" ]] || false
|
|
}
|
|
|
|
@test "two branches, one deletes rows, one modifies those same rows. merge. conflict" {
|
|
dolt sql <<SQL
|
|
CREATE TABLE foo (
|
|
pk INT PRIMARY KEY,
|
|
val INT
|
|
);
|
|
INSERT INTO foo VALUES (1, 1), (2, 1), (3, 1), (4, 1), (5, 1);
|
|
SQL
|
|
dolt add foo
|
|
dolt commit -m 'initial commit.'
|
|
|
|
dolt checkout -b deleter
|
|
dolt sql -q 'delete from foo'
|
|
dolt add foo
|
|
dolt commit -m 'delete commit.'
|
|
|
|
dolt checkout -b modifier master
|
|
dolt sql -q 'update foo set val = val + 1 where pk in (1, 3, 5);'
|
|
dolt add foo
|
|
dolt commit -m 'modify commit.'
|
|
|
|
dolt checkout -b merge-into-modified modifier
|
|
run dolt merge deleter
|
|
[ "$status" -eq 0 ]
|
|
[[ "$output" =~ "CONFLICT" ]] || false
|
|
dolt merge --abort
|
|
|
|
# Accept theirs deletes all rows.
|
|
dolt checkout master
|
|
dolt branch -d -f merge-into-modified
|
|
dolt checkout -b merge-into-modified modifier
|
|
dolt merge deleter
|
|
dolt conflicts resolve --theirs foo
|
|
run dolt sql -q 'select count(*) from foo'
|
|
[ "$status" -eq 0 ]
|
|
[[ "$output" =~ "| 0 |" ]] || false
|
|
dolt merge --abort
|
|
dolt reset --hard
|
|
|
|
# Accept ours deletes two rows.
|
|
dolt checkout master
|
|
dolt branch -d -f merge-into-modified
|
|
dolt checkout -b merge-into-modified modifier
|
|
dolt merge deleter
|
|
dolt conflicts resolve --ours foo
|
|
run dolt sql -q 'select count(*) from foo'
|
|
[ "$status" -eq 0 ]
|
|
[[ "$output" =~ "| 3 |" ]] || false
|
|
dolt merge --abort
|
|
dolt reset --hard
|
|
|
|
dolt checkout -b merge-into-deleter deleter
|
|
run dolt merge modifier
|
|
[ "$status" -eq 0 ]
|
|
[[ "$output" =~ "CONFLICT" ]] || false
|
|
dolt merge --abort
|
|
|
|
# Accept ours deletes all rows.
|
|
dolt checkout master
|
|
dolt branch -d -f merge-into-deleter
|
|
dolt checkout -b merge-into-deleter deleter
|
|
dolt merge modifier
|
|
dolt conflicts resolve --ours foo
|
|
run dolt sql -q 'select count(*) from foo'
|
|
[ "$status" -eq 0 ]
|
|
[[ "$output" =~ "| 0 |" ]] || false
|
|
dolt merge --abort
|
|
dolt reset --hard
|
|
|
|
# Accept theirs adds modified.
|
|
dolt checkout master
|
|
dolt branch -d -f merge-into-deleter
|
|
dolt checkout -b merge-into-deleter deleter
|
|
dolt merge modifier
|
|
dolt conflicts resolve --theirs foo
|
|
run dolt sql -q 'select count(*) from foo'
|
|
[ "$status" -eq 0 ]
|
|
[[ "$output" =~ "| 3 |" ]] || false
|
|
dolt merge --abort
|
|
dolt reset --hard
|
|
}
|