From bac13847ab214fb38d12762ef680f942122a9177 Mon Sep 17 00:00:00 2001 From: r0masik Date: Thu, 28 Nov 2024 15:03:47 +0300 Subject: [PATCH 1/2] fix: return joined err when try to get migrations list --- migrate.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/migrate.go b/migrate.go index 22769ffc5..5ef8b868d 100644 --- a/migrate.go +++ b/migrate.go @@ -213,7 +213,11 @@ func EnsureDBVersion(db *sql.DB) (int64, error) { func EnsureDBVersionContext(ctx context.Context, db *sql.DB) (int64, error) { dbMigrations, err := store.ListMigrations(ctx, db, TableName()) if err != nil { - return 0, createVersionTable(ctx, db) + createErr := createVersionTable(ctx, db) + if createErr != nil { + return 0, errors.Join(err, createErr) + } + return 0, nil } // The most recent record for each migration specifies // whether it has been applied or rolled back. From 123ec9c4ffc84128503f6a611d947e2417fc029e Mon Sep 17 00:00:00 2001 From: r0masik Date: Tue, 4 Feb 2025 00:37:13 +0300 Subject: [PATCH 2/2] fix: errors.Join replaced with go.uber.org/multierr --- migrate.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/migrate.go b/migrate.go index 5ef8b868d..32c9e81a6 100644 --- a/migrate.go +++ b/migrate.go @@ -5,6 +5,7 @@ import ( "database/sql" "errors" "fmt" + "go.uber.org/multierr" "io/fs" "math" "path" @@ -215,7 +216,7 @@ func EnsureDBVersionContext(ctx context.Context, db *sql.DB) (int64, error) { if err != nil { createErr := createVersionTable(ctx, db) if createErr != nil { - return 0, errors.Join(err, createErr) + return 0, multierr.Append(err, createErr) } return 0, nil }