Skip to content

Version Command Refactor #7727

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 10, 2024
Merged

Version Command Refactor #7727

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
259d41b
refactor version to make it useable in doltgres
bheni Apr 10, 2024
f9e10ab
formatting
bheni Apr 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion go/cmd/dolt/commands/version.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ The out-of-date check can be disabled by running {{.EmphasisLeft}}dolt config --
}

type VersionCmd struct {
BinaryName string
VersionStr string
}

Expand Down Expand Up @@ -90,7 +91,15 @@ func (cmd VersionCmd) Exec(ctx context.Context, commandStr string, args []string
help, usage := cli.HelpAndUsagePrinters(cli.CommandDocsForCommandString(commandStr, versionDocs, ap))
apr := cli.ParseArgsOrDie(ap, args, help)

cli.Println("dolt version", cmd.VersionStr)
return cmd.ExecWithArgParser(ctx, apr, usage, dEnv)
}

func (cmd VersionCmd) ExecWithArgParser(ctx context.Context, apr *argparser.ArgParseResults, usage cli.UsagePrinter, dEnv *env.DoltEnv) int {
binName := "dolt"
if cmd.BinaryName != "" {
binName = cmd.BinaryName
}
cli.Printf("%s version %s\n", binName, cmd.VersionStr)

versionCheckDisabled := dEnv.Config.GetStringOrDefault(config.VersionCheckDisabled, "false")
if versionCheckDisabled == "false" {
Expand Down
2 changes: 1 addition & 1 deletion go/cmd/dolt/dolt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import (
"encoding/binary"
"errors"
"fmt"
"github.com/dolthub/dolt/go/cmd/dolt/doltversion"
"math/rand"
"net/http"
_ "net/http/pprof"
Expand Down Expand Up @@ -53,6 +52,7 @@ import (
"github.com/dolthub/dolt/go/cmd/dolt/commands/sqlserver"
"github.com/dolthub/dolt/go/cmd/dolt/commands/stashcmds"
"github.com/dolthub/dolt/go/cmd/dolt/commands/tblcmds"
"github.com/dolthub/dolt/go/cmd/dolt/doltversion"
"github.com/dolthub/dolt/go/libraries/doltcore/dbfactory"
"github.com/dolthub/dolt/go/libraries/doltcore/dconfig"
"github.com/dolthub/dolt/go/libraries/doltcore/doltdb"
Expand Down