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

one last test, probably

Browse Source
This commit is contained in:
James Cor
2022-09-28 13:23:41 -07:00
parent b3af84be09
commit c555f0b16c
1 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
integration-tests/bats/merge.bats
+20 -1
View File
@@ -379,7 +379,6 @@ SQL
run dolt merge other --no-commit
log_status_eq 0
[[ "$output" =~ "CONFLICT" ]] || false
dolt conflicts resolve --theirs dolt_schemas
run dolt conflicts resolve --theirs dolt_schemas
log_status_eq 0
run dolt sql -q "select name from dolt_schemas" -r csv
@@ -387,6 +386,26 @@ SQL
[[ "$output" =~ "c1c1" ]] || false
}
@test "merge: Add views on two branches, merge with stored procedure" {
dolt branch other
dolt sql -q "CREATE VIEW pkpk AS SELECT pk*pk FROM test1;"
dolt add . && dolt commit -m "added view on table test1"
dolt checkout other
dolt sql -q "CREATE VIEW c1c1 AS SELECT c1*c1 FROM test2;"
dolt add . && dolt commit -m "added view on table test2"
dolt checkout main
run dolt merge other --no-commit
log_status_eq 0
[[ "$output" =~ "CONFLICT" ]] || false
run dolt sql -q "call dolt_conflicts_resolve('--theirs', 'dolt_schemas')"
log_status_eq 0
run dolt sql -q "select name from dolt_schemas" -r csv
log_status_eq 0
[[ "$output" =~ "c1c1" ]] || false
}
@test "merge: Add views on two branches, merge without conflicts" {
dolt branch other
dolt sql -q "CREATE VIEW pkpk AS SELECT pk*pk FROM test1;"