Remove some old Go version specific logic

This fork doesn't aim at supporting very old Go versions, so the
logic that existed to keep the implementation backwards compatible
with those old Go versions was removed.

Author: hslatman

conn.go

@@ -20,6 +20,8 @@ var (
 	_ driver.Pinger             = wrappedConn{}
 	_ driver.Queryer            = wrappedConn{}
 	_ driver.QueryerContext     = wrappedConn{}
+	_ driver.NamedValueChecker  = wrappedConn{}
+	_ driver.SessionResetter    = wrappedConn{}
 )
 
 func (c wrappedConn) Prepare(query string) (driver.Stmt, error) {
@@ -179,3 +181,35 @@ func (c wrappedParentConn) QueryContext(ctx context.Context, query string, args
 		return c.Conn.(driver.Queryer).Query(query, dargs)
 	}
 }
+
+func defaultCheckNamedValue(nv *driver.NamedValue) (err error) {
+	nv.Value, err = driver.DefaultParameterConverter.ConvertValue(nv.Value)
+	return err
+}
+
+func (c wrappedConn) CheckNamedValue(v *driver.NamedValue) error {
+	if checker, ok := c.parent.(driver.NamedValueChecker); ok {
+		return checker.CheckNamedValue(v)
+	}
+
+	return defaultCheckNamedValue(v)
+}
+
+func (c wrappedConn) ResetSession(ctx context.Context) error {
+	conn, ok := c.parent.(driver.SessionResetter)
+	if !ok {
+		return nil
+	}
+
+	return conn.ResetSession(ctx)
+}
+
+func (c wrappedConn) IsValid() bool {
+	conn, ok := c.parent.(driver.Validator)
+	if !ok {
+		// the default if driver.Validator is not supported
+		return true
+	}
+
+	return conn.IsValid()
+}

conn_go110.go

@@ -1,5 +1,3 @@
-// +build go1.10
-
 package sqlmw
 
 import (

conn_go115.go

@@ -1,5 +1,3 @@
-// +build go1.10
-
 package sqlmw
 
 import (

conn_go19.go

@@ -2,15 +2,16 @@ package sqlmw
 
 import "database/sql/driver"
 
-// driver wraps a sql.Driver with an interceptor.
+// wrappedDriver wraps a sql.Driver with an interceptor.
 type wrappedDriver struct {
 	intr   Interceptor
 	parent driver.Driver
 }
 
 // Compile time validation that our types implement the expected interfaces
 var (
-	_ driver.Driver = wrappedDriver{}
+	_ driver.Driver        = wrappedDriver{}
+	_ driver.DriverContext = wrappedDriver{}
 )
 
 // WrapDriver will wrap the passed SQL driver and return a new sql driver that uses it and also logs and traces calls using the passed logger and tracer
@@ -36,3 +37,21 @@ func (d wrappedDriver) Open(name string) (driver.Conn, error) {
 
 	return wrappedConn{intr: d.intr, parent: conn}, nil
 }
+
+// OpenConnector implements the database/sql/driver.Driver interface for WrappedDriver.
+func (d wrappedDriver) OpenConnector(name string) (driver.Connector, error) {
+	driver, ok := d.parent.(driver.DriverContext)
+	if !ok {
+		return wrappedConnector{
+			parent:    dsnConnector{dsn: name, driver: d.parent},
+			driverRef: &d,
+		}, nil
+	}
+
+	conn, err := driver.OpenConnector(name)
+	if err != nil {
+		return nil, err
+	}
+
+	return wrappedConnector{parent: conn, driverRef: &d}, nil
+}

connector.go

@@ -15,10 +15,11 @@ type wrappedStmt struct {
 
 // Compile time validation that our types implement the expected interfaces
 var (
-	_ driver.Stmt             = wrappedStmt{}
-	_ driver.StmtExecContext  = wrappedStmt{}
-	_ driver.StmtQueryContext = wrappedStmt{}
-	_ driver.ColumnConverter  = wrappedStmt{}
+	_ driver.Stmt              = wrappedStmt{}
+	_ driver.StmtExecContext   = wrappedStmt{}
+	_ driver.StmtQueryContext  = wrappedStmt{}
+	_ driver.ColumnConverter   = wrappedStmt{}
+	_ driver.NamedValueChecker = wrappedStmt{}
 )
 
 func (s wrappedStmt) Close() (err error) {
@@ -108,3 +109,15 @@ func (s wrappedParentStmt) ExecContext(ctx context.Context, args []driver.NamedV
 	}
 	return s.Exec(dargs)
 }
+
+func (s wrappedStmt) CheckNamedValue(v *driver.NamedValue) error {
+	if checker, ok := s.parent.(driver.NamedValueChecker); ok {
+		return checker.CheckNamedValue(v)
+	}
+
+	if checker, ok := s.conn.parent.(driver.NamedValueChecker); ok {
+		return checker.CheckNamedValue(v)
+	}
+
+	return defaultCheckNamedValue(v)
+}