Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
go version

- name: GolangCI-Lint
uses: golangci/golangci-lint-action@v6
uses: golangci/golangci-lint-action@v7
with:
version: latest

Expand Down
18 changes: 9 additions & 9 deletions migrator.go
Original file line number Diff line number Diff line change
Expand Up @@ -63,15 +63,15 @@ func New(opts ...Option) (*Migrator, error) {
}

if len(m.migrations) == 0 {
return nil, errors.New("Migrations must be provided")
return nil, errors.New("migrations must be provided")
}

for _, m := range m.migrations {
switch m.(type) {
case *Migration:
case *MigrationNoTx:
default:
return nil, errors.New("Invalid migration type")
return nil, errors.New("invalid migration type")
}
}

Expand Down Expand Up @@ -103,11 +103,11 @@ func (m *Migrator) Migrate(ctx context.Context, db PgxIface) error {
switch mm := migration.(type) {
case *Migration:
if err := migrate(ctx, db, insertVersion, mm, m.onNotice); err != nil {
return fmt.Errorf("Error while running migrations: %w", err)
return fmt.Errorf("error while running migrations: %w", err)
}
case *MigrationNoTx:
if err := migrateNoTx(ctx, db, insertVersion, mm, m.onNotice); err != nil {
return fmt.Errorf("Error while running migrations: %w", err)
return fmt.Errorf("error while running migrations: %w", err)
}
}
}
Expand Down Expand Up @@ -185,18 +185,18 @@ func migrate(ctx context.Context, db PgxIface, insertVersion string, migration *
defer func() {
if err != nil {
if errRb := tx.Rollback(ctx); errRb != nil {
err = fmt.Errorf("Error rolling back: %s\n%s", errRb, err)
err = fmt.Errorf("error rolling back: %s\n%s", errRb, err)
}
return
}
err = tx.Commit(ctx)
}()
notice(fmt.Sprintf("Applying migration named '%s'...", migration.Name))
if err = migration.Func(ctx, tx); err != nil {
return fmt.Errorf("Error executing golang migration: %w", err)
return fmt.Errorf("error executing golang migration: %w", err)
}
if _, err = tx.Exec(ctx, insertVersion); err != nil {
return fmt.Errorf("Error updating migration versions: %w", err)
return fmt.Errorf("error updating migration versions: %w", err)
}
notice(fmt.Sprintf("Applied migration named '%s'", migration.Name))

Expand All @@ -206,10 +206,10 @@ func migrate(ctx context.Context, db PgxIface, insertVersion string, migration *
func migrateNoTx(ctx context.Context, db PgxIface, insertVersion string, migration *MigrationNoTx, notice func(string)) error {
notice(fmt.Sprintf("Applying no tx migration named '%s'...", migration.Name))
if err := migration.Func(ctx, db); err != nil {
return fmt.Errorf("Error executing golang migration: %w", err)
return fmt.Errorf("error executing golang migration: %w", err)
}
if _, err := db.Exec(ctx, insertVersion); err != nil {
return fmt.Errorf("Error updating migration versions: %w", err)
return fmt.Errorf("error updating migration versions: %w", err)
}
notice(fmt.Sprintf("Applied no tx migration named '%s'...", migration.Name))

Expand Down