Merge pull request #36 from skriptble/master

l3pp4rd · l3pp4rd · commit f07154520503 · 2016-02-25T13:42:47.000Z
Fixing incorrect []byte handling in expectation.
diff --git a/expectations.go b/expectations.go
@@ -3,6 +3,7 @@ package sqlmock
 import (
 	"database/sql/driver"
 	"fmt"
+	"reflect"
 	"regexp"
 	"strings"
 	"sync"
@@ -349,7 +350,7 @@ func (e *queryBasedExpectation) argsMatches(args []driver.Value) error {
 			return fmt.Errorf("argument %d: non-subset type %T returned from Value", k, darg)
 		}
 
-		if darg != args[k] {
+		if !reflect.DeepEqual(darg, args[k]) {
 			return fmt.Errorf("argument %d expected [%T - %+v] does not match actual [%T - %+v]", k, darg, darg, args[k], args[k])
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@ package sqlmock`
`3`	`3`	`import (`
`4`	`4`	`"database/sql/driver"`
`5`	`5`	`"fmt"`
	`6`	`+ "reflect"`
`6`	`7`	`"regexp"`
`7`	`8`	`"strings"`
`8`	`9`	`"sync"`
`@@ -349,7 +350,7 @@ func (e *queryBasedExpectation) argsMatches(args []driver.Value) error {`
`349`	`350`	`return fmt.Errorf("argument %d: non-subset type %T returned from Value", k, darg)`
`350`	`351`	`}`
`351`	`352`
`352`		`- if darg != args[k] {`
	`353`	`+ if !reflect.DeepEqual(darg, args[k]) {`
`353`	`354`	`return fmt.Errorf("argument %d expected [%T - %+v] does not match actual [%T - %+v]", k, darg, darg, args[k], args[k])`
`354`	`355`	`}`
`355`	`356`	`}`