From bf9f55ae8cebaee14bea35c1b26e6ed2418bd515 Mon Sep 17 00:00:00 2001 From: Fs02 Date: Wed, 22 Jun 2022 20:02:52 +0900 Subject: [PATCH] Pass context to schema.Do --- go.mod | 2 +- go.sum | 3 +++ migration.go | 2 +- migration_test.go | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index a5f7a5a..932a586 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/go-rel/migration go 1.15 require ( - github.com/go-rel/rel v0.34.0 + github.com/go-rel/rel v0.35.1-0.20220622105908-8347a7decaa8 github.com/go-rel/reltest v0.9.0 github.com/stretchr/testify v1.7.4 ) diff --git a/go.sum b/go.sum index ea7f53d..62397d8 100644 --- a/go.sum +++ b/go.sum @@ -6,6 +6,8 @@ github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWo github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/go-rel/rel v0.34.0 h1:dynBkxkVOHxFMHtu3p8vdvAMjjCm+Yi2J0tJsjeoVjQ= github.com/go-rel/rel v0.34.0/go.mod h1:YDHtnJhlaiSjANLGiZXvI57jg1amfpJSJlOimq6WJTE= +github.com/go-rel/rel v0.35.1-0.20220622105908-8347a7decaa8 h1:c+lu89mMX5YT2ECdOtoceMAIARoxr6hm0axwTgATI/M= +github.com/go-rel/rel v0.35.1-0.20220622105908-8347a7decaa8/go.mod h1:SHjO9VOInj8GD2cTVWmTnOS+rj5IJZoDy8LEyd5oDUQ= github.com/go-rel/reltest v0.9.0 h1:OTBY2dD/hNXaH5r1XXIHRdni6QGCmFaQm1pFAFkg1ok= github.com/go-rel/reltest v0.9.0/go.mod h1:Eu1JNASF6TfiktPlmvWEYHp+UejmGl9MmKRWieHxkXo= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= @@ -46,6 +48,7 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.4 h1:wZRexSlwd7ZXfKINDLsO4r7WBt3gTKONc6K/VesHvHM= github.com/stretchr/testify v1.7.4/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= +github.com/subosito/gotenv v1.4.0/go.mod h1:mZd6rFysKEcUhUHXJk0C/08wAgyDBFuwEYL7vWWGaGo= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= diff --git a/migration.go b/migration.go index b7a0a37..98ebe9b 100644 --- a/migration.go +++ b/migration.go @@ -158,7 +158,7 @@ func (m *Migration) run(ctx context.Context, migrations []rel.Migration) { adapter := m.repo.Adapter(ctx) for _, migration := range migrations { if fn, ok := migration.(rel.Do); ok { - check(fn(m.repo)) + check(fn(ctx, m.repo)) } else { check(adapter.Apply(ctx, migration)) } diff --git a/migration_test.go b/migration_test.go index 4d8ad43..90dbe34 100644 --- a/migration_test.go +++ b/migration_test.go @@ -35,7 +35,7 @@ func TestMigration(t *testing.T) { t.ID("id") }) - schema.Do(func(repo rel.Repository) error { + schema.Do(func(ctx context.Context, repo rel.Repository) error { assert.NotNil(t, repo) return nil })