Revert "added AUTO_INCREMENT merge BATS"

This reverts commit f5f90b6eed.
This commit is contained in:
Andy Arthur
2020-11-04 17:16:54 -08:00
parent f5f90b6eed
commit a0e06466aa
-43
View File
@@ -228,47 +228,4 @@ SQL
run dolt sql -q "CREATE TABLE bad (pk1 int AUTO_INCREMENT DEFAULT 10, c0 int);"
[ "$status" -ne 0 ]
[[ "$output" =~ "there can be only one auto_increment column and it must be defined as a key" ]] || false
}
@test "AUTO_INCREMENT merge master branch ahead" {
dolt sql -q "INSERT INTO test (c0) VALUES (0),(1),(2)"
dolt add -A
dolt commit -m "made some inserts"
dolt checkout -b other
dolt sql -q "INSERT INTO test VALUES (10,10),(NULL,11);"
dolt add -A
dolt commit -m "inserted 10 & 11 on other"
dolt checkout master
dolt sql -q "INSERT INTO test VALUES (20,20),(NULL,21);"
dolt merge other
dolt sql -q "INSERT INTO test VALUES (NULL,22);"
run dolt sql -q "SELECT pk FROM test WHERE c0 = 22;" -r csv
[ "$status" -eq 0 ]
[[ "$output" =~ "22" ]] || false
}
@test "AUTO_INCREMENT merge other branch ahead" {
dolt sql -q "INSERT INTO test (c0) VALUES (0),(1),(2)"
dolt add -A
dolt commit -m "made some inserts"
dolt branch other
dolt sql -q "INSERT INTO test VALUES (10,10),(NULL,11);"
dolt add -A
dolt commit -m "inserted 10 & 11 on master"
dolt checkout other
dolt sql -q "INSERT INTO test VALUES (20,20),(NULL,21);"
dolt add -A
dolt commit -m "inserted 20 & 21 on other"
dolt checkout master
dolt merge other
dolt sql -q "INSERT INTO test VALUES (NULL,22);"
run dolt sql -q "SELECT pk FROM test WHERE c0 = 22;" -r csv
[ "$status" -eq 0 ]
[[ "$output" =~ "22" ]] || false
}