fix slq.Scanner for Option (#39)

Author: Dean Karn

CHANGELOG.md

@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [5.21.3] - 2023-10-11
+### Fixed
+- Fix SQL Scanner interface not returning None for Option when source data is nil.
+
 ## [5.21.2] - 2023-07-13
 ### Fixed
 - Updated default form/url.Value encoder/decoder with fix for bubbling up invalid array index values.
@@ -74,7 +78,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - Added `timext.NanoTime` for fast low level monotonic time with nanosecond precision.
 
-[Unreleased]: https://github.com/go-playground/pkg/compare/v5.21.2...HEAD
+[Unreleased]: https://github.com/go-playground/pkg/compare/v5.21.3...HEAD
+[5.21.3]: https://github.com/go-playground/pkg/compare/v5.21.2..v5.21.3
 [5.21.2]: https://github.com/go-playground/pkg/compare/v5.21.1..v5.21.2
 [5.21.1]: https://github.com/go-playground/pkg/compare/v5.21.0..v5.21.1
 [5.21.0]: https://github.com/go-playground/pkg/compare/v5.20.0..v5.21.0

README.md

@@ -1,6 +1,6 @@
 # pkg
 
-![Project status](https://img.shields.io/badge/version-5.21.2-green.svg)
+![Project status](https://img.shields.io/badge/version-5.21.3-green.svg)
 [![Lint & Test](https://github.com/go-playground/pkg/actions/workflows/go.yml/badge.svg)](https://github.com/go-playground/pkg/actions/workflows/go.yml)
 [![Coverage Status](https://coveralls.io/repos/github/go-playground/pkg/badge.svg?branch=master)](https://coveralls.io/github/go-playground/pkg?branch=master)
 [![GoDoc](https://godoc.org/github.com/go-playground/pkg?status.svg)](https://pkg.go.dev/mod/github.com/go-playground/pkg/v5)

values/option/option.go

@@ -145,6 +145,11 @@ func (o Option[T]) Value() (driver.Value, error) {
 // Scan implements the sql.Scanner interface.
 func (o *Option[T]) Scan(value any) error {
 
+	if value == nil {
+		*o = None[T]()
+		return nil
+	}
+
 	val := reflect.ValueOf(&o.value)
 
 	if val.Type().Implements(scanType) {
@@ -156,10 +161,6 @@ func (o *Option[T]) Scan(value any) error {
 		return nil
 	}
 
-	if value == nil {
-		*o = None[T]()
-		return nil
-	}
 	val = val.Elem()
 
 	switch val.Kind() {

values/option/option_test.go

@@ -166,6 +166,9 @@ type customScanner struct {
 }
 
 func (c *customScanner) Scan(src interface{}) error {
+	if src == nil {
+		return nil
+	}
 	c.S = src.(string)
 	return nil
 }
@@ -242,6 +245,12 @@ func TestSQLScanner(t *testing.T) {
 	Equal(t, err, nil)
 	Equal(t, custom, Some(customScanner{S: "GOT HERE"}))
 
+	// custom scanner scan nil
+	var customNil Option[customScanner]
+	err = customNil.Scan(nil)
+	Equal(t, err, nil)
+	Equal(t, customNil, None[customScanner]())
+
 	// test unmarshal to struct
 	type myStruct struct {
 		Name string `json:"name"`