Update morph dependecy to fix a data race (#19326)
* Update morph dependecy to fix a data race * run go mod tidy
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
73d7b24745
Коммит
73ac1a354d
11
vendor/github.com/go-morph/morph/drivers/mysql/mysql.go
сгенерированный
поставляемый
11
vendor/github.com/go-morph/morph/drivers/mysql/mysql.go
сгенерированный
поставляемый
@@ -16,13 +16,6 @@ import (
|
||||
|
||||
const driverName = "mysql"
|
||||
const defaultMigrationMaxSize = 10 * 1 << 20 // 10 MB
|
||||
var defaultConfig = &Config{
|
||||
Config: drivers.Config{
|
||||
MigrationsTable: "db_migrations",
|
||||
StatementTimeoutInSecs: 60,
|
||||
MigrationMaxSize: defaultMigrationMaxSize,
|
||||
},
|
||||
}
|
||||
|
||||
// add here any custom driver configuration
|
||||
var configParams = []string{
|
||||
@@ -44,7 +37,7 @@ type mysql struct {
|
||||
}
|
||||
|
||||
func WithInstance(dbInstance *sql.DB, config *Config) (drivers.Driver, error) {
|
||||
driverConfig := mergeConfigs(config, defaultConfig)
|
||||
driverConfig := mergeConfigs(config, getDefaultConfig())
|
||||
|
||||
conn, err := dbInstance.Conn(context.Background())
|
||||
if err != nil {
|
||||
@@ -69,7 +62,7 @@ func Open(connURL string) (drivers.Driver, error) {
|
||||
return nil, &drivers.AppError{Driver: driverName, OrigErr: err, Message: "failed to sanitize url from custom parameters"}
|
||||
}
|
||||
|
||||
driverConfig, err := mergeConfigWithParams(customParams, defaultConfig)
|
||||
driverConfig, err := mergeConfigWithParams(customParams, getDefaultConfig())
|
||||
if err != nil {
|
||||
return nil, &drivers.AppError{Driver: driverName, OrigErr: err, Message: "failed to merge custom params to driver config"}
|
||||
}
|
||||
|
||||
11
vendor/github.com/go-morph/morph/drivers/mysql/utils.go
сгенерированный
поставляемый
11
vendor/github.com/go-morph/morph/drivers/mysql/utils.go
сгенерированный
поставляемый
@@ -1,6 +1,7 @@
|
||||
package mysql
|
||||
|
||||
import (
|
||||
"github.com/go-morph/morph/drivers"
|
||||
mysqlDriver "github.com/go-sql-driver/mysql"
|
||||
)
|
||||
|
||||
@@ -21,3 +22,13 @@ func extractDatabaseNameFromURL(conn string) (string, error) {
|
||||
|
||||
return cfg.DBName, nil
|
||||
}
|
||||
|
||||
func getDefaultConfig() *Config {
|
||||
return &Config{
|
||||
Config: drivers.Config{
|
||||
MigrationsTable: "db_migrations",
|
||||
StatementTimeoutInSecs: 60,
|
||||
MigrationMaxSize: defaultMigrationMaxSize,
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
13
vendor/github.com/go-morph/morph/drivers/postgres/postgres.go
сгенерированный
поставляемый
13
vendor/github.com/go-morph/morph/drivers/postgres/postgres.go
сгенерированный
поставляемый
@@ -14,14 +14,7 @@ import (
|
||||
)
|
||||
|
||||
var (
|
||||
driverName = "postgres"
|
||||
defaultConfig = &Config{
|
||||
Config: drivers.Config{
|
||||
MigrationsTable: "db_migrations",
|
||||
StatementTimeoutInSecs: 60,
|
||||
MigrationMaxSize: defaultMigrationMaxSize,
|
||||
},
|
||||
}
|
||||
driverName = "postgres"
|
||||
defaultMigrationMaxSize = 10 * 1 << 20 // 10 MB
|
||||
configParams = []string{
|
||||
"x-migration-max-size",
|
||||
@@ -44,7 +37,7 @@ type postgres struct {
|
||||
}
|
||||
|
||||
func WithInstance(dbInstance *sql.DB, config *Config) (drivers.Driver, error) {
|
||||
driverConfig := mergeConfigs(config, defaultConfig)
|
||||
driverConfig := mergeConfigs(config, getDefaultConfig())
|
||||
|
||||
conn, err := dbInstance.Conn(context.Background())
|
||||
if err != nil {
|
||||
@@ -77,7 +70,7 @@ func Open(connURL string) (drivers.Driver, error) {
|
||||
return nil, &drivers.AppError{Driver: driverName, OrigErr: err, Message: "failed to sanitize url from custom parameters"}
|
||||
}
|
||||
|
||||
driverConfig, err := mergeConfigWithParams(customParams, defaultConfig)
|
||||
driverConfig, err := mergeConfigWithParams(customParams, getDefaultConfig())
|
||||
if err != nil {
|
||||
return nil, &drivers.AppError{Driver: driverName, OrigErr: err, Message: "failed to merge custom params to driver config"}
|
||||
}
|
||||
|
||||
16
vendor/github.com/go-morph/morph/drivers/postgres/utils.go
сгенерированный
поставляемый
16
vendor/github.com/go-morph/morph/drivers/postgres/utils.go
сгенерированный
поставляемый
@@ -1,6 +1,10 @@
|
||||
package postgres
|
||||
|
||||
import "net/url"
|
||||
import (
|
||||
"net/url"
|
||||
|
||||
"github.com/go-morph/morph/drivers"
|
||||
)
|
||||
|
||||
func extractDatabaseNameFromURL(URL string) (string, error) {
|
||||
uri, err := url.Parse(URL)
|
||||
@@ -10,3 +14,13 @@ func extractDatabaseNameFromURL(URL string) (string, error) {
|
||||
|
||||
return uri.Path[1:], nil
|
||||
}
|
||||
|
||||
func getDefaultConfig() *Config {
|
||||
return &Config{
|
||||
Config: drivers.Config{
|
||||
MigrationsTable: "db_migrations",
|
||||
StatementTimeoutInSecs: 60,
|
||||
MigrationMaxSize: defaultMigrationMaxSize,
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
8
vendor/github.com/go-morph/morph/morph.go
сгенерированный
поставляемый
8
vendor/github.com/go-morph/morph/morph.go
сгенерированный
поставляемый
@@ -42,10 +42,6 @@ type Config struct {
|
||||
|
||||
type EngineOption func(*Morph)
|
||||
|
||||
var defaultConfig = &Config{
|
||||
Logger: log.New(os.Stderr, "", log.LstdFlags), // add default logger
|
||||
}
|
||||
|
||||
func WithLogger(logger *log.Logger) EngineOption {
|
||||
return func(m *Morph) {
|
||||
m.config.Logger = logger
|
||||
@@ -82,7 +78,9 @@ func WithLock(key string) EngineOption {
|
||||
// New creates a new instance of the migrations engine from an existing db instance and a migrations source.
|
||||
func New(ctx context.Context, driver drivers.Driver, source sources.Source, options ...EngineOption) (*Morph, error) {
|
||||
engine := &Morph{
|
||||
config: defaultConfig,
|
||||
config: &Config{
|
||||
Logger: log.New(os.Stderr, "", log.LstdFlags), // add default logger
|
||||
},
|
||||
source: source,
|
||||
driver: driver,
|
||||
}
|
||||
|
||||
Ссылка в новой задаче
Block a user