mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-05-19 02:59:21 -05:00
Code Issues Packages Projects Releases 166 Wiki Activity

bats: rework results matching for schema-conflicts.bats

Browse Source
This commit is contained in:
Andy Arthur
2023-04-24 16:20:15 -07:00
parent c38eaba414
commit 4edc80f7b6
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
integration-tests/bats/schema-conflicts.bats
+12 -10
View File
@@ -31,12 +31,13 @@ setup_schema_conflict() {
dolt sql -q "call dolt_merge('other')"
run dolt sql -q "select * from dolt_schema_conflicts" -r vertical
dolt sql -q "select * from dolt_schema_conflicts" -r csv
run dolt sql -q "select our_schema from dolt_schema_conflicts" -r csv
[ "$status" -eq 0 ]
[[ "$output" =~ "table_name: t" ]]
[[ "$output" =~ "our_schema: create table t (pk int primary key, c0 varchar(20))" ]]
[[ "$output" =~ "their_schema: create table t (pk int primary key, c0 datetime)" ]]
[[ "$output" =~ "description: " ]]
[[ "$output" =~ "varchar(20)," ]]
run dolt sql -q "select their_schema from dolt_schema_conflicts" -r csv
[ "$status" -eq 0 ]
[[ "$output" =~ "datetime(6)," ]]
}
@test "schema-conflicts: cli merge, query schema conflicts" {
@@ -44,12 +45,13 @@ setup_schema_conflict() {
dolt merge other
run dolt sql -q "select * from dolt_schema_conflicts" -r vertical
dolt sql -q "select * from dolt_schema_conflicts" -r csv
run dolt sql -q "select our_schema from dolt_schema_conflicts" -r csv
[ "$status" -eq 0 ]
[[ "$output" =~ "table_name: t" ]]
[[ "$output" =~ "our_schema: create table t (pk int primary key, c0 varchar(20))" ]]
[[ "$output" =~ "their_schema: create table t (pk int primary key, c0 datetime)" ]]
[[ "$output" =~ "description: " ]]
[[ "$output" =~ "varchar(20)," ]]
run dolt sql -q "select their_schema from dolt_schema_conflicts" -r csv
[ "$status" -eq 0 ]
[[ "$output" =~ "datetime(6)," ]]
}
@test "schema-conflicts: resolve schema conflict with 'ours' via SQL" {