mirror of https://github.com/go-gorm/gorm.git
Revert "use callback to handle transaction"
This reverts commit 93f28bc116
.
This commit is contained in:
parent
fe01e1b9f4
commit
9fd73ae4f1
37
callbacks.go
37
callbacks.go
|
@ -2,7 +2,6 @@ package gorm
|
|||
|
||||
import (
|
||||
"context"
|
||||
"database/sql"
|
||||
"errors"
|
||||
"fmt"
|
||||
"reflect"
|
||||
|
@ -16,13 +15,12 @@ import (
|
|||
func initializeCallbacks(db *DB) *callbacks {
|
||||
return &callbacks{
|
||||
processors: map[string]*processor{
|
||||
"create": {db: db},
|
||||
"query": {db: db},
|
||||
"update": {db: db},
|
||||
"delete": {db: db},
|
||||
"row": {db: db},
|
||||
"raw": {db: db},
|
||||
"transaction": {db: db},
|
||||
"create": {db: db},
|
||||
"query": {db: db},
|
||||
"update": {db: db},
|
||||
"delete": {db: db},
|
||||
"row": {db: db},
|
||||
"raw": {db: db},
|
||||
},
|
||||
}
|
||||
}
|
||||
|
@ -74,29 +72,6 @@ func (cs *callbacks) Raw() *processor {
|
|||
return cs.processors["raw"]
|
||||
}
|
||||
|
||||
func (cs *callbacks) Transaction() *processor {
|
||||
return cs.processors["transaction"]
|
||||
}
|
||||
|
||||
func (p *processor) Begin(tx *DB, opt *sql.TxOptions) *DB {
|
||||
var err error
|
||||
|
||||
switch beginner := tx.Statement.ConnPool.(type) {
|
||||
case TxBeginner:
|
||||
tx.Statement.ConnPool, err = beginner.BeginTx(tx.Statement.Context, opt)
|
||||
case ConnPoolBeginner:
|
||||
tx.Statement.ConnPool, err = beginner.BeginTx(tx.Statement.Context, opt)
|
||||
default:
|
||||
err = ErrInvalidTransaction
|
||||
}
|
||||
|
||||
if err != nil {
|
||||
_ = tx.AddError(err)
|
||||
}
|
||||
|
||||
return tx
|
||||
}
|
||||
|
||||
func (p *processor) Execute(db *DB) *DB {
|
||||
// call scopes
|
||||
for len(db.Statement.scopes) > 0 {
|
||||
|
|
|
@ -619,13 +619,27 @@ func (db *DB) Begin(opts ...*sql.TxOptions) *DB {
|
|||
// clone statement
|
||||
tx = db.getInstance().Session(&Session{Context: db.Statement.Context, NewDB: db.clone == 1})
|
||||
opt *sql.TxOptions
|
||||
err error
|
||||
)
|
||||
|
||||
if len(opts) > 0 {
|
||||
opt = opts[0]
|
||||
}
|
||||
|
||||
return tx.callbacks.Transaction().Begin(tx, opt)
|
||||
switch beginner := tx.Statement.ConnPool.(type) {
|
||||
case TxBeginner:
|
||||
tx.Statement.ConnPool, err = beginner.BeginTx(tx.Statement.Context, opt)
|
||||
case ConnPoolBeginner:
|
||||
tx.Statement.ConnPool, err = beginner.BeginTx(tx.Statement.Context, opt)
|
||||
default:
|
||||
err = ErrInvalidTransaction
|
||||
}
|
||||
|
||||
if err != nil {
|
||||
tx.AddError(err)
|
||||
}
|
||||
|
||||
return tx
|
||||
}
|
||||
|
||||
// Commit commit a transaction
|
||||
|
|
Loading…
Reference in New Issue