修改实现为静态代理

Author: xfali

README.md

@@ -15,27 +15,27 @@ select查询返回的result还未能携带page、pageSize、total信息，需要
 ### 1、使用pagehelper的Factory生成SessionManager
 
 ```cassandraql
-    fac := factory.DefaultFactory{
-        Host:     "localhost",
-        Port:     3306,
-        DBName:   "test",
-        Username: "root",
-        Password: "123",
-        Charset:  "utf8",
-
-        MaxConn:     1000,
-        MaxIdleConn: 500,
-
-        Log: logging.DefaultLogf,
-    }
-    sessMgr := gobatis.NewSessionManager(pagehelper.New(&fac))
+    pFac := pagehelper.New(&factory.DefaultFactory{
+                                    Host:     "localhost",
+                                    Port:     3306,
+                                    DBName:   "test",
+                                    Username: "root",
+                                    Password: "123",
+                                    Charset:  "utf8",
+                            
+                                    MaxConn:     1000,
+                                    MaxIdleConn: 500,
+                            
+                                    Log: logging.DefaultLogf,
+                                })
+    pFac.InitDB()
+    sessMgr := gobatis.NewSessionManager(pFac)
 ```
 
 ### 2、配置分页参数
 ```cassandraql
     session := sessMgr.NewSession()
-    ctx, _ := context.WithTimeout(context.Background(), 2*time.Second)
-    ctx = pagehelper.StartPage(1, 2, ctx)
+    ctx := pagehelper.StartPage(1, 10, context.Background())
 
     var ret []TestTable
     session.SetContext(ctx).Select("SELECT * FROM TBL_TEST").Param().Result(&ret)

factory.go

@@ -0,0 +1,43 @@
+// Copyright (C) 2019, Xiongfa Li.
+// All right reserved.
+// @author xiongfa.li
+// @version V1.0
+// Description: 
+
+package pagehelper
+
+import (
+    "github.com/xfali/gobatis/executor"
+    "github.com/xfali/gobatis/logging"
+    "github.com/xfali/gobatis/session"
+    "github.com/xfali/gobatis/transaction"
+)
+
+type IFactory struct {
+    InitDBFunc            func() error
+    CreateTransactionFunc func() transaction.Transaction
+    CreateExecutorFunc    func(transaction.Transaction) executor.Executor
+    CreateSessionFunc     func() session.SqlSession
+    LogFuncFunc           func() logging.LogFunc
+}
+
+func (f *IFactory) InitDB() error {
+    return f.InitDBFunc()
+}
+
+func (f *IFactory) CreateTransaction() transaction.Transaction {
+    return f.CreateTransactionFunc()
+}
+
+func (f *IFactory) CreateSession() session.SqlSession {
+    tx := f.CreateTransactionFunc()
+    return session.NewDefaultSqlSession(f.LogFuncFunc(), tx, f.CreateExecutorFunc(tx), false)
+}
+
+func (f *IFactory) LogFunc() logging.LogFunc {
+    return f.LogFuncFunc()
+}
+
+func (f *IFactory) CreateExecutor(transaction transaction.Transaction) executor.Executor {
+    return f.CreateExecutorFunc(transaction)
+}

go.mod

@@ -1,4 +1,4 @@
-module github/xfali/pagehelper
+module github.com/xfali/pagehelper
 
 go 1.12
 

pagehelper.go

@@ -11,9 +11,12 @@ package pagehelper
 import (
     "context"
     "fmt"
+    "github.com/xfali/gobatis/common"
     "github.com/xfali/gobatis/executor"
     "github.com/xfali/gobatis/factory"
+    "github.com/xfali/gobatis/logging"
     "github.com/xfali/gobatis/reflection"
+    "github.com/xfali/gobatis/session"
     "github.com/xfali/gobatis/transaction"
     "strings"
 )
@@ -27,40 +30,82 @@ type PageParam struct {
     PageSize int
 }
 
-func New(f *factory.DefaultFactory) *PageHelperFactory {
-    return &PageHelperFactory{*f}
+func New(f factory.Factory) *Factory {
+    return &Factory{f}
 }
 
-type PageHelperFactory struct {
-    factory.DefaultFactory
+type Factory struct {
+    fac factory.Factory
 }
 
-type PageHelperExecutor struct {
-    executor.SimpleExecutor
+type Executor struct {
+    exec executor.Executor
+    log  logging.LogFunc
 }
 
 func StartPage(page, pageSize int, ctx context.Context) context.Context {
     return context.WithValue(ctx, pageHelperValue, &PageParam{Page: page, PageSize: pageSize})
 }
 
-func (exec *PageHelperExecutor) Query(ctx context.Context, result reflection.Object, sql string, params ...interface{}) error {
+func (exec *Executor) Close(rollback bool) {
+    exec.exec.Close(rollback)
+}
+
+func (exec *Executor) Exec(ctx context.Context, sql string, params ...interface{}) (common.Result, error) {
+    return exec.exec.Exec(ctx, sql, params...)
+}
+
+func (exec *Executor) Begin() error {
+    return exec.exec.Begin()
+}
+
+func (exec *Executor) Commit(require bool) error {
+    return exec.exec.Commit(require)
+}
+
+func (exec *Executor) Rollback(require bool) error {
+    return exec.exec.Rollback(require)
+}
+
+func (exec *Executor) Query(ctx context.Context, result reflection.Object, sql string, params ...interface{}) error {
     p := ctx.Value(pageHelperValue)
     if p != nil {
         if param, ok := p.(*PageParam); ok {
             sql = modifySql(sql, param)
+            exec.log(logging.INFO, "PageHelper Query: [%s]", sql)
         }
     }
 
-    return exec.SimpleExecutor.Query(ctx, result, sql, params...)
+    return exec.exec.Query(ctx, result, sql, params...)
 }
 
-func (f *PageHelperFactory) CreateExecutor(transaction transaction.Transaction) executor.Executor {
-    return &PageHelperExecutor{*executor.NewSimpleExecutor(transaction)}
+func (f *Factory) InitDB() error {
+    return f.fac.InitDB()
+}
+
+func (f *Factory) CreateTransaction() transaction.Transaction {
+    return f.fac.CreateTransaction()
+}
+
+func (f *Factory) CreateSession() session.SqlSession {
+    tx := f.CreateTransaction()
+    return session.NewDefaultSqlSession(f.LogFunc(), tx, f.CreateExecutor(tx), false)
+}
+
+func (f *Factory) LogFunc() logging.LogFunc {
+    return f.fac.LogFunc()
+}
+
+func (f *Factory) CreateExecutor(transaction transaction.Transaction) executor.Executor {
+    return &Executor{
+        exec: executor.NewSimpleExecutor(transaction),
+        log:  f.LogFunc(),
+    }
 }
 
 func modifySql(sql string, p *PageParam) string {
     b := strings.Builder{}
-    b.WriteString(sql)
-    b.WriteString(fmt.Sprintf(" OFFSET %d LIMIT %d ", p.Page*p.PageSize, p.PageSize))
+    b.WriteString(strings.TrimSpace(sql))
+    b.WriteString(fmt.Sprintf(" LIMIT %d, %d ", p.Page*p.PageSize, p.PageSize))
     return b.String()
 }