升级适配gobatis v0.0.5+

Author: xfali

README.md

@@ -15,20 +15,17 @@ v0.1.0已添加此特性 ：返回总记录数
 ### 1、使用pagehelper的Factory生成SessionManager
 
 ```cassandraql
-    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()
+    pFac := pagehelper.New(gobatis.NewFactory(
+                           		gobatis.SetMaxConn(100),
+                           		gobatis.SetMaxIdleConn(50),
+                           		gobatis.SetDataSource(&datasource.MysqlDataSource{
+                           			Host:     "localhost",
+                           			Port:     3306,
+                           			DBName:   "test",
+                           			Username: "root",
+                           			Password: "123",
+                           			Charset:  "utf8",
+                           		})))
     sessMgr := gobatis.NewSessionManager(pFac)
 ```
 

go.mod

@@ -2,4 +2,4 @@ module github.com/xfali/pagehelper
 
 go 1.12
 
-require github.com/xfali/gobatis v0.0.4
+require github.com/xfali/gobatis v0.0.5

go.sum

@@ -1,3 +1,6 @@
 github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
+github.com/mattn/go-sqlite3 v1.10.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
 github.com/xfali/gobatis v0.0.4 h1:rBR8m18xMQAL58jDIr+i9zj8RYC+Mfa9rOw4ZB3shf0=
 github.com/xfali/gobatis v0.0.4/go.mod h1:hXP3PcXMSYpYFHQejG04qQjSQJtrt8jWpslftkUMBrg=
+github.com/xfali/gobatis v0.0.5 h1:JFpkn0Gihxocc3ZXqKRv4p5q1JiIeRanL0rTdZRZX0Q=
+github.com/xfali/gobatis v0.0.5/go.mod h1:nAml9g3T+vn1qDF5nLzSQM9t4l9Fu56GYQ33bYp5Mok=

orm.go

@@ -93,6 +93,10 @@ func (f *Factory) InitDB() error {
     return f.fac.InitDB()
 }
 
+func (f *Factory) Close() error {
+    return f.fac.Close()
+}
+
 func (f *Factory) CreateTransaction() transaction.Transaction {
     return f.fac.CreateTransaction()
 }

pagehelper_test.go

@@ -11,8 +11,7 @@ package pagehelper
 import (
     "context"
     "github.com/xfali/gobatis"
-    "github.com/xfali/gobatis/factory"
-    "github.com/xfali/gobatis/logging"
+    "github.com/xfali/gobatis/datasource"
     "strings"
     "testing"
     "time"
@@ -99,20 +98,18 @@ func TestPageHelper(t *testing.T) {
 }
 
 func TestPageHelper2(t *testing.T) {
-    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(New(&fac))
+    pFac := New(gobatis.NewFactory(
+        gobatis.SetMaxConn(100),
+        gobatis.SetMaxIdleConn(50),
+        gobatis.SetDataSource(&datasource.MysqlDataSource{
+            Host:     "localhost",
+            Port:     3306,
+            DBName:   "test",
+            Username: "root",
+            Password: "123",
+            Charset:  "utf8",
+        })))
+    sessMgr := gobatis.NewSessionManager(pFac)
     session := sessMgr.NewSession()
     ctx, _ := context.WithTimeout(context.Background(), 2*time.Second)
     ctx = StartPage(ctx, 1, 2)