Skip to content
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

cmd/atlas/internal/cmdapi: add advisory lock timeout flag for schema apply #3285

Merged
merged 1 commit into from
Dec 27, 2024
Merged

cmd/atlas/internal/cmdapi: add advisory lock timeout flag for schema apply #3285

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 15 additions & 12 deletions cmd/atlas/internal/cmdapi/schema.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import (
"path/filepath"
"strings"
"text/template"
"time"

"ariga.io/atlas/cmd/atlas/internal/cmdext"
"ariga.io/atlas/cmd/atlas/internal/cmdlog"
Expand All @@ -40,18 +41,19 @@ func schemaCmd() *cobra.Command {
}

type schemaApplyFlags struct {
url string // URL of database to apply the changes on.
devURL string // URL of the dev database.
paths []string // Paths to HCL files.
toURLs []string // URLs of the desired state.
planURL string // URL to a pre-planned migration.
schemas []string // Schemas to take into account when diffing.
exclude []string // List of glob patterns used to filter resources from applying (see schema.InspectOptions).
dryRun bool // Only show SQL on screen instead of applying it.
edit bool // Open the generated SQL in an editor.
autoApprove bool // Don't prompt for approval before applying SQL.
logFormat string // Log format.
txMode string // (none, file)
url string // URL of database to apply the changes on.
devURL string // URL of the dev database.
paths []string // Paths to HCL files.
toURLs []string // URLs of the desired state.
planURL string // URL to a pre-planned migration.
schemas []string // Schemas to take into account when diffing.
exclude []string // List of glob patterns used to filter resources from applying (see schema.InspectOptions).
dryRun bool // Only show SQL on screen instead of applying it.
edit bool // Open the generated SQL in an editor.
autoApprove bool // Don't prompt for approval before applying SQL.
logFormat string // Log format.
txMode string // (none, file)
lockTimeout time.Duration // Lock timeout.
}

// check that the flags are valid before running the command.
Expand Down Expand Up @@ -123,6 +125,7 @@ migration.`,
cmd.Flags().StringVarP(&flags.txMode, flagTxMode, "", txModeFile, "set transaction mode [none, file]")
cmd.Flags().StringVarP(&flags.planURL, flagPlan, "", "", "URL to a pre-planned migration (e.g., atlas://repo/plans/name)")
cmd.Flags().BoolVarP(&flags.edit, flagEdit, "", false, "open the generated SQL in an editor")
addFlagLockTimeout(cmd.Flags(), &flags.lockTimeout)
// Hidden support for the deprecated -f flag.
cmd.Flags().StringSliceVarP(&flags.paths, flagFile, "f", nil, "[paths...] file or directory containing HCL or SQL files")
cobra.CheckErr(cmd.Flags().MarkHidden(flagFile))
Expand Down
Loading