fix: trx in hooks
This commit is contained in:
parent
19b8d37ae8
commit
774fd1d5c2
@ -589,8 +589,7 @@ func (db *DB) Transaction(fc func(tx *DB) error, opts ...*sql.TxOptions) (err er
|
||||
}
|
||||
}()
|
||||
}
|
||||
|
||||
err = fc(db.Session(&Session{}))
|
||||
err = fc(db.Session(&Session{NewDB: db.clone == 1}))
|
||||
} else {
|
||||
tx := db.Begin(opts...)
|
||||
if tx.Error != nil {
|
||||
|
@ -3,10 +3,9 @@ package tests_test
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"testing"
|
||||
|
||||
"gorm.io/gorm"
|
||||
. "gorm.io/gorm/utils/tests"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestTransaction(t *testing.T) {
|
||||
@ -367,3 +366,33 @@ func TestTransactionOnClosedConn(t *testing.T) {
|
||||
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)
|
||||
}
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user