fix(db): correct connection pool assignment in GORM adapter
Some checks failed
Build , Vet Test, and Lint / Run Vet Tests (1.24.x) (push) Successful in -29m43s
Build , Vet Test, and Lint / Run Vet Tests (1.23.x) (push) Successful in -29m6s
Build , Vet Test, and Lint / Lint Code (push) Successful in -29m11s
Build , Vet Test, and Lint / Build (push) Successful in -29m33s
Tests / Unit Tests (push) Successful in -30m4s
Tests / Integration Tests (push) Failing after -30m13s

This commit is contained in:
Hein
2026-04-10 11:20:44 +02:00
parent 16a960d973
commit 4fc25c60ae

View File

@@ -77,14 +77,14 @@ func syncGormConnPool(target, fresh *gorm.DB) {
} }
if target.Config != nil && fresh.Config != nil { if target.Config != nil && fresh.Config != nil {
target.Config.ConnPool = fresh.Config.ConnPool target.ConnPool = fresh.ConnPool
} }
if target.Statement != nil { if target.Statement != nil {
if fresh.Statement != nil && fresh.Statement.ConnPool != nil { if fresh.Statement != nil && fresh.Statement.ConnPool != nil {
target.Statement.ConnPool = fresh.Statement.ConnPool target.Statement.ConnPool = fresh.Statement.ConnPool
} else if fresh.Config != nil { } else if fresh.Config != nil {
target.Statement.ConnPool = fresh.Config.ConnPool target.Statement.ConnPool = fresh.ConnPool
} }
target.Statement.DB = target target.Statement.DB = target
} }
@@ -653,10 +653,10 @@ func (g *GormSelectQuery) Exists(ctx context.Context) (exists bool, err error) {
// GormInsertQuery implements InsertQuery for GORM // GormInsertQuery implements InsertQuery for GORM
type GormInsertQuery struct { type GormInsertQuery struct {
db *gorm.DB db *gorm.DB
reconnect func(...*gorm.DB) error reconnect func(...*gorm.DB) error
model interface{} model interface{}
values map[string]interface{} values map[string]interface{}
} }
func (g *GormInsertQuery) Model(model interface{}) common.InsertQuery { func (g *GormInsertQuery) Model(model interface{}) common.InsertQuery {
@@ -715,10 +715,10 @@ func (g *GormInsertQuery) Exec(ctx context.Context) (res common.Result, err erro
// GormUpdateQuery implements UpdateQuery for GORM // GormUpdateQuery implements UpdateQuery for GORM
type GormUpdateQuery struct { type GormUpdateQuery struct {
db *gorm.DB db *gorm.DB
reconnect func(...*gorm.DB) error reconnect func(...*gorm.DB) error
model interface{} model interface{}
updates interface{} updates interface{}
} }
func (g *GormUpdateQuery) Model(model interface{}) common.UpdateQuery { func (g *GormUpdateQuery) Model(model interface{}) common.UpdateQuery {
@@ -815,9 +815,9 @@ func (g *GormUpdateQuery) Exec(ctx context.Context) (res common.Result, err erro
// GormDeleteQuery implements DeleteQuery for GORM // GormDeleteQuery implements DeleteQuery for GORM
type GormDeleteQuery struct { type GormDeleteQuery struct {
db *gorm.DB db *gorm.DB
reconnect func(...*gorm.DB) error reconnect func(...*gorm.DB) error
model interface{} model interface{}
} }
func (g *GormDeleteQuery) Model(model interface{}) common.DeleteQuery { func (g *GormDeleteQuery) Model(model interface{}) common.DeleteQuery {