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

Small & (hopefully) last fixes

Browse Source
This commit is contained in:
Nathan Gabrielson
2025-06-27 14:29:10 -07:00
parent f515cefdba
commit 51c4d71af2
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
go/cmd/dolt/cli/arg_parser_helpers.go
View File

@@ -333,7 +333,6 @@ func CreateRmArgParser() *argparser.ArgParser {
ap := argparser.NewArgParserWithVariableArgs("rm")
ap.ArgListHelp = append(ap.ArgListHelp, [2]string{"table", "table(s) to remove from the list of tables staged to be committed."})
ap.SupportsFlag(CachedFlag, "", "Use this option to unstage and remove tables only from the index. Working tree tables, whether modified or not, will be left alone.") //TODO
return ap
}

7
go/libraries/doltcore/sqle/dprocedures/dolt_rm.go
View File

@@ -86,11 +86,14 @@ func doDoltRm(ctx *sql.Context, args []string) (int, error) {
return 1, err
}
// If --cached was not used, we want to fully delete the tables, so we remove them from the working set as well.
// RemoveTables() validates foreign keys, and the above call will not catch foreign key constraints on tables that
// exist only in the working set. So we need to run the below line on each dolt_rm() to avoid wiping constrained tables.
newWorking, err := roots.Working.RemoveTables(ctx, false, false, verifiedTables...)
if err != nil {
return 1, err
}
// If --cached was not used, we want to fully delete the tables, so we remove them from the working set as well.
if !checkStaged {
roots.Working = newWorking
}
@@ -163,7 +166,7 @@ func verifyTables(ctx *sql.Context, unqualifiedTables []string, checkStaged bool
}
// hasUnstagedChanges checks the HEAD and staged roots for the table, then compares them against the table in the working root.
// okStaged and okHead are booleans identifying if the table exists in the staged root, or the head root, respectively.
// inStaged and inHead are booleans identifying if the table exists in the staged root, or the head root, respectively.
func hasUnstagedChanges(ctx *sql.Context, roots doltdb.Roots, name string, inStaged bool, inHead bool) (bool, error) {
checkTableChanges := func(rootVal doltdb.RootValue) (bool, error) {
tableDiff, err := diff.GetTableDeltas(ctx, rootVal, roots.Working)