diff --git a/main_dc/BB/api_bb/internal/database/database.go b/main_dc/BB/api_bb/internal/database/database.go index fba644e..d957514 100644 --- a/main_dc/BB/api_bb/internal/database/database.go +++ b/main_dc/BB/api_bb/internal/database/database.go @@ -8,10 +8,10 @@ import ( "time" "github.com/golang-migrate/migrate/v4" - "github.com/golang-migrate/migrate/v4/database/postgres" + migratepg "github.com/golang-migrate/migrate/v4/database/postgres" "github.com/golang-migrate/migrate/v4/source/iofs" "go.uber.org/zap" - "gorm.io/driver/postgres" + gormpg "gorm.io/driver/postgres" "gorm.io/gorm" "api_bb/pkg/logger" @@ -50,7 +50,7 @@ func (d *Database) Connect() error { dsn = dsn + fmt.Sprintf(" search_path=%s", d.cfg.Schema) } - db, err := gorm.Open(postgres.Open(dsn), &gorm.Config{}) + db, err := gorm.Open(gormpg.Open(dsn), &gorm.Config{}) if err != nil { zapLogger.Error("failed to connect to database", zap.Error(err), @@ -92,7 +92,7 @@ func (d *Database) runMigrations(sqlDB *sql.DB) error { return fmt.Errorf("failed to create migration source: %w", err) } - driver, err := postgres.WithInstance(sqlDB, &postgres.Config{}) + driver, err := migratepg.WithInstance(sqlDB, &migratepg.Config{}) if err != nil { return fmt.Errorf("failed to create postgres driver: %w", err) } diff --git a/main_dc/yalarba/api_yal/internal/database/psql_db.go b/main_dc/yalarba/api_yal/internal/database/psql_db.go index 2afe57d..650838d 100644 --- a/main_dc/yalarba/api_yal/internal/database/psql_db.go +++ b/main_dc/yalarba/api_yal/internal/database/psql_db.go @@ -8,10 +8,10 @@ import ( "time" "github.com/golang-migrate/migrate/v4" - "github.com/golang-migrate/migrate/v4/database/postgres" + migratepg "github.com/golang-migrate/migrate/v4/database/postgres" "github.com/golang-migrate/migrate/v4/source/iofs" "go.uber.org/zap" - "gorm.io/driver/postgres" + gormpg "gorm.io/driver/postgres" "gorm.io/gorm" "api_yal/internal/logger" @@ -24,7 +24,7 @@ func NewPostgresConnection(cfg *config.Config) (*gorm.DB, error) { cfg.DBHost, cfg.DBUser, cfg.DBPassword, cfg.DBName, cfg.DBPort) zapLogger.Info("dsn = %s", zap.String("dsn", dsn)) - db, err := gorm.Open(postgres.Open(dsn), &gorm.Config{}) + db, err := gorm.Open(gormpg.Open(dsn), &gorm.Config{}) if err != nil { return nil, fmt.Errorf("failed to connect to database: %w", err) } @@ -56,7 +56,7 @@ func runMigrations(sqlDB *sql.DB) error { return fmt.Errorf("failed to create migration source: %w", err) } - driver, err := postgres.WithInstance(sqlDB, &postgres.Config{}) + driver, err := migratepg.WithInstance(sqlDB, &migratepg.Config{}) if err != nil { return fmt.Errorf("failed to create postgres driver: %w", err) }