增加sqlite测试用例，factory增加close方法

Author: xfali

.gitignore

@@ -13,4 +13,5 @@
 
 *.zip
 /.idea/
+*.db
 

README.md

@@ -46,6 +46,25 @@ func InitDB() *gobatis.SessionManager {
     return gobatis.NewSessionManager(&fac)
 }
 ```
+*注意：*
+
+gobatis.NewFactory当连接数据库失败时会返回nil，如果需要知道具体的失败原因请使用：
+```cassandraql
+fac, err := gobatis.CreateFactory(
+    		gobatis.SetMaxConn(100),
+    		gobatis.SetMaxIdleConn(50),
+    		gobatis.SetDataSource(&datasource.MysqlDataSource{
+    			Host:     "localhost",
+    			Port:     3306,
+    			DBName:   "test",
+    			Username: "root",
+    			Password: "123",
+    			Charset:  "utf8",
+    		}))
+if err != nil {
+    t.Log(err)
+}
+```
 
 ### 2、定义Model
 

datasource/common_datasource.go

@@ -0,0 +1,22 @@
+/**
+ * Copyright (C) 2019, Xiongfa Li.
+ * All right reserved.
+ * @author xiongfa.li
+ * @version V1.0
+ * Description:
+ */
+
+package datasource
+
+type CommonDataSource struct {
+    Name string
+    Info string
+}
+
+func (ds *CommonDataSource) DriverName() string {
+    return ds.Name
+}
+
+func (ds *CommonDataSource) DriverInfo() string {
+    return ds.Info
+}

datasource/datasource.go

@@ -10,5 +10,5 @@ package datasource
 
 type DataSource interface {
 	DriverName() string
-	Info() string
+	DriverInfo() string
 }

datasource/mysql_datasource.go

@@ -10,6 +10,8 @@ package datasource
 
 import "fmt"
 
+//import _ "github.com/go-sql-driver/mysql"
+
 type MysqlDataSource struct {
 	Host     string
 	Port     int
@@ -23,6 +25,6 @@ func (ds *MysqlDataSource) DriverName() string {
 	return "mysql"
 }
 
-func (ds *MysqlDataSource) Info() string {
+func (ds *MysqlDataSource) DriverInfo() string {
 	return fmt.Sprintf("%s:%s@tcp(%s:%d)/%s?charset=%s", ds.Username, ds.Password, ds.Host, ds.Port, ds.DBName, ds.Charset)
 }

datasource/postgre_datasource.go

@@ -23,6 +23,6 @@ func (ds *PostgreDataSource) DriverName() string {
 	return "postgres"
 }
 
-func (ds *PostgreDataSource) Info() string {
+func (ds *PostgreDataSource) DriverInfo() string {
 	return fmt.Sprintf("host=%s port=%d user=%s password=%s dbname=%s sslmode=%s", ds.Host, ds.Port, ds.Username, ds.Password, ds.DBName, ds.SslMode)
 }

datasource/sqlite_datasource.go

@@ -0,0 +1,21 @@
+// Copyright (C) 2019, Xiongfa Li.
+// All right reserved.
+// @author xiongfa.li
+// @version V1.0
+// Description:
+
+package datasource
+
+//import _ "github.com/mattn/go-sqlite3"
+
+type SqliteDataSource struct {
+	Path string
+}
+
+func (ds *SqliteDataSource) DriverName() string {
+	return "sqlite3"
+}
+
+func (ds *SqliteDataSource) DriverInfo() string {
+	return ds.Path
+}

faccreator.go

@@ -16,6 +16,11 @@ import (
 type FacOpt func(f *factory.DefaultFactory)
 
 func NewFactory(opts ...FacOpt) factory.Factory {
+	f, _ := CreateFactory(opts...)
+	return f
+}
+
+func CreateFactory(opts ...FacOpt) (factory.Factory, error) {
 	f := &factory.DefaultFactory{
 		Log: logging.DefaultLogf,
 	}
@@ -38,11 +43,12 @@ func NewFactory(opts ...FacOpt) factory.Factory {
 		}
 	}
 
-	if f.InitDB() != nil {
-		return nil
+	err := f.InitDB()
+	if err != nil {
+		return nil, err
 	}
 
-	return f
+	return f, nil
 }
 
 func SetMaxConn(v int) FacOpt {

factory/default_factory.go

@@ -53,7 +53,7 @@ func (f *DefaultFactory) InitDB() error {
 		return errors.FACTORY_INITED
 	}
 
-	db, err := sql.Open(f.DataSource.DriverName(), f.DataSource.Info())
+	db, err := sql.Open(f.DataSource.DriverName(), f.DataSource.DriverInfo())
 	if err != nil {
 		return err
 	}
@@ -66,6 +66,13 @@ func (f *DefaultFactory) InitDB() error {
 	return nil
 }
 
+func (f *DefaultFactory) Close() error {
+	if f.db != nil {
+		return f.db.Close()
+	}
+	return nil
+}
+
 func (f *DefaultFactory) CreateTransaction() transaction.Transaction {
 	return transaction.NewDefaultTransaction(f.DataSource, f.db)
 }

factory/factory.go

@@ -9,16 +9,18 @@
 package factory
 
 import (
-    "github.com/xfali/gobatis/executor"
-    "github.com/xfali/gobatis/logging"
-    "github.com/xfali/gobatis/session"
-    "github.com/xfali/gobatis/transaction"
+	"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
-    CreateTransaction() transaction.Transaction
-    CreateExecutor(transaction.Transaction) executor.Executor
-    CreateSession() session.SqlSession
-    LogFunc() logging.LogFunc
+	InitDB() error
+	Close() error
+
+	CreateTransaction() transaction.Transaction
+	CreateExecutor(transaction.Transaction) executor.Executor
+	CreateSession() session.SqlSession
+	LogFunc() logging.LogFunc
 }

go.mod

@@ -2,4 +2,7 @@ module github.com/xfali/gobatis
 
 go 1.11
 
-require github.com/go-sql-driver/mysql v1.4.1
+require (
+	github.com/go-sql-driver/mysql v1.4.1 // indirect
+	github.com/mattn/go-sqlite3 v1.10.0 // indirect
+)

go.sum

@@ -1,2 +1,4 @@
 github.com/go-sql-driver/mysql v1.4.1 h1:g24URVg0OFbNUTx9qqY1IRZ9D9z3iPyi5zKhQZpNwpA=
 github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
+github.com/mattn/go-sqlite3 v1.10.0 h1:jbhqpg7tQe4SupckyijYiy0mJJ/pRyHvXf7JdWK860o=
+github.com/mattn/go-sqlite3 v1.10.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=