fix: trx in hooks clone stmt (#5338)

* fix: trx in hooks

* chore: format by gofumpt
This commit is contained in:
Cr 2022-05-17 14:13:41 +08:00 committed by GitHub
parent f5e77aab2f
commit 7496c3a56e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 31 additions and 2 deletions

View File

@ -589,8 +589,7 @@ func (db *DB) Transaction(fc func(tx *DB) error, opts ...*sql.TxOptions) (err er
} }
}() }()
} }
err = fc(db.Session(&Session{NewDB: db.clone == 1}))
err = fc(db.Session(&Session{}))
} else { } else {
tx := db.Begin(opts...) tx := db.Begin(opts...)
if tx.Error != nil { if tx.Error != nil {

View File

@ -367,3 +367,33 @@ func TestTransactionOnClosedConn(t *testing.T) {
t.Errorf("should returns error when commit with closed conn, got error %v", err) t.Errorf("should returns error when commit with closed conn, got error %v", err)
} }
} }
func TestTransactionWithHooks(t *testing.T) {
user := GetUser("tTestTransactionWithHooks", Config{Account: true})
DB.Create(&user)
var err error
err = DB.Transaction(func(tx *gorm.DB) error {
return tx.Model(&User{}).Limit(1).Transaction(func(tx2 *gorm.DB) error {
return tx2.Scan(&User{}).Error
})
})
if err != nil {
t.Error(err)
}
// method with hooks
err = DB.Transaction(func(tx1 *gorm.DB) error {
// callMethod do
tx2 := tx1.Find(&User{}).Session(&gorm.Session{NewDB: true})
// trx in hooks
return tx2.Transaction(func(tx3 *gorm.DB) error {
return tx3.Where("user_id", user.ID).Delete(&Account{}).Error
})
})
if err != nil {
t.Error(err)
}
}