set=true in more places

Author: razor-1

bool.go

@@ -6,7 +6,7 @@ import (
 	"encoding/json"
 	"errors"
 
-	"github.com/volatiletech/null/v8/convert"
+	"github.com/razor-1/null/v9/convert"
 )
 
 // Bool is a nullable bool.
@@ -62,6 +62,7 @@ func (b *Bool) UnmarshalJSON(data []byte) error {
 
 // UnmarshalText implements encoding.TextUnmarshaler.
 func (b *Bool) UnmarshalText(text []byte) error {
+	b.set = true
 	if text == nil || len(text) == 0 {
 		b.Valid = false
 		return nil
@@ -107,6 +108,7 @@ func (b Bool) MarshalText() ([]byte, error) {
 func (b *Bool) SetValid(v bool) {
 	b.Bool = v
 	b.Valid = true
+	b.set = true
 }
 
 // Ptr returns a pointer to this Bool's value, or a nil pointer if this Bool is null.
@@ -124,6 +126,7 @@ func (b Bool) IsZero() bool {
 
 // Scan implements the Scanner interface.
 func (b *Bool) Scan(value interface{}) error {
+	b.set = true
 	if value == nil {
 		b.Bool, b.Valid = false, false
 		return nil

byte.go

@@ -66,6 +66,7 @@ func (b *Byte) UnmarshalJSON(data []byte) error {
 
 // UnmarshalText implements encoding.TextUnmarshaler.
 func (b *Byte) UnmarshalText(text []byte) error {
+	b.set = true
 	if text == nil || len(text) == 0 {
 		b.Valid = false
 		return nil
@@ -100,6 +101,7 @@ func (b Byte) MarshalText() ([]byte, error) {
 func (b *Byte) SetValid(n byte) {
 	b.Byte = n
 	b.Valid = true
+	b.set = true
 }
 
 // Ptr returns a pointer to this Byte's value, or a nil pointer if this Byte is null.
@@ -117,6 +119,7 @@ func (b Byte) IsZero() bool {
 
 // Scan implements the Scanner interface.
 func (b *Byte) Scan(value interface{}) error {
+	b.set = true
 	if value == nil {
 		b.Byte, b.Valid = 0, false
 		return nil

bytes.go

@@ -5,7 +5,7 @@ import (
 	"database/sql/driver"
 	"encoding/json"
 
-	"github.com/volatiletech/null/v8/convert"
+	"github.com/razor-1/null/v9/convert"
 )
 
 // NullBytes is a global byte slice of JSON null
@@ -67,6 +67,7 @@ func (b *Bytes) UnmarshalJSON(data []byte) error {
 
 // UnmarshalText implements encoding.TextUnmarshaler.
 func (b *Bytes) UnmarshalText(text []byte) error {
+	b.set = true
 	if len(text) == 0 {
 		b.Bytes = nil
 		b.Valid = false
@@ -98,6 +99,7 @@ func (b Bytes) MarshalText() ([]byte, error) {
 func (b *Bytes) SetValid(n []byte) {
 	b.Bytes = n
 	b.Valid = true
+	b.set = true
 }
 
 // Ptr returns a pointer to this Bytes's value, or a nil pointer if this Bytes is null.
@@ -115,6 +117,7 @@ func (b Bytes) IsZero() bool {
 
 // Scan implements the Scanner interface.
 func (b *Bytes) Scan(value interface{}) error {
+	b.set = true
 	if value == nil {
 		b.Bytes, b.Valid = []byte{}, false
 		return nil

float32.go

@@ -6,7 +6,7 @@ import (
 	"encoding/json"
 	"strconv"
 
-	"github.com/volatiletech/null/v8/convert"
+	"github.com/razor-1/null/v9/convert"
 )
 
 // Float32 is a nullable float32.
@@ -63,6 +63,7 @@ func (f *Float32) UnmarshalJSON(data []byte) error {
 
 // UnmarshalText implements encoding.TextUnmarshaler.
 func (f *Float32) UnmarshalText(text []byte) error {
+	f.set = true
 	if text == nil || len(text) == 0 {
 		f.Valid = false
 		return nil
@@ -96,6 +97,7 @@ func (f Float32) MarshalText() ([]byte, error) {
 func (f *Float32) SetValid(n float32) {
 	f.Float32 = n
 	f.Valid = true
+	f.set = true
 }
 
 // Ptr returns a pointer to this Float32's value, or a nil pointer if this Float32 is null.
@@ -113,6 +115,7 @@ func (f Float32) IsZero() bool {
 
 // Scan implements the Scanner interface.
 func (f *Float32) Scan(value interface{}) error {
+	f.set = true
 	if value == nil {
 		f.Float32, f.Valid = 0, false
 		return nil

float64.go

@@ -6,7 +6,7 @@ import (
 	"encoding/json"
 	"strconv"
 
-	"github.com/volatiletech/null/v8/convert"
+	"github.com/razor-1/null/v9/convert"
 )
 
 // Float64 is a nullable float64.
@@ -61,6 +61,7 @@ func (f *Float64) UnmarshalJSON(data []byte) error {
 
 // UnmarshalText implements encoding.TextUnmarshaler.
 func (f *Float64) UnmarshalText(text []byte) error {
+	f.set = true
 	if text == nil || len(text) == 0 {
 		f.Valid = false
 		return nil
@@ -91,6 +92,7 @@ func (f Float64) MarshalText() ([]byte, error) {
 func (f *Float64) SetValid(n float64) {
 	f.Float64 = n
 	f.Valid = true
+	f.set = true
 }
 
 // Ptr returns a pointer to this Float64's value, or a nil pointer if this Float64 is null.
@@ -108,6 +110,7 @@ func (f Float64) IsZero() bool {
 
 // Scan implements the Scanner interface.
 func (f *Float64) Scan(value interface{}) error {
+	f.set = true
 	if value == nil {
 		f.Float64, f.Valid = 0, false
 		return nil

go.mod

@@ -2,4 +2,6 @@ module github.com/razor-1/null/v9
 
 go 1.14
 
-require github.com/volatiletech/randomize v0.0.1
+require (
+	github.com/volatiletech/randomize v0.0.1
+)

go.sum

@@ -4,6 +4,8 @@ github.com/gofrs/uuid v3.2.0+incompatible h1:y12jRkkFxsd7GpqdSZ+/KCs/fJbqpEXSGd4
 github.com/gofrs/uuid v3.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
 github.com/volatiletech/inflect v0.0.1 h1:2a6FcMQyhmPZcLa+uet3VJ8gLn/9svWhJxJYwvE8KsU=
 github.com/volatiletech/inflect v0.0.1/go.mod h1:IBti31tG6phkHitLlr5j7shC5SOo//x0AjDzaJU1PLA=
+github.com/volatiletech/null/v8 v8.1.0 h1:eAO3I31A5R04usY5SKMMfDcOCnEGyT/T4wRI0JVGp4U=
+github.com/volatiletech/null/v8 v8.1.0/go.mod h1:98DbwNoKEpRrYtGjWFctievIfm4n4MxG0A6EBUcoS5g=
 github.com/volatiletech/randomize v0.0.1 h1:eE5yajattWqTB2/eN8df4dw+8jwAzBtbdo5sbWC4nMk=
 github.com/volatiletech/randomize v0.0.1/go.mod h1:GN3U0QYqfZ9FOJ67bzax1cqZ5q2xuj2mXrXBjWaRTlY=
 github.com/volatiletech/strmangle v0.0.1 h1:UKQoHmY6be/R3tSvD2nQYrH41k43OJkidwEiC74KIzk=

int.go

@@ -7,7 +7,7 @@ import (
 	"math"
 	"strconv"
 
-	"github.com/volatiletech/null/v8/convert"
+	"github.com/razor-1/null/v9/convert"
 )
 
 // Int is an nullable int.
@@ -65,6 +65,7 @@ func (i *Int) UnmarshalJSON(data []byte) error {
 
 // UnmarshalText implements encoding.TextUnmarshaler.
 func (i *Int) UnmarshalText(text []byte) error {
+	i.set = true
 	if text == nil || len(text) == 0 {
 		i.Valid = false
 		return nil
@@ -98,6 +99,7 @@ func (i Int) MarshalText() ([]byte, error) {
 func (i *Int) SetValid(n int) {
 	i.Int = n
 	i.Valid = true
+	i.set = true
 }
 
 // Ptr returns a pointer to this Int's value, or a nil pointer if this Int is null.
@@ -115,6 +117,7 @@ func (i Int) IsZero() bool {
 
 // Scan implements the Scanner interface.
 func (i *Int) Scan(value interface{}) error {
+	i.set = true
 	if value == nil {
 		i.Int, i.Valid = 0, false
 		return nil

int16.go

@@ -8,7 +8,7 @@ import (
 	"math"
 	"strconv"
 
-	"github.com/volatiletech/null/v8/convert"
+	"github.com/razor-1/null/v9/convert"
 )
 
 // Int16 is an nullable int16.
@@ -69,6 +69,7 @@ func (i *Int16) UnmarshalJSON(data []byte) error {
 
 // UnmarshalText implements encoding.TextUnmarshaler.
 func (i *Int16) UnmarshalText(text []byte) error {
+	i.set = true
 	if text == nil || len(text) == 0 {
 		i.Valid = false
 		return nil
@@ -102,6 +103,7 @@ func (i Int16) MarshalText() ([]byte, error) {
 func (i *Int16) SetValid(n int16) {
 	i.Int16 = n
 	i.Valid = true
+	i.set = true
 }
 
 // Ptr returns a pointer to this Int16's value, or a nil pointer if this Int16 is null.
@@ -119,6 +121,7 @@ func (i Int16) IsZero() bool {
 
 // Scan implements the Scanner interface.
 func (i *Int16) Scan(value interface{}) error {
+	i.set = true
 	if value == nil {
 		i.Int16, i.Valid = 0, false
 		return nil

int32.go

@@ -8,7 +8,7 @@ import (
 	"math"
 	"strconv"
 
-	"github.com/volatiletech/null/v8/convert"
+	"github.com/razor-1/null/v9/convert"
 	"github.com/volatiletech/randomize"
 )
 
@@ -70,6 +70,7 @@ func (i *Int32) UnmarshalJSON(data []byte) error {
 
 // UnmarshalText implements encoding.TextUnmarshaler.
 func (i *Int32) UnmarshalText(text []byte) error {
+	i.set = true
 	if text == nil || len(text) == 0 {
 		i.Valid = false
 		return nil
@@ -103,6 +104,7 @@ func (i Int32) MarshalText() ([]byte, error) {
 func (i *Int32) SetValid(n int32) {
 	i.Int32 = n
 	i.Valid = true
+	i.set = true
 }
 
 // Ptr returns a pointer to this Int32's value, or a nil pointer if this Int32 is null.
@@ -120,6 +122,7 @@ func (i Int32) IsZero() bool {
 
 // Scan implements the Scanner interface.
 func (i *Int32) Scan(value interface{}) error {
+	i.set = true
 	if value == nil {
 		i.Int32, i.Valid = 0, false
 		return nil

int64.go

@@ -6,7 +6,7 @@ import (
 	"encoding/json"
 	"strconv"
 
-	"github.com/volatiletech/null/v8/convert"
+	"github.com/razor-1/null/v9/convert"
 )
 
 // Int64 is an nullable int64.
@@ -61,6 +61,7 @@ func (i *Int64) UnmarshalJSON(data []byte) error {
 
 // UnmarshalText implements encoding.TextUnmarshaler.
 func (i *Int64) UnmarshalText(text []byte) error {
+	i.set = true
 	if text == nil || len(text) == 0 {
 		i.Valid = false
 		return nil
@@ -91,6 +92,7 @@ func (i Int64) MarshalText() ([]byte, error) {
 func (i *Int64) SetValid(n int64) {
 	i.Int64 = n
 	i.Valid = true
+	i.set = true
 }
 
 // Ptr returns a pointer to this Int64's value, or a nil pointer if this Int64 is null.
@@ -108,6 +110,7 @@ func (i Int64) IsZero() bool {
 
 // Scan implements the Scanner interface.
 func (i *Int64) Scan(value interface{}) error {
+	i.set = true
 	if value == nil {
 		i.Int64, i.Valid = 0, false
 		return nil

int8.go

@@ -8,7 +8,7 @@ import (
 	"math"
 	"strconv"
 
-	"github.com/volatiletech/null/v8/convert"
+	"github.com/razor-1/null/v9/convert"
 )
 
 // Int8 is an nullable int8.
@@ -69,6 +69,7 @@ func (i *Int8) UnmarshalJSON(data []byte) error {
 
 // UnmarshalText implements encoding.TextUnmarshaler.
 func (i *Int8) UnmarshalText(text []byte) error {
+	i.set = true
 	if text == nil || len(text) == 0 {
 		i.Valid = false
 		return nil
@@ -102,6 +103,7 @@ func (i Int8) MarshalText() ([]byte, error) {
 func (i *Int8) SetValid(n int8) {
 	i.Int8 = n
 	i.Valid = true
+	i.set = true
 }
 
 // Ptr returns a pointer to this Int8's value, or a nil pointer if this Int8 is null.
@@ -119,6 +121,7 @@ func (i Int8) IsZero() bool {
 
 // Scan implements the Scanner interface.
 func (i *Int8) Scan(value interface{}) error {
+	i.set = true
 	if value == nil {
 		i.Int8, i.Valid = 0, false
 		return nil

json.go

@@ -7,7 +7,7 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/volatiletech/null/v8/convert"
+	"github.com/razor-1/null/v9/convert"
 	"github.com/volatiletech/randomize"
 )
 
@@ -86,6 +86,7 @@ func (j *JSON) UnmarshalJSON(data []byte) error {
 
 // UnmarshalText implements encoding.TextUnmarshaler.
 func (j *JSON) UnmarshalText(text []byte) error {
+	j.set = true
 	if text == nil || len(text) == 0 {
 		j.JSON = nil
 		j.Valid = false
@@ -131,6 +132,7 @@ func (j JSON) MarshalText() ([]byte, error) {
 func (j *JSON) SetValid(n []byte) {
 	j.JSON = n
 	j.Valid = true
+	j.set = true
 }
 
 // Ptr returns a pointer to this JSON's value, or a nil pointer if this JSON is null.
@@ -148,6 +150,7 @@ func (j JSON) IsZero() bool {
 
 // Scan implements the Scanner interface.
 func (j *JSON) Scan(value interface{}) error {
+	j.set = true
 	if value == nil {
 		j.JSON, j.Valid = []byte{}, false
 		return nil