Adjusting < go 1.8 implementation

Benjamin Rupp · Benjamin Rupp · commit 4567d0a67086 · 2019-09-25T09:25:15.000-04:00
diff --git a/expectations_before_go18.go b/expectations_before_go18.go
@@ -3,7 +3,6 @@
 package sqlmock
 
 import (
-	"database/sql/driver"
 	"fmt"
 	"reflect"
 )
@@ -40,10 +39,6 @@ func (e *queryBasedExpectation) argsMatches(args []namedValue) error {
 			return fmt.Errorf("could not convert %d argument %T - %+v to driver value: %s", k, e.args[k], e.args[k], err)
 		}
 
-		if !driver.IsValue(darg) {
-			return fmt.Errorf("argument %d: non-subset type %T returned from Value", k, darg)
-		}
-
 		if !reflect.DeepEqual(darg, v.Value) {
 			return fmt.Errorf("argument %d expected [%T - %+v] does not match actual [%T - %+v]", k, darg, darg, v.Value, v.Value)
 		}

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,6 @@`
`3`	`3`	`package sqlmock`
`4`	`4`
`5`	`5`	`import (`
`6`		`- "database/sql/driver"`
`7`	`6`	`"fmt"`
`8`	`7`	`"reflect"`
`9`	`8`	`)`
`@@ -40,10 +39,6 @@ func (e *queryBasedExpectation) argsMatches(args []namedValue) error {`
`40`	`39`	`return fmt.Errorf("could not convert %d argument %T - %+v to driver value: %s", k, e.args[k], e.args[k], err)`
`41`	`40`	`}`
`42`	`41`
`43`		`- if !driver.IsValue(darg) {`
`44`		`- return fmt.Errorf("argument %d: non-subset type %T returned from Value", k, darg)`
`45`		`- }`
`46`		`-`
`47`	`42`	`if !reflect.DeepEqual(darg, v.Value) {`
`48`	`43`	`return fmt.Errorf("argument %d expected [%T - %+v] does not match actual [%T - %+v]", k, darg, darg, v.Value, v.Value)`
`49`	`44`	`}`