@@ -69,14 +69,6 @@ type Migration struct {
69
69
Revert string // Revert query
70
70
}
71
71
72
- // MigrationFn gives ability to use Go functions as migrations.
73
- type MigrationFn func (ctx context.Context , conn Conn ) error
74
-
75
- // Conn represents a connection to the database.
76
- type Conn interface {
77
- Exec (ctx context.Context , query string , args ... interface {}) error
78
- }
79
-
80
72
// MigratorMode to change migration flow.
81
73
type MigratorMode int
82
74
@@ -89,7 +81,7 @@ const (
89
81
modeMaxPossible
90
82
)
91
83
92
- // AsLocklessMigrator makes given migrator to not take a lock in database.
84
+ // AsLocklessMigrator makes given migrator to not take a lock on database.
93
85
func AsLocklessMigrator (m Migrator ) Migrator {
94
86
return & locklessMigrator {m }
95
87
}
@@ -126,7 +118,7 @@ func (m *mig) run(ctx context.Context) error {
126
118
if err != nil {
127
119
return fmt .Errorf ("load: %w" , err )
128
120
}
129
- return m .runMigration (ctx , migrations )
121
+ return m .runMigrations (ctx , migrations )
130
122
}
131
123
132
124
func (m * mig ) load () ([]* Migration , error ) {
@@ -152,7 +144,7 @@ func (m *mig) load() ([]*Migration, error) {
152
144
return ms , nil
153
145
}
154
146
155
- func (m * mig ) runMigration (ctx context.Context , ms []* Migration ) (err error ) {
147
+ func (m * mig ) runMigrations (ctx context.Context , ms []* Migration ) (err error ) {
156
148
if err := m .Init (ctx ); err != nil {
157
149
return fmt .Errorf ("init: %w" , err )
158
150
}
@@ -174,11 +166,11 @@ func (m *mig) runMigration(ctx context.Context, ms []*Migration) (err error) {
174
166
}
175
167
}()
176
168
177
- err = m .runMigrationLocked (ctx , ms )
169
+ err = m .runMigrationsLocked (ctx , ms )
178
170
return err
179
171
}
180
172
181
- func (m * mig ) runMigrationLocked (ctx context.Context , ms []* Migration ) error {
173
+ func (m * mig ) runMigrationsLocked (ctx context.Context , ms []* Migration ) error {
182
174
curr , target , err := m .getCurrAndTargetVersions (ctx , len (ms ))
183
175
if err != nil {
184
176
return err
@@ -330,9 +322,9 @@ func (llm *locklessMigrator) SetVersion(ctx context.Context, version int) error
330
322
return llm .m .SetVersion (ctx , version )
331
323
}
332
324
333
- func (llm * locklessMigrator ) Begin (ctx context.Context ) error { return llm .Begin (ctx ) }
334
- func (llm * locklessMigrator ) Commit (ctx context.Context ) error { return llm .Commit (ctx ) }
335
- func (llm * locklessMigrator ) Rollback (ctx context.Context ) error { return llm .Rollback (ctx ) }
325
+ func (llm * locklessMigrator ) Begin (ctx context.Context ) error { return llm .m . Begin (ctx ) }
326
+ func (llm * locklessMigrator ) Commit (ctx context.Context ) error { return llm .m . Commit (ctx ) }
327
+ func (llm * locklessMigrator ) Rollback (ctx context.Context ) error { return llm .m . Rollback (ctx ) }
336
328
337
329
func (llm * locklessMigrator ) Exec (ctx context.Context , query string , args ... interface {}) error {
338
330
return llm .m .Exec (ctx , query , args ... )
0 commit comments