First rm stuff

This commit is contained in:
Nathan Gabrielson
2025-06-18 16:33:22 -07:00
parent a7bbe9b377
commit 8063ad830b
3 changed files with 61 additions and 0 deletions

View File

@@ -329,6 +329,13 @@ func CreateReflogArgParser() *argparser.ArgParser {
return ap
}
func CreateRmArgParser() *argparser.ArgParser {
ap := argparser.NewArgParserWithVariableArgs("add")
ap.ArgListHelp = append(ap.ArgListHelp, [2]string{"table", "table(s) to remove from the list of tables staged to be committed."})
return ap
}
func CreateCreateCommitParser() *argparser.ArgParser {
ap := argparser.NewArgParserWithMaxArgs("createchunk commit", 0)
ap.SupportsString(AuthorParam, "", "author", "Specify an explicit author using the standard A U Thor {{.LessThan}}author@example.com{{.GreaterThan}} format.")

View File

@@ -0,0 +1,53 @@
// Copyright 2025 Dolthub, Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package dprocedures
import (
"fmt"
"github.com/dolthub/dolt/go/cmd/dolt/cli"
"github.com/dolthub/dolt/go/libraries/doltcore/branch_control"
"github.com/dolthub/go-mysql-server/sql"
)
// doltAdd is the stored procedure version for the CLI command `dolt add`.
func doltRm(ctx *sql.Context, args ...string) (sql.RowIter, error) {
res, err := doDoltRm(ctx, args)
if err != nil {
return nil, err
}
return rowToIter(int64(res)), nil
}
func doDoltRm(ctx *sql.Context, args []string) (int, error) {
dbName := ctx.GetCurrentDatabase()
if len(dbName) == 0 {
return 1, fmt.Errorf("Empty database name.")
}
if err := branch_control.CheckAccess(ctx, branch_control.Permissions_Write); err != nil {
return 1, err
}
apr, err := cli.CreateRmArgParser().Parse(args)
if err != nil {
return 1, err
}
if apr.NArg() == 0 {
return 1, fmt.Errorf("Nothing specified, nothing added. Maybe you wanted to say 'dolt add .'?")
}
return 0, nil
}

View File

@@ -36,6 +36,7 @@ var DoltProcedures = []sql.ExternalStoredProcedureDetails{
{Name: "dolt_update_column_tag", Schema: int64Schema("status"), Function: doltUpdateColumnTag, AdminOnly: true},
{Name: "dolt_purge_dropped_databases", Schema: int64Schema("status"), Function: doltPurgeDroppedDatabases, AdminOnly: true},
{Name: "dolt_rebase", Schema: doltRebaseProcedureSchema, Function: doltRebase},
{Name: "dolt_rm", Schema: int64Schema("status"), Function: doltRm},
{Name: "dolt_gc", Schema: int64Schema("status"), Function: doltGC, ReadOnly: true, AdminOnly: true},
{Name: "dolt_thread_dump", Schema: stringSchema("thread_dump"), Function: doltThreadDump, ReadOnly: true, AdminOnly: true},