Skip to content
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.

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

make Executor more readable and reduce obj generate. #306

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 8 additions & 8 deletions executor.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import (
"encoding/hex"
"encoding/json"
"errors"

"github.com/eatmoreapple/juice/cache"
"github.com/eatmoreapple/juice/driver"
"github.com/eatmoreapple/juice/internal/reflectlite"
Expand Down Expand Up @@ -94,22 +95,21 @@ var _ SQLRowsExecutor = (*invalidExecutor)(nil)

// sqlRowsExecutor implements the SQLRowsExecutor interface.
type sqlRowsExecutor struct {
session Session
statement Statement
driver driver.Driver
middlewares MiddlewareGroup
session Session
statement Statement
statementHandler StatementHandler
driver driver.Driver
middlewares MiddlewareGroup
}

// QueryContext executes the query and returns the result.
func (e *sqlRowsExecutor) QueryContext(ctx context.Context, param Param) (*sql.Rows, error) {
handler := NewSQLRowsStatementHandler(e.driver, e.session, e.middlewares...)
return handler.QueryContext(ctx, e.Statement(), param)
return e.statementHandler.QueryContext(ctx, e.Statement(), param)
}

// ExecContext executes the query and returns the result.
func (e *sqlRowsExecutor) ExecContext(ctx context.Context, param Param) (sql.Result, error) {
handler := NewSQLRowsStatementHandler(e.driver, e.session, e.middlewares...)
return handler.ExecContext(ctx, e.Statement(), param)
return e.statementHandler.ExecContext(ctx, e.Statement(), param)
}

// Statement returns the xmlSQLStatement.
Expand Down
11 changes: 7 additions & 4 deletions juice.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ package juice
import (
"context"
"database/sql"

"github.com/eatmoreapple/juice/cache"
"github.com/eatmoreapple/juice/driver"
)
Expand Down Expand Up @@ -55,11 +56,13 @@ func (e *Engine) executor(v any) (*sqlRowsExecutor, error) {
if err != nil {
return nil, err
}
handler := NewSQLRowsStatementHandler(e.driver, e.DB(), e.middlewares...)
return &sqlRowsExecutor{
statement: stat,
session: e.DB(),
driver: e.driver,
middlewares: e.middlewares,
statement: stat,
statementHandler: handler,
session: e.DB(),
driver: e.driver,
middlewares: e.middlewares,
}, nil
}

Expand Down
12 changes: 10 additions & 2 deletions statement.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,9 @@ package juice
import (
"context"
"database/sql"
"github.com/eatmoreapple/juice/driver"
"regexp"

"github.com/eatmoreapple/juice/driver"
)

type Statement interface {
Expand All @@ -33,6 +34,11 @@ type Statement interface {
Build(translator driver.Translator, param Param) (query string, args []any, err error)
}

type StatementHandler interface {
ExecContext(ctx context.Context, statement Statement, param Param) (sql.Result, error)
QueryContext(ctx context.Context, statement Statement, param Param) (*sql.Rows, error)
}

var formatRegexp = regexp.MustCompile(`\$\{ *?([a-zA-Z0-9_\.]+) *?\}`)

// xmlSQLStatement defines a sql xmlSQLStatement.
Expand Down Expand Up @@ -164,10 +170,12 @@ func (s *SQLRowsStatementHandler) ExecContext(ctx context.Context, statement Sta
return execHandler(ctx, query, args...)
}

var _ StatementHandler = (*SQLRowsStatementHandler)(nil)

// NewSQLRowsStatementHandler creates a new instance of SQLRowsStatementHandler
// with the provided driver, session, and an optional list of middlewares. This
// function is typically used to initialize the handler before executing SQL statements.
func NewSQLRowsStatementHandler(driver driver.Driver, session Session, middlewares ...Middleware) *SQLRowsStatementHandler {
func NewSQLRowsStatementHandler(driver driver.Driver, session Session, middlewares ...Middleware) StatementHandler {
return &SQLRowsStatementHandler{
driver: driver,
middlewares: middlewares,
Expand Down
Loading