Skip to content

Commit

Permalink
fix: trx in hooks clone stmt (#5338)
Browse files Browse the repository at this point in the history
* fix: trx in hooks

* chore: format by gofumpt
  • Loading branch information
a631807682 committed May 17, 2022
1 parent f5e77aa commit 7496c3a
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 2 deletions.
3 changes: 1 addition & 2 deletions finisher_api.go
Expand Up @@ -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 {
Expand Down
30 changes: 30 additions & 0 deletions tests/transaction_test.go
Expand Up @@ -367,3 +367,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)
}
}

0 comments on commit 7496c3a

Please sign in to comment.