Skip to content

fix(db): repair main after the #103/#105 semantic merge conflict #106

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
gustavobertoi merged 1 commit into from
Jul 1, 2026
Merged

fix(db): repair main after the #103/#105 semantic merge conflict #106

Show file tree
Hide file tree
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
7 changes: 6 additions & 1 deletion internal/cli/db.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,12 @@ func newDbPullCmd(g *GlobalOpts) *cobra.Command {
return err
}
defer closeFn()
dumper := defaultPgDumper()
// db pull is Postgres-only; SelectDumper replaced the defaultPgDumper
// helper when snapshot/restore gained Redis+MinIO dumpers (#105).
dumper, err := orchestrate.SelectDumper(d, "pg")
if err != nil {
return err
}
if err := dumper.Preflight(cmd.Context()); err != nil {
return err
}
Expand Down
4 changes: 3 additions & 1 deletion internal/orchestrate/reset.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,9 @@ const terminateBackendsSQL = `SELECT pg_terminate_backend(pid) FROM pg_stat_acti
// terminate → DROP → re-provision DDL runs inside the flock; the loopback overlay
// is applied outside it (engineTarget self-locks the port allocation).
func Reset(ctx context.Context, d UpDeps, opt ResetOptions) (ResetResult, error) {
proj, dbName, inst, err := resolveTenant(d, opt.Project, opt.Database, opt.Instance)
// db reset is Postgres-only; pass the "pg" kind and ignore the engine/label
// returns added when snapshot/restore gained Redis+MinIO dumpers (#105).
proj, dbName, inst, _, _, err := resolveTenant(d, "pg", opt.Project, opt.Database, opt.Instance)
if err != nil {
return ResetResult{}, err
}
Expand Down
Loading