适配gobatis v0.1.1+

Author: xfali

go.mod

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

go.sum

@@ -4,3 +4,5 @@ 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=
+github.com/xfali/gobatis v0.1.1 h1:2F1q6bylWG9bc05/OApDGSSrocT/lKrO1U0WclvgcU0=
+github.com/xfali/gobatis v0.1.1/go.mod h1:nAml9g3T+vn1qDF5nLzSQM9t4l9Fu56GYQ33bYp5Mok=

orm.go

@@ -11,6 +11,7 @@ import (
     "fmt"
     "github.com/xfali/gobatis"
     "github.com/xfali/gobatis/common"
+    "github.com/xfali/gobatis/datasource"
     "github.com/xfali/gobatis/executor"
     "github.com/xfali/gobatis/factory"
     "github.com/xfali/gobatis/logging"
@@ -84,14 +85,18 @@ func (exec *Executor) Query(ctx context.Context, result reflection.Object, sql s
     return exec.exec.Query(ctx, result, sql, params...)
 }
 
-func (f *Factory) InitDB() error {
-    return f.fac.InitDB()
+func (f *Factory) Open(source datasource.DataSource) error {
+    return f.fac.Open(source)
 }
 
 func (f *Factory) Close() error {
     return f.fac.Close()
 }
 
+func (f *Factory) GetDataSource() datasource.DataSource {
+    return f.fac.GetDataSource()
+}
+
 func (f *Factory) CreateTransaction() transaction.Transaction {
     return f.fac.CreateTransaction()
 }
@@ -106,13 +111,10 @@ func (f *Factory) LogFunc() logging.LogFunc {
 }
 
 func (f *Factory) CreateExecutor(transaction transaction.Transaction) executor.Executor {
-    driver := ""
-    if defaultFac, ok := f.fac.(*factory.DefaultFactory); ok {
-        driver = defaultFac.DataSource.DriverName()
-    }
+    driver := f.fac.GetDataSource().DriverName()
 
     return &Executor{
-        exec:     executor.NewSimpleExecutor(transaction),
+        exec:     f.fac.CreateExecutor(transaction),
         log:      f.LogFunc(),
         modifier: SelectModifier(driver),
     }