修改factory的接口方法

Author: xfali

faccreator.go

@@ -43,7 +43,7 @@ func CreateFactory(opts ...FacOpt) (factory.Factory, error) {
 		}
 	}
 
-	err := f.InitDB()
+	err := f.Open(f.DataSource)
 	if err != nil {
 		return nil, err
 	}

factory/default_factory.go

@@ -45,14 +45,18 @@ type DefaultFactory struct {
 	mutex sync.Mutex
 }
 
-func (f *DefaultFactory) InitDB() error {
+func (f *DefaultFactory) Open(ds datasource.DataSource) error {
 	f.mutex.Lock()
 	defer f.mutex.Unlock()
 
 	if f.db != nil {
 		return errors.FACTORY_INITED
 	}
 
+	if ds != nil {
+		f.DataSource = ds
+	}
+
 	db, err := sql.Open(f.DataSource.DriverName(), f.DataSource.DriverInfo())
 	if err != nil {
 		return err
@@ -73,6 +77,10 @@ func (f *DefaultFactory) Close() error {
 	return nil
 }
 
+func (f *DefaultFactory) GetDataSource() datasource.DataSource {
+	return f.DataSource
+}
+
 func (f *DefaultFactory) CreateTransaction() transaction.Transaction {
 	return transaction.NewDefaultTransaction(f.DataSource, f.db)
 }

factory/factory.go

@@ -9,16 +9,19 @@
 package factory
 
 import (
+	"github.com/xfali/gobatis/datasource"
 	"github.com/xfali/gobatis/executor"
 	"github.com/xfali/gobatis/logging"
 	"github.com/xfali/gobatis/session"
 	"github.com/xfali/gobatis/transaction"
 )
 
 type Factory interface {
-	InitDB() error
+	Open(datasource.DataSource) error
 	Close() error
 
+	GetDataSource() datasource.DataSource
+
 	CreateTransaction() transaction.Transaction
 	CreateExecutor(transaction.Transaction) executor.Executor
 	CreateSession() session.SqlSession