Skip to content

return Rollback err and commit err #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lazyun wants to merge 3 commits into
base: master
Choose a base branch
from
Open

return Rollback err and commit err #36

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1234148
return Rollback err and commit err
Aug 23, 2019
764b5cc
del miss field log
Sep 16, 2019
6e4aa12
add db interface
Sep 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions orm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ func reflectStructValue(v reflect.Value, t reflect.Type, cols []string, row *sql
}
fv := v.FieldByName(col)
if !fv.CanAddr() {
logrus.Infof("missing filed :%s", c)
//logrus.Infof("missing filed :%s", c)
var b interface{}
targets[k] = &b
} else {
Expand Down Expand Up @@ -1292,6 +1292,7 @@ type ORMer interface {
Query(string, ...interface{}) (*sql.Rows, error)
ExecWithParam(string, interface{}) (sql.Result, error)
ExecWithRowAffectCheck(int64, string, ...interface{}) error
DB() *sql.DB
}

type ORM struct {
Expand Down Expand Up @@ -1336,6 +1337,10 @@ func newORMWithDriver(ds string, driverName string) *ORM {
return ret
}

func (o *ORM) DB() *sql.DB {
return o.db
}

func (o *ORM) Close() error {
return o.db.Close()
}
Expand Down Expand Up @@ -1489,26 +1494,27 @@ func getFieldValue(param interface{}, fieldName string) (interface{}, error) {
}
}

func (o *ORM) DoTransaction(f func(*ORMTran) error) error {
func (o *ORM) DoTransaction(f func(*ORMTran) error) (err error) {
trans, err := o.Begin()
if err != nil {
return err
}
defer func() {
perr := recover()
if err != nil || perr != nil {
trans.Rollback()
rerr := trans.Rollback()
if perr != nil {
panic(perr)
panic(fmt.Sprintf("panic: %v, RollbackErr: %v", perr, rerr))
}
err = errors.New(fmt.Sprintf("transaction: %v, RollbackErr: %v", err, rerr))
return
} else {
err = trans.Commit()
return
}
}()
err = f(trans)
return err
return
}

func (o *ORM) DoTransactionMore(f func(*ORMTran) (interface{}, error)) (interface{}, error) {
Expand Down