Skip to content

chore: remove dependency on "hashicorp/go-multierror" #1322

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

chore: remove dependency on "hashicorp/go-multierror" #1322

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
59f084e
feat: remove dependency on "hashicorp/go-multierror"
leonklingele Oct 23, 2025
1996ec8
feat: use errors.Join to combine multiple errors
leonklingele Oct 24, 2025
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
7 changes: 1 addition & 6 deletions database/cassandra/cassandra.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import (
"github.com/gocql/gocql"
"github.com/golang-migrate/migrate/v4/database"
"github.com/golang-migrate/migrate/v4/database/multistmt"
"github.com/hashicorp/go-multierror"
)

func init() {
Expand Down Expand Up @@ -315,11 +314,7 @@ func (c *Cassandra) ensureVersionTable() (err error) {

defer func() {
if e := c.Unlock(); e != nil {
if err == nil {
err = e
} else {
err = multierror.Append(err, e)
}
err = errors.Join(err, e)
}
}()

Expand Down
10 changes: 3 additions & 7 deletions database/clickhouse/clickhouse.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package clickhouse

import (
"database/sql"
"errors"
"fmt"
"io"
"net/url"
Expand All @@ -13,7 +14,6 @@ import (
"github.com/golang-migrate/migrate/v4"
"github.com/golang-migrate/migrate/v4/database"
"github.com/golang-migrate/migrate/v4/database/multistmt"
"github.com/hashicorp/go-multierror"
)

var (
Expand Down Expand Up @@ -209,11 +209,7 @@ func (ch *ClickHouse) ensureVersionTable() (err error) {

defer func() {
if e := ch.Unlock(); e != nil {
if err == nil {
err = e
} else {
err = multierror.Append(err, e)
}
err = errors.Join(err, e)
}
}()

Expand Down Expand Up @@ -266,7 +262,7 @@ func (ch *ClickHouse) Drop() (err error) {
}
defer func() {
if errClose := tables.Close(); errClose != nil {
err = multierror.Append(err, errClose)
err = errors.Join(err, errClose)
}
}()

Expand Down
12 changes: 4 additions & 8 deletions database/cockroachdb/cockroachdb.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package cockroachdb
import (
"context"
"database/sql"
"errors"
"fmt"
"io"
nurl "net/url"
Expand All @@ -13,7 +14,6 @@ import (
"github.com/cockroachdb/cockroach-go/v2/crdb"
"github.com/golang-migrate/migrate/v4"
"github.com/golang-migrate/migrate/v4/database"
"github.com/hashicorp/go-multierror"
"github.com/lib/pq"
)

Expand Down Expand Up @@ -161,7 +161,7 @@ func (c *CockroachDb) Lock() error {
}
defer func() {
if errClose := rows.Close(); errClose != nil {
err = multierror.Append(err, errClose)
err = errors.Join(err, errClose)
}
}()

Expand Down Expand Up @@ -276,7 +276,7 @@ func (c *CockroachDb) Drop() (err error) {
}
defer func() {
if errClose := tables.Close(); errClose != nil {
err = multierror.Append(err, errClose)
err = errors.Join(err, errClose)
}
}()

Expand Down Expand Up @@ -318,11 +318,7 @@ func (c *CockroachDb) ensureVersionTable() (err error) {

defer func() {
if e := c.Unlock(); e != nil {
if err == nil {
err = e
} else {
err = multierror.Append(err, e)
}
err = errors.Join(err, e)
}
}()

Expand Down
10 changes: 3 additions & 7 deletions database/firebird/firebird.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ package firebird
import (
"context"
"database/sql"
"errors"
"fmt"
"io"
nurl "net/url"
"sync/atomic"

"github.com/golang-migrate/migrate/v4"
"github.com/golang-migrate/migrate/v4/database"
"github.com/hashicorp/go-multierror"
_ "github.com/nakagami/firebirdsql"
)

Expand Down Expand Up @@ -180,7 +180,7 @@ func (f *Firebird) Drop() (err error) {
}
defer func() {
if errClose := tables.Close(); errClose != nil {
err = multierror.Append(err, errClose)
err = errors.Join(err, errClose)
}
}()

Expand Down Expand Up @@ -223,11 +223,7 @@ func (f *Firebird) ensureVersionTable() (err error) {

defer func() {
if e := f.Unlock(); e != nil {
if err == nil {
err = e
} else {
err = multierror.Append(err, e)
}
err = errors.Join(err, e)
}
}()

Expand Down
8 changes: 2 additions & 6 deletions database/mongodb/mongodb.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package mongodb

import (
"context"
"errors"
"fmt"
"io"
"net/url"
Expand All @@ -12,7 +13,6 @@ import (

"github.com/cenkalti/backoff/v4"
"github.com/golang-migrate/migrate/v4/database"
"github.com/hashicorp/go-multierror"
"go.mongodb.org/mongo-driver/bson"
"go.mongodb.org/mongo-driver/mongo"
"go.mongodb.org/mongo-driver/mongo/options"
Expand Down Expand Up @@ -325,11 +325,7 @@ func (m *Mongo) ensureVersionTable() (err error) {

defer func() {
if e := m.Unlock(); e != nil {
if err == nil {
err = e
} else {
err = multierror.Append(err, e)
}
err = errors.Join(err, e)
}
}()

Expand Down
14 changes: 5 additions & 9 deletions database/mysql/mysql.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"crypto/tls"
"crypto/x509"
"database/sql"
"errors"
"fmt"
"io"
nurl "net/url"
Expand All @@ -18,7 +19,6 @@ import (

"github.com/go-sql-driver/mysql"
"github.com/golang-migrate/migrate/v4/database"
"github.com/hashicorp/go-multierror"
)

var _ database.Driver = (*Mysql)(nil) // explicit compile time type check
Expand Down Expand Up @@ -362,7 +362,7 @@ func (m *Mysql) SetVersion(version int, dirty bool) error {
query := "DELETE FROM `" + m.config.MigrationsTable + "` LIMIT 1"
if _, err := tx.ExecContext(context.Background(), query); err != nil {
if errRollback := tx.Rollback(); errRollback != nil {
err = multierror.Append(err, errRollback)
err = errors.Join(err, errRollback)
}
return &database.Error{OrigErr: err, Query: []byte(query)}
}
Expand All @@ -374,7 +374,7 @@ func (m *Mysql) SetVersion(version int, dirty bool) error {
query := "INSERT INTO `" + m.config.MigrationsTable + "` (version, dirty) VALUES (?, ?)"
if _, err := tx.ExecContext(context.Background(), query, version, dirty); err != nil {
if errRollback := tx.Rollback(); errRollback != nil {
err = multierror.Append(err, errRollback)
err = errors.Join(err, errRollback)
}
return &database.Error{OrigErr: err, Query: []byte(query)}
}
Expand Down Expand Up @@ -416,7 +416,7 @@ func (m *Mysql) Drop() (err error) {
}
defer func() {
if errClose := tables.Close(); errClose != nil {
err = multierror.Append(err, errClose)
err = errors.Join(err, errClose)
}
}()

Expand Down Expand Up @@ -469,11 +469,7 @@ func (m *Mysql) ensureVersionTable() (err error) {

defer func() {
if e := m.Unlock(); e != nil {
if err == nil {
err = e
} else {
err = multierror.Append(err, e)
}
err = errors.Join(err, e)
}
}()

Expand Down
12 changes: 6 additions & 6 deletions database/neo4j/neo4j.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package neo4j

import (
"bytes"
"errors"
"fmt"
"io"
neturl "net/url"
Expand All @@ -10,7 +11,6 @@ import (

"github.com/golang-migrate/migrate/v4/database"
"github.com/golang-migrate/migrate/v4/database/multistmt"
"github.com/hashicorp/go-multierror"
"github.com/neo4j/neo4j-go-driver/neo4j"
)

Expand Down Expand Up @@ -141,7 +141,7 @@ func (n *Neo4j) Run(migration io.Reader) (err error) {
}
defer func() {
if cerr := session.Close(); cerr != nil {
err = multierror.Append(err, cerr)
err = errors.Join(err, cerr)
}
}()

Expand Down Expand Up @@ -188,7 +188,7 @@ func (n *Neo4j) SetVersion(version int, dirty bool) (err error) {
}
defer func() {
if cerr := session.Close(); cerr != nil {
err = multierror.Append(err, cerr)
err = errors.Join(err, cerr)
}
}()

Expand All @@ -213,7 +213,7 @@ func (n *Neo4j) Version() (version int, dirty bool, err error) {
}
defer func() {
if cerr := session.Close(); cerr != nil {
err = multierror.Append(err, cerr)
err = errors.Join(err, cerr)
}
}()

Expand Down Expand Up @@ -261,7 +261,7 @@ func (n *Neo4j) Drop() (err error) {
}
defer func() {
if cerr := session.Close(); cerr != nil {
err = multierror.Append(err, cerr)
err = errors.Join(err, cerr)
}
}()

Expand All @@ -278,7 +278,7 @@ func (n *Neo4j) ensureVersionConstraint() (err error) {
}
defer func() {
if cerr := session.Close(); cerr != nil {
err = multierror.Append(err, cerr)
err = errors.Join(err, cerr)
}
}()

Expand Down
18 changes: 7 additions & 11 deletions database/pgx/pgx.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ package pgx
import (
"context"
"database/sql"
"errors"
"fmt"
"io"
nurl "net/url"
Expand All @@ -17,7 +18,6 @@ import (
"github.com/golang-migrate/migrate/v4"
"github.com/golang-migrate/migrate/v4/database"
"github.com/golang-migrate/migrate/v4/database/multistmt"
"github.com/hashicorp/go-multierror"
"github.com/jackc/pgconn"
"github.com/jackc/pgerrcode"
_ "github.com/jackc/pgx/v4/stdlib"
Expand Down Expand Up @@ -295,7 +295,7 @@ func (p *Postgres) applyTableLock() error {
defer func() {
errRollback := tx.Rollback()
if errRollback != nil {
err = multierror.Append(err, errRollback)
err = errors.Join(err, errRollback)
}
}()

Expand All @@ -312,7 +312,7 @@ func (p *Postgres) applyTableLock() error {

defer func() {
if errClose := rows.Close(); errClose != nil {
err = multierror.Append(err, errClose)
err = errors.Join(err, errClose)
}
}()

Expand Down Expand Up @@ -454,7 +454,7 @@ func (p *Postgres) SetVersion(version int, dirty bool) error {
query := `TRUNCATE ` + quoteIdentifier(p.config.migrationsSchemaName) + `.` + quoteIdentifier(p.config.migrationsTableName)
if _, err := tx.Exec(query); err != nil {
if errRollback := tx.Rollback(); errRollback != nil {
err = multierror.Append(err, errRollback)
err = errors.Join(err, errRollback)
}
return &database.Error{OrigErr: err, Query: []byte(query)}
}
Expand All @@ -466,7 +466,7 @@ func (p *Postgres) SetVersion(version int, dirty bool) error {
query = `INSERT INTO ` + quoteIdentifier(p.config.migrationsSchemaName) + `.` + quoteIdentifier(p.config.migrationsTableName) + ` (version, dirty) VALUES ($1, $2)`
if _, err := tx.Exec(query, version, dirty); err != nil {
if errRollback := tx.Rollback(); errRollback != nil {
err = multierror.Append(err, errRollback)
err = errors.Join(err, errRollback)
}
return &database.Error{OrigErr: err, Query: []byte(query)}
}
Expand Down Expand Up @@ -508,7 +508,7 @@ func (p *Postgres) Drop() (err error) {
}
defer func() {
if errClose := tables.Close(); errClose != nil {
err = multierror.Append(err, errClose)
err = errors.Join(err, errClose)
}
}()

Expand Down Expand Up @@ -556,11 +556,7 @@ func (p *Postgres) ensureVersionTable() (err error) {

defer func() {
if e := p.Unlock(); e != nil {
if err == nil {
err = e
} else {
err = multierror.Append(err, e)
}
err = errors.Join(err, e)
}
}()

Expand Down
Loading