GOMODULES
/
goose
mirror of https://github.com/pressly/goose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove trailing newline from log calls (#878)

pull/896/head
Patrik Lundin 2025-01-29 15:19:40 +01:00 committed by GitHub
parent a63d1ef48e
commit 9c748e24f4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/goose/main.go
View File

@ -151,11 +151,11 @@ func main() {
driver, dbstring, command := args[0], args[1], args[2] driver, dbstring, command := args[0], args[1], args[2]
db, err := goose.OpenDBWithDriver(driver, normalizeDBString(driver, dbstring, *certfile, *sslcert, *sslkey)) db, err := goose.OpenDBWithDriver(driver, normalizeDBString(driver, dbstring, *certfile, *sslcert, *sslkey))
if err != nil { if err != nil {
log.Fatalf("-dbstring=%q: %v\n", dbstring, err) log.Fatalf("-dbstring=%q: %v", dbstring, err)
} }
defer func() { defer func() {
if err := db.Close(); err != nil { if err := db.Close(); err != nil {
log.Fatalf("goose: failed to close DB: %v\n", err) log.Fatalf("goose: failed to close DB: %v", err)
} }
}() }()

2
create.go
View File

@ -76,7 +76,7 @@ func CreateWithTemplate(db *sql.DB, dir string, tmpl *template.Template, name, m
return fmt.Errorf("failed to execute tmpl: %w", err) return fmt.Errorf("failed to execute tmpl: %w", err)
} }
log.Printf("Created new file: %s\n", f.Name()) log.Printf("Created new file: %s", f.Name())
return nil return nil
} }

8
down.go
View File

@ -68,17 +68,17 @@ func DownToContext(ctx context.Context, db *sql.DB, dir string, version int64, o
} }
if currentVersion == 0 { if currentVersion == 0 {
log.Printf("goose: no migrations to run. current version: %d\n", currentVersion) log.Printf("goose: no migrations to run. current version: %d", currentVersion)
return nil return nil
} }
current, err := migrations.Current(currentVersion) current, err := migrations.Current(currentVersion)
if err != nil { if err != nil {
log.Printf("goose: migration file not found for current version (%d), error: %s\n", currentVersion, err) log.Printf("goose: migration file not found for current version (%d), error: %s", currentVersion, err)
return err return err
} }
if current.Version <= version { if current.Version <= version {
log.Printf("goose: no migrations to run. current version: %d\n", currentVersion) log.Printf("goose: no migrations to run. current version: %d", currentVersion)
return nil return nil
} }
@ -102,6 +102,6 @@ func downToNoVersioning(ctx context.Context, db *sql.DB, migrations Migrations,
return err return err
} }
} }
log.Printf("goose: down to current file version: %d\n", finalVersion) log.Printf("goose: down to current file version: %d", finalVersion)
return nil return nil
} }

4
examples/go-migrations/main.go
View File

@ -30,12 +30,12 @@ func main() {
db, err := goose.OpenDBWithDriver("sqlite", dbstring) db, err := goose.OpenDBWithDriver("sqlite", dbstring)
if err != nil { if err != nil {
log.Fatalf("goose: failed to open DB: %v\n", err) log.Fatalf("goose: failed to open DB: %v", err)
} }
defer func() { defer func() {
if err := db.Close(); err != nil { if err := db.Close(); err != nil {
log.Fatalf("goose: failed to close DB: %v\n", err) log.Fatalf("goose: failed to close DB: %v", err)
} }
}() }()

8
migration.go
View File

@ -232,9 +232,9 @@ func (m *Migration) run(ctx context.Context, db *sql.DB, direction bool) error {
finish := truncateDuration(time.Since(start)) finish := truncateDuration(time.Since(start))
if len(statements) > 0 { if len(statements) > 0 {
log.Printf("OK %s (%s)\n", filepath.Base(m.Source), finish) log.Printf("OK %s (%s)", filepath.Base(m.Source), finish)
} else { } else {
log.Printf("EMPTY %s (%s)\n", filepath.Base(m.Source), finish) log.Printf("EMPTY %s (%s)", filepath.Base(m.Source), finish)
} }
case ".go": case ".go":
@ -280,9 +280,9 @@ func (m *Migration) run(ctx context.Context, db *sql.DB, direction bool) error {
} }
finish := truncateDuration(time.Since(start)) finish := truncateDuration(time.Since(start))
if !empty { if !empty {
log.Printf("OK %s (%s)\n", filepath.Base(m.Source), finish) log.Printf("OK %s (%s)", filepath.Base(m.Source), finish)
} else { } else {
log.Printf("EMPTY %s (%s)\n", filepath.Base(m.Source), finish) log.Printf("EMPTY %s (%s)", filepath.Base(m.Source), finish)
} }
} }
return nil return nil

12
status.go
View File

@ -26,10 +26,10 @@ func StatusContext(ctx context.Context, db *sql.DB, dir string, opts ...OptionsF
return fmt.Errorf("failed to collect migrations: %w", err) return fmt.Errorf("failed to collect migrations: %w", err)
} }
if option.noVersioning { if option.noVersioning {
log.Printf(" Applied At Migration\n") log.Printf(" Applied At Migration")
log.Printf(" =======================================\n") log.Printf(" =======================================")
for _, current := range migrations { for _, current := range migrations {
log.Printf(" %-24s -- %v\n", "no versioning", filepath.Base(current.Source)) log.Printf(" %-24s -- %v", "no versioning", filepath.Base(current.Source))
} }
return nil return nil
} }
@ -39,8 +39,8 @@ func StatusContext(ctx context.Context, db *sql.DB, dir string, opts ...OptionsF
return fmt.Errorf("failed to ensure DB version: %w", err) return fmt.Errorf("failed to ensure DB version: %w", err)
} }
log.Printf(" Applied At Migration\n") log.Printf(" Applied At Migration")
log.Printf(" =======================================\n") log.Printf(" =======================================")
for _, migration := range migrations { for _, migration := range migrations {
if err := printMigrationStatus(ctx, db, migration.Version, filepath.Base(migration.Source)); err != nil { if err := printMigrationStatus(ctx, db, migration.Version, filepath.Base(migration.Source)); err != nil {
return fmt.Errorf("failed to print status: %w", err) return fmt.Errorf("failed to print status: %w", err)
@ -59,6 +59,6 @@ func printMigrationStatus(ctx context.Context, db *sql.DB, version int64, script
if m != nil && m.IsApplied { if m != nil && m.IsApplied {
appliedAt = m.Timestamp.Format(time.ANSIC) appliedAt = m.Timestamp.Format(time.ANSIC)
} }
log.Printf(" %-24s -- %v\n", appliedAt, script) log.Printf(" %-24s -- %v", appliedAt, script)
return nil return nil
} }

6
up.go
View File

@ -122,9 +122,9 @@ func UpToContext(ctx context.Context, db *sql.DB, dir string, version int64, opt
return err return err
} }
log.Printf("goose: no migrations to run. current version: %d\n", current) log.Printf("goose: no migrations to run. current version: %d", current)
} else { } else {
log.Printf("goose: successfully migrated database to version: %d\n", current) log.Printf("goose: successfully migrated database to version: %d", current)
} }
// At this point there are no more migrations to apply. But we need to maintain // At this point there are no more migrations to apply. But we need to maintain
@ -153,7 +153,7 @@ func upToNoVersioning(ctx context.Context, db *sql.DB, migrations Migrations, ve
} }
finalVersion = current.Version finalVersion = current.Version
} }
log.Printf("goose: up to current file version: %d\n", finalVersion) log.Printf("goose: up to current file version: %d", finalVersion)
return nil return nil
} }

4
version.go
View File

@ -27,7 +27,7 @@ func VersionContext(ctx context.Context, db *sql.DB, dir string, opts ...Options
if len(migrations) > 0 { if len(migrations) > 0 {
current = migrations[len(migrations)-1].Version current = migrations[len(migrations)-1].Version
} }
log.Printf("goose: file version %v\n", current) log.Printf("goose: file version %v", current)
return nil return nil
} }
@ -35,7 +35,7 @@ func VersionContext(ctx context.Context, db *sql.DB, dir string, opts ...Options
if err != nil { if err != nil {
return err return err
} }
log.Printf("goose: version %v\n", current) log.Printf("goose: version %v", current)
return nil return nil
} }