- accept interface instead of *sql.DB

- improve interface

Author: rocketlaunchr-cto

conn.go

@@ -18,7 +18,7 @@ import (
 // connection fail with ErrConnDone.
 type Conn struct {
 	conn         *stdSql.Conn
-	killerPool   *stdSql.DB
+	killerPool   StdSQLDB
 	connectionID string
 }
 

db.go

@@ -23,10 +23,10 @@ import (
 // can be controlled with SetMaxIdleConns.
 type DB struct {
 	// DB is the primary connection pool
-	DB *stdSql.DB
+	DB StdSQLDB
 	// KillerPool is an optional (but recommended) secondary connection pool.
 	// If provided, it is used to fire KILL signals.
-	KillerPool *stdSql.DB
+	KillerPool StdSQLDB
 }
 
 // Begin starts a transaction. The default isolation level is dependent on

helpers.go

@@ -2,14 +2,10 @@
 
 package sql
 
-import (
-	stdSql "database/sql"
-)
-
 // kill is used to kill a running query.
 // It is advised that db be another pool that the
 // connection was NOT derived from.
-func kill(db *stdSql.DB, connectionID string) error {
+func kill(db StdSQLDB, connectionID string) error {
 
 	if connectionID == "" {
 		return nil

interfaces.go

@@ -5,6 +5,8 @@ package sql
 import (
 	"context"
 	stdSql "database/sql"
+	"database/sql/driver"
+	"time"
 )
 
 // StdSQLCommon is the interface that allows query and exec interactions with a database.
@@ -24,9 +26,16 @@ type StdSQLDB interface {
 	Ping() error
 	PingContext(ctx context.Context) error
 	StdSQLCommon
+	Conn(ctx context.Context) (*stdSql.Conn, error)
 	Begin() (*stdSql.Tx, error)
 	BeginTx(ctx context.Context, opts *stdSql.TxOptions) (*stdSql.Tx, error)
 	Close() error
+
+	Driver() driver.Driver
+	SetConnMaxLifetime(d time.Duration)
+	SetMaxIdleConns(n int)
+	SetMaxOpenConns(n int)
+	Stats() stdSql.DBStats
 }
 
 // StdSQLTx is the interface that allows a transaction to be committed or rolledback.
@@ -38,11 +47,11 @@ type StdSQLTx interface {
 	Rollback() error
 }
 
-// SQLBasic is the interface that allows sql.DB, Conn and Stmt to be used.
+// SQLBasic is the interface that allows Conn and Stmt to be used.
 type SQLBasic interface {
 	ExecContext(ctx context.Context, query string, args ...interface{}) (stdSql.Result, error)
-	QueryContext(ctx context.Context, query string, args ...interface{}) (*stdSql.Rows, error)
-	QueryRowContext(ctx context.Context, query string, args ...interface{}) *stdSql.Row
+	QueryContext(ctx context.Context, query string, args ...interface{}) (*Rows, error)
+	QueryRowContext(ctx context.Context, query string, args ...interface{}) *Row
 }
 
 // SQLConn is the interface that allows Conn and Stmt to be used.

row.go

@@ -9,7 +9,7 @@ import (
 type Row struct {
 	ctx          context.Context
 	row          *stdSql.Row
-	killerPool   *stdSql.DB
+	killerPool   StdSQLDB
 	connectionID string
 }
 

rows.go

@@ -10,7 +10,7 @@ import (
 type Rows struct {
 	ctx          context.Context
 	rows         *stdSql.Rows
-	killerPool   *stdSql.DB
+	killerPool   StdSQLDB
 	connectionID string
 }
 

stmt.go

@@ -11,7 +11,7 @@ import (
 // A Stmt is safe for concurrent use by multiple goroutines.
 type Stmt struct {
 	stmt         *stdSql.Stmt
-	killerPool   *stdSql.DB
+	killerPool   StdSQLDB
 	connectionID string
 }
 

tx.go

@@ -20,7 +20,7 @@ import (
 // by the call to Commit or Rollback.
 type Tx struct {
 	tx           *stdSql.Tx
-	killerPool   *stdSql.DB
+	killerPool   StdSQLDB
 	connectionID string
 
 	// Lock and store stmts