chwange

Author: OrCh3n

goqu.go

@@ -37,6 +37,12 @@ type SQLValuer struct {
 
 // Value converts the given value to the correct drive.Value.
 func (t SQLValuer) Value() (driver.Value, error) {
+	if valuer, ok := t.V.(driver.Valuer); ok {
+		if reflect.TypeOf(t.V).Kind() == reflect.Pointer && reflect.ValueOf(t.V).IsZero() {
+			return nil, nil
+		}
+		return valuer.Value()
+	}
 	switch t.V.(type) {
 	case []string, []bool, []float32, []float64, []int, []int64, []int32:
 		value, err := pq.Array(t.V).Value()
@@ -55,17 +61,6 @@ func (t SQLValuer) Value() (driver.Value, error) {
 		// if we didn't find a common type use reflection to guess if the type is of map
 		if reflect.TypeOf(t.V).Kind() == reflect.Map {
 			return json.Marshal(t.V)
-		} else if reflect.TypeOf(t.V).Kind() == reflect.Pointer {
-			if reflect.ValueOf(t.V).IsZero() {
-				return nil, nil
-			}
-			s := reflect.ValueOf(t.V).Elem().Interface()
-			if valuer, ok := s.(driver.Valuer); ok {
-				return valuer.Value()
-			}
-		}
-		if valuer, ok := t.V.(driver.Valuer); ok {
-			return valuer.Value()
 		}
 		return t.V, nil
 	}