mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-02-09 18:59:12 -06:00
Code Issues Packages Projects Releases 127 Wiki Activity

Merge pull request #1975 from dolthub/vinai/slight-bats-edit

Browse Source 
[no-release-notes] Vinai/slight bats edit
This commit is contained in:
AndyA
2021-08-04 09:44:37 -07:00
committed by GitHub
parent 8de4ac62b1 6a1c5ded21
commit fefabca3eb
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
integration-tests/bats/sql-merge.bats
View File

@@ -118,6 +118,10 @@ SQL
[ $status -eq 0 ]
[[ "$output" =~ "true" ]] || false
[[ "$output" =~ "true" ]] || false
[[ "${lines[26]}" =~ "DOLT_MERGE('feature-branch')" ]] || false # validate that merge returns 1 not "Updating..."
[[ "${lines[28]}" =~ "1" ]] || false
! [[ "$output" =~ "Updating" ]] || false
run dolt sql -q "SELECT * FROM test" -r csv
[ $status -eq 0 ]
@@ -283,10 +287,11 @@ SELECT DOLT_MERGE('feature-branch');
SELECT * FROM dolt_conflicts;
SELECT DOLT_MERGE('--abort');
SQL
[ $status -eq 0 ]
[[ "$output" =~ "table,num_conflicts" ]] || false
[[ "$output" =~ "one_pk,1" ]] || false
[[ "${lines[2]}" =~ "table,num_conflicts" ]] || false
[[ "${lines[3]}" =~ "one_pk,1" ]] || false
[[ "${lines[4]}" =~ "DOLT_MERGE('--abort')" ]] || false
[[ "${lines[5]}" =~ "1" ]] || false
# now resolve commits
run dolt sql --disable-batch << SQL