valitovgaziz/tp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix import alias conflict: gormpg + migratepg

Browse Source
This commit is contained in:
valitovgaziz
2026-06-12 10:59:39 +05:00
parent 029812c6a4
commit 888bb2d87b
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
main_dc/BB/api_bb/internal/database/database.go
+4 -4
View File
@@ -8,10 +8,10 @@ import (
"time" "time"
"github.com/golang-migrate/migrate/v4" "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" "github.com/golang-migrate/migrate/v4/source/iofs"
"go.uber.org/zap" "go.uber.org/zap"
"gorm.io/driver/postgres" gormpg "gorm.io/driver/postgres"
"gorm.io/gorm" "gorm.io/gorm"
"api_bb/pkg/logger" "api_bb/pkg/logger"
@@ -50,7 +50,7 @@ func (d *Database) Connect() error {
dsn = dsn + fmt.Sprintf(" search_path=%s", d.cfg.Schema) 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 { if err != nil {
zapLogger.Error("failed to connect to database", zapLogger.Error("failed to connect to database",
zap.Error(err), 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) 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 { if err != nil {
return fmt.Errorf("failed to create postgres driver: %w", err) return fmt.Errorf("failed to create postgres driver: %w", err)
} }
main_dc/yalarba/api_yal/internal/database/psql_db.go
+4 -4
View File
@@ -8,10 +8,10 @@ import (
"time" "time"
"github.com/golang-migrate/migrate/v4" "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" "github.com/golang-migrate/migrate/v4/source/iofs"
"go.uber.org/zap" "go.uber.org/zap"
"gorm.io/driver/postgres" gormpg "gorm.io/driver/postgres"
"gorm.io/gorm" "gorm.io/gorm"
"api_yal/internal/logger" "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) cfg.DBHost, cfg.DBUser, cfg.DBPassword, cfg.DBName, cfg.DBPort)
zapLogger.Info("dsn = %s", zap.String("dsn", dsn)) 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 { if err != nil {
return nil, fmt.Errorf("failed to connect to database: %w", err) 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) 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 { if err != nil {
return fmt.Errorf("failed to create postgres driver: %w", err) return fmt.Errorf("failed to create postgres driver: %w", err)
} }