Skip to content

bugfix: database operation bugfix #28

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
liuqing6767 wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

bugfix: database operation bugfix #28

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 23 additions & 2 deletions lib/xdb.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,20 @@ package lib
import (
"context"
"database/sql"
"fmt"
"strings"
)

type DBContexter interface {
context.Context
Conn() *sql.DB
Conn() CommonConn
}

type CommonConn interface {
ExecContext(ctx context.Context, query string, args ...interface{}) (sql.Result, error)
PrepareContext(ctx context.Context, query string) (*sql.Stmt, error)
QueryContext(ctx context.Context, query string, args ...interface{}) (*sql.Rows, error)
QueryRowContext(ctx context.Context, query string, args ...interface{}) *sql.Row
}

type DBContext struct {
Expand All @@ -39,7 +47,11 @@ func NewDBContext(ctx context.Context, conn *sql.DB) *DBContext {
}
}

func (ctx *DBContext) Conn() *sql.DB {
func (ctx *DBContext) Conn() CommonConn {
// use tx first
if ctx.tx != nil {
return ctx.tx
}
return ctx.conn
}

Expand Down Expand Up @@ -101,6 +113,15 @@ func RDBTxnExecute(dc *DBContext, handler func(context.Context) error) error {
}
}

defer func() {
if err1 := recover(); err1 != nil {
dc.tx.Rollback()

err = fmt.Errorf("%v", err1)
return
}
}()

err = handler(dc)
return commitOrRollback(dc.tx, err)
}
Expand Down