Apply code review suggestions from cespare

ojrac · ojrac · commit d7601846e57c · 2019-12-03T15:18:03.000-05:00
diff --git a/bind.go b/bind.go
@@ -98,24 +98,26 @@ func rebindBuff(bindType int, query string) string {
 	return rqb.String()
 }
 
-func asSliceToExpand(i interface{}) (v reflect.Value, ok bool) {
+func asSliceForIn(i interface{}) (v reflect.Value, ok bool) {
 	if i == nil {
-		ok = false
-		return
+		return reflect.Value{}, false
 	}
 
 	v = reflect.ValueOf(i)
 	t := reflectx.Deref(v.Type())
 
+	// Only expand slices
+	if t.Kind() != reflect.Slice {
+		return reflect.Value{}, false
+	}
+
 	// []byte is a driver.Value type so it should not be expanded
-	ok = t.Kind() == reflect.Slice && t != reflect.TypeOf([]byte{})
+	if t == reflect.TypeOf([]byte{}) {
+		return reflect.Value{}, false
 
-	if !ok {
-		// Don't return non-expandable values
-		v = reflect.Value{}
 	}
 
-	return
+	return v, true
 }
 
 // In expands slice values in args, returning the modified query string
@@ -140,7 +142,7 @@ func In(query string, args ...interface{}) (string, []interface{}, error) {
 			arg, _ = a.Value()
 		}
 
-		if v, ok := asSliceToExpand(arg); ok {
+		if v, ok := asSliceForIn(arg); ok {
 			meta[i].length = v.Len()
 			meta[i].v = v
 
