mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-04-22 19:43:51 -05:00
Code Issues Packages Projects Releases 156 Wiki Activity

fixed diff output

Browse Source
This commit is contained in:
Zach Musgrave
2022-06-28 09:35:45 -07:00
parent 86402bd34b
commit e528a398ad
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
integration-tests/bats/json.bats
+9 -9
View File
@@ -3,7 +3,7 @@ load $BATS_TEST_DIRNAME/helper/common.bash
setup() {
setup_common
skip_nbf_dolt_1
skip_nbf_dolt_1 "works fine but formatting of json strings is different"
}
teardown() {
@@ -99,14 +99,14 @@ SQL
run dolt diff
[ "$status" -eq 0 ]
[ "${lines[0]}" = 'diff --dolt a/js b/js' ]
[ "${lines[3]}" = '+-----+----+-----------+' ]
[ "${lines[4]}" = '| | pk | js |' ]
[ "${lines[5]}" = '+-----+----+-----------+' ]
[ "${lines[6]}" = '| < | 1 | {"a": 1} |' ]
[ "${lines[7]}" = '| > | 1 | {"a": 11} |' ]
[ "${lines[8]}" = '| - | 2 | {"b": 2} |' ]
[ "${lines[9]}" = '| + | 3 | {"c": 3} |' ]
[ "${lines[10]}" = '+-----+----+-----------+' ]
[ "${lines[3]}" = '+---+----+-----------+' ]
[ "${lines[4]}" = '| | pk | js |' ]
[ "${lines[5]}" = '+---+----+-----------+' ]
[ "${lines[6]}" = '| < | 1 | {"a": 1} |' ]
[ "${lines[7]}" = '| > | 1 | {"a": 11} |' ]
[ "${lines[8]}" = '| - | 2 | {"b": 2} |' ]
[ "${lines[9]}" = '| + | 3 | {"c": 3} |' ]
[ "${lines[10]}" = '+---+----+-----------+' ]
}
@test "json: merge JSON values" {