Merge pull request #4 from ricardo-ch/add-optimization

added changes for optimal way to set advanced settings

README.md

@@ -16,7 +16,7 @@ Below is an example you can find MsSql implementation.
 // you need to import sql driver
 import _ "github.com/denisenkom/go-mssqldb"
 
-// connect to MsSql Database
+// set your credentials for MsSql Database
 msSqlConf := dbprovider.MsSqlConfig{
 		Database: "YOUR_DBNAME",
 		Port:     "YOUR_PORT",
@@ -25,7 +25,13 @@ msSqlConf := dbprovider.MsSqlConfig{
 		Password: "YOUR_PWD",
 }
 
-dbase, _ := db.Connect(msSqlConf, 1)
+// in case if you need to use default parametes
+dbase, _ := db.Connect(msSqlConf, nil)
+
+//in case for additional configuration
+// dbase, _ := db.Connect(msSqlConf, func(db *sqlx.DB){
+//	db.SetMaxIdleConns(5)
+// })
 
 // close connection after using
 defer func() {

database.go

@@ -1,29 +1,32 @@
 package database
 
-import "github.com/jmoiron/sqlx"
+import (
+	"github.com/jmoiron/sqlx"
+)
 
 type ConnectionBuilder interface {
 	DriverName() string
 	Build() string
 }
 
-// var sqlConnect *sqlx.DB
 var sqlConnect = sqlx.Connect
-var setMaxIdleConns = func(db *sqlx.DB, maxIdleDBConnections int) {
-	db.SetMaxIdleConns(maxIdleDBConnections)
-}
 
-func connect(driverName, connectionString string, maxIdleDBConnections int) (*sqlx.DB, error) {
+func connect(driverName, connectionString string, advFunc func(*sqlx.DB)) (*sqlx.DB, error) {
 	db, err := sqlConnect(driverName, connectionString)
+
 	if err != nil {
 		return nil, err
 	}
 
-	setMaxIdleConns(db, maxIdleDBConnections)
+	// execute function
+	if advFunc != nil {
+		advFunc(db)
+	}
+
 	return db.Unsafe(), nil
 }
 
 // Connect to DB
-func Connect(builder ConnectionBuilder, maxIdleDBConnections int) (*sqlx.DB, error) {
-	return connect(builder.DriverName(), builder.Build(), maxIdleDBConnections)
+func Connect(builder ConnectionBuilder, advFunc func(*sqlx.DB)) (*sqlx.DB, error) {
+	return connect(builder.DriverName(), builder.Build(), advFunc)
 }

database_test.go

@@ -34,9 +34,6 @@ var connectTests = [2]struct {
 
 func TestConnect(t *testing.T) {
 
-	setMaxIdleConns = func(db *sqlx.DB, maxIdleDBConnections int) {
-	}
-
 	var dbHost = "YOUR_HOST"
 	var dbPort = 0
 	var dbName = "YOUR_DBNAME"
@@ -55,7 +52,7 @@ func TestConnect(t *testing.T) {
 		sqlConnect = test.connect
 
 		//Act
-		_, err := Connect(mssqlConf, -1)
+		_, err := Connect(mssqlConf, nil)
 
 		assert.Equal(t, test.expectedError, err, test.description)
 	}

example/mssql/main.go

@@ -27,7 +27,7 @@ func main() {
 		Log:      &Log,
 	}
 
-	dbase, err := db.Connect(msSqlConf, 1)
+	dbase, err := db.Connect(msSqlConf, nil)
 	if err != nil {
 		fmt.Println(err)
 	}
@@ -39,5 +39,4 @@ func main() {
 			dbase.Close()
 		}
 	}()
-
 }

example/postgres/main.go

@@ -28,7 +28,7 @@ func main() {
 		Password: dbPwd,
 	}
 
-	dbase, err := db.Connect(pqConf, -1)
+	dbase, err := db.Connect(pqConf, nil)
 	if err != nil {
 		log.Fatalln(err)
 	}