fix: open Postgres for one-shot console commands

This commit is contained in:
Jakub Zych
2026-10-07 13:35:59 +02:00
parent 7a6fa0e8b6
commit 24b16b1f10
4 changed files with 126 additions and 46 deletions

View File

@@ -4,6 +4,7 @@ import (
"context"
"database/sql"
"embed"
"fmt"
"io/fs"
"log/slog"
"net/http"
@@ -18,6 +19,7 @@ import (
"git.golem15.com/golem15/summercms/modules/backpack"
"git.golem15.com/golem15/summercms/modules/bonfire"
"git.golem15.com/golem15/summercms/modules/bouncer"
"git.golem15.com/golem15/summercms/modules/lagoon"
"git.golem15.com/golem15/summercms/modules/pact"
"git.golem15.com/golem15/summercms/modules/party"
"git.golem15.com/golem15/summercms/modules/surf"
@@ -201,7 +203,25 @@ func (p *Plugin) MailLayouts() map[string]string {
}
func (p *Plugin) Commands() []bonfire.Command {
return append([]bonfire.Command{console.RequirePasswordChange(p.app)}, console.APITokenCommands(p.app)...)
return append([]bonfire.Command{console.RequirePasswordChange(p.withDB)}, console.APITokenCommands(p.app, p.withDB)...)
}
// withDB runs fn with the application's database: the one the serve command
// published, or, when a console command runs, one opened from the config for
// the duration of fn.
func (p *Plugin) withDB(ctx context.Context, fn func(*gorm.DB) error) error {
if p == nil || p.app == nil {
return fmt.Errorf("golem15.user: app is nil")
}
if gdb, ok := p.app.Lookup[*gorm.DB](); ok && gdb != nil {
return fn(gdb)
}
sqlDB, gdb, err := lagoon.OpenFromApp(ctx, p.app)
if err != nil {
return err
}
defer sqlDB.Close()
return fn(gdb)
}
func (p *Plugin) Migrations() []*gormigrate.Migration { return updates.All() }