Skip to content

Commit 3682f34

Browse files
committed
Make sure dolt_tests changes show up in dolt diff by default
1 parent 544f298 commit 3682f34

File tree

2 files changed

+42
-1
lines changed

2 files changed

+42
-1
lines changed

go/cmd/dolt/commands/diff.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -371,6 +371,7 @@ func parseDiffTableSetSql(queryist cli.Queryist, sqlCtx *sql.Context, datasets *
371371
var doltSystemTables = []string{
372372
"dolt_procedures",
373373
"dolt_schemas",
374+
"dolt_tests",
374375
}
375376

376377
func getTableNamesAtRef(queryist cli.Queryist, sqlCtx *sql.Context, ref string) (map[string]bool, error) {

integration-tests/bats/diff.bats

Lines changed: 41 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2206,4 +2206,44 @@ EOF
22062206

22072207
run $BATS_TEST_DIRNAME/diff-system.expect
22082208
[ "$status" -eq 0 ]
2209-
}
2209+
}
2210+
@test "diff: dolt_tests system table changes should show in dolt diff and dolt status" {
2211+
# Create a test in dolt_tests system table
2212+
dolt sql -q "INSERT INTO dolt_tests VALUES ('test1', 'description', 'SELECT 1', 'expected_rows', '==', '1')"
2213+
2214+
# Check that the change shows up in dolt status
2215+
run dolt status
2216+
[ "$status" -eq 0 ]
2217+
[[ "$output" =~ "dolt_tests" ]] || false
2218+
2219+
# Check that the change shows up in dolt diff with --system flag
2220+
run dolt diff --system
2221+
[ "$status" -eq 0 ]
2222+
[[ "$output" =~ "dolt_tests" ]] || false
2223+
2224+
# Issue: dolt_tests system table modifications do not appear in dolt diff output without --system flag
2225+
skip "Issue: dolt_tests system table modifications do not appear in dolt diff output without --system flag"
2226+
2227+
# Check that the change shows up in dolt diff without --system flag
2228+
run dolt diff
2229+
[ "$status" -eq 0 ]
2230+
[[ "$output" =~ "dolt_tests" ]] || false
2231+
2232+
# Commit the change
2233+
dolt add .
2234+
dolt commit -m "Added test to dolt_tests"
2235+
2236+
# Modify the test
2237+
dolt sql -q "UPDATE dolt_tests SET test_group = 'updated description' WHERE test_name = 'test1'"
2238+
2239+
# Check that the modification shows up in dolt status
2240+
run dolt status
2241+
[ "$status" -eq 0 ]
2242+
[[ "$output" =~ "dolt_tests" ]] || false
2243+
2244+
# Check that the modification shows up in dolt diff without --system flag
2245+
run dolt diff
2246+
[ "$status" -eq 0 ]
2247+
[[ "$output" =~ "dolt_tests" ]] || false
2248+
[[ "$output" =~ "updated description" ]] || false
2249+
}

0 commit comments

Comments
 (0)