rebase & support sql.Scanner iface

Author: 4el0ve4ek

internal/value/cast.go

@@ -1,5 +1,12 @@
 package value
 
+import (
+	"database/sql"
+	"database/sql/driver"
+
+	"github.com/google/uuid"
+)
+
 func CastTo(v Value, dst interface{}) error {
 	if dst == nil {
 		return errNilDestination
@@ -10,13 +17,20 @@ func CastTo(v Value, dst interface{}) error {
 		return nil
 	}
 
-	if scanner, has := dst.(Scanner); has {
-		return scanner.UnmarshalYDBValue(v)
+	if _, ok := dst.(*uuid.UUID); ok {
+		return v.castTo(dst)
 	}
 
-	return v.castTo(dst)
-}
+	if scanner, has := dst.(sql.Scanner); has {
+		dv := new(driver.Value)
 
-type Scanner interface {
-	UnmarshalYDBValue(value Value) error
+		err := v.castTo(dv)
+		if err != nil {
+			return err
+		}
+
+		return scanner.Scan(*dv)
+	}
+
+	return v.castTo(dst)
 }

internal/value/cast_test.go

@@ -2,6 +2,7 @@ package value
 
 import (
 	"database/sql/driver"
+	"errors"
 	"reflect"
 	"testing"
 	"time"
@@ -32,12 +33,17 @@ func loadLocation(t *testing.T, name string) *time.Location {
 	return loc
 }
 
-type testStringValueScanner struct {
-	field string
-}
+type testStringSQLScanner string
+
+func (s *testStringSQLScanner) Scan(value any) error {
+	ts, ok := value.(string)
+	if !ok {
+		return errors.New("can't cast from " + reflect.TypeOf(value).String() + " to string")
+	}
+
+	*s = testStringSQLScanner(ts)
 
-func (s *testStringValueScanner) UnmarshalYDBValue(v Value) error {
-	return CastTo(v, &s.field)
+	return nil
 }
 
 func TestCastTo(t *testing.T) {
@@ -439,8 +445,8 @@ func TestCastTo(t *testing.T) {
 		{
 			name:  xtest.CurrentFileLine(),
 			value: TextValue("text-string"),
-			dst:   ptr[testStringValueScanner](),
-			exp:   testStringValueScanner{field: "text-string"},
+			dst:   ptr[testStringSQLScanner](),
+			exp:   testStringSQLScanner("text-string"),
 			err:   nil,
 		},
 	}

internal/value/value.go

@@ -1303,7 +1303,7 @@ func (v *listValue) castTo(dst any) error {
 		inner.Set(newSlice)
 
 		for i, item := range v.ListItems() {
-			if err := item.castTo(inner.Index(i).Addr().Interface()); err != nil {
+			if err := CastTo(item, inner.Index(i).Addr().Interface()); err != nil {
 				return xerrors.WithStackTrace(fmt.Errorf(
 					"%w '%s(%+v)' to '%T' destination",
 					ErrCannotCast, v.Type().Yql(), v, dstValue,
@@ -1437,7 +1437,7 @@ func (v *setValue) castTo(dst any) error {
 		inner.Set(newSlice)
 
 		for i, item := range v.items {
-			if err := item.castTo(inner.Index(i).Addr().Interface()); err != nil {
+			if err := CastTo(item, inner.Index(i).Addr().Interface()); err != nil {
 				return xerrors.WithStackTrace(fmt.Errorf(
 					"%w '%s(%+v)' to '%T' destination",
 					ErrCannotCast, v.Type().Yql(), v, dstValue,
@@ -1545,7 +1545,7 @@ func (v *optionalValue) castTo(dst any) error {
 			return nil
 		}
 
-		if err := v.value.castTo(ptr.Interface()); err != nil {
+		if err := CastTo(v.value, (ptr.Interface())); err != nil {
 			return xerrors.WithStackTrace(err)
 		}
 
@@ -1560,7 +1560,7 @@ func (v *optionalValue) castTo(dst any) error {
 
 	inner.Set(reflect.New(inner.Type().Elem()))
 
-	if err := v.value.castTo(inner.Interface()); err != nil {
+	if err := CastTo(v.value, inner.Interface()); err != nil {
 		return xerrors.WithStackTrace(err)
 	}
 
@@ -1641,7 +1641,7 @@ func (v *structValue) castTo(dst any) error {
 		}
 
 		for i, field := range v.fields {
-			if err := field.V.castTo(inner.Field(i).Addr().Interface()); err != nil {
+			if err := CastTo(field.V, inner.Field(i).Addr().Interface()); err != nil {
 				return xerrors.WithStackTrace(fmt.Errorf(
 					"scan error on struct field name '%s': %w",
 					field.Name, err,
@@ -1768,7 +1768,7 @@ func (v *tupleValue) TupleItems() []Value {
 
 func (v *tupleValue) castTo(dst any) error {
 	if len(v.items) == 1 {
-		return v.items[0].castTo(dst)
+		return CastTo(v.items[0], dst)
 	}
 
 	switch dstValue := dst.(type) {