further fixes to set in Scan()

razor-1 · razor-1 · commit 195c99c42be6 · 2020-09-28T14:04:25.000-07:00
diff --git a/bool.go b/bool.go
@@ -126,12 +126,11 @@ 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
+		b.Bool, b.Valid, b.set = false, false, true
 		return nil
 	}
-	b.Valid = true
+	b.Valid, b.set = true, true
 	return convert.ConvertAssign(&b.Bool, value)
 }
 
diff --git a/byte.go b/byte.go
@@ -119,21 +119,18 @@ 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
+		b.Byte, b.Valid, b.set = 0, false, false
 		return nil
 	}
 
 	val := value.(string)
 	if len(val) == 0 {
-		b.Valid = false
-		b.Byte = 0
+		b.Byte, b.Valid, b.set = 0, false, false
 		return nil
 	}
 
-	b.Valid = true
-	b.Byte = byte(val[0])
+	b.Byte, b.Valid, b.set = val[0], true, true
 	return nil
 }
 
diff --git a/bytes.go b/bytes.go
@@ -117,12 +117,11 @@ 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
+		b.Bytes, b.Valid, b.set = nil, false, false
 		return nil
 	}
-	b.Valid = true
+	b.Valid, b.set = true, true
 	return convert.ConvertAssign(&b.Bytes, value)
 }
 
diff --git a/float32.go b/float32.go
@@ -115,12 +115,11 @@ 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
+		f.Float32, f.Valid, f.set = 0, false, false
 		return nil
 	}
-	f.Valid = true
+	f.Valid, f.set = true, true
 	return convert.ConvertAssign(&f.Float32, value)
 }
 
diff --git a/float64.go b/float64.go
@@ -110,12 +110,11 @@ 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
+		f.Float64, f.Valid, f.set = 0, false, false
 		return nil
 	}
-	f.Valid = true
+	f.Valid, f.set = true, true
 	return convert.ConvertAssign(&f.Float64, value)
 }
 
diff --git a/int.go b/int.go
@@ -117,12 +117,11 @@ 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
+		i.Int, i.Valid, i.set = 0, false, false
 		return nil
 	}
-	i.Valid = true
+	i.Valid, i.set = true, true
 	return convert.ConvertAssign(&i.Int, value)
 }
 
diff --git a/int16.go b/int16.go
@@ -48,8 +48,7 @@ func (i Int16) IsSet() bool {
 func (i *Int16) UnmarshalJSON(data []byte) error {
 	i.set = true
 	if bytes.Equal(data, NullBytes) {
-		i.Valid = false
-		i.Int16 = 0
+		i.Int16, i.Valid = 0, false
 		return nil
 	}
 
@@ -62,8 +61,7 @@ func (i *Int16) UnmarshalJSON(data []byte) error {
 		return fmt.Errorf("json: %d overflows max int16 value", x)
 	}
 
-	i.Int16 = int16(x)
-	i.Valid = true
+	i.Int16, i.Valid = int16(x), true
 	return nil
 }
 
@@ -121,12 +119,11 @@ 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
+		i.Int16, i.Valid, i.set = 0, false, false
 		return nil
 	}
-	i.Valid = true
+	i.Valid, i.set = true, true
 	return convert.ConvertAssign(&i.Int16, value)
 }
 
diff --git a/int32.go b/int32.go
@@ -122,12 +122,11 @@ 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
+		i.Int32, i.Valid, i.set = 0, false, false
 		return nil
 	}
-	i.Valid = true
+	i.Valid, i.set = true, true
 	return convert.ConvertAssign(&i.Int32, value)
 }
 
diff --git a/int64.go b/int64.go
@@ -110,12 +110,11 @@ 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
+		i.Int64, i.Valid, i.set = 0, false, false
 		return nil
 	}
-	i.Valid = true
+	i.Valid, i.set = true, true
 	return convert.ConvertAssign(&i.Int64, value)
 }
 
diff --git a/int8.go b/int8.go
@@ -121,12 +121,11 @@ 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
+		i.Int8, i.Valid, i.set = 0, false, false
 		return nil
 	}
-	i.Valid = true
+	i.Valid, i.set = true, true
 	return convert.ConvertAssign(&i.Int8, value)
 }
 
diff --git a/json.go b/json.go
@@ -150,12 +150,11 @@ 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
+		j.JSON, j.Valid, j.set = nil, false, false
 		return nil
 	}
-	j.Valid = true
+	j.Valid, j.set = true, true
 	return convert.ConvertAssign(&j.JSON, value)
 }
 
diff --git a/string.go b/string.go
@@ -110,12 +110,11 @@ func (s String) IsZero() bool {
 
 // Scan implements the Scanner interface.
 func (s *String) Scan(value interface{}) error {
-	s.set = true
 	if value == nil {
-		s.String, s.Valid = "", false
+		s.String, s.Valid, s.set = "", false, false
 		return nil
 	}
-	s.Valid = true
+	s.Valid, s.set = true, true
 	return convert.ConvertAssign(&s.String, value)
 }
 
diff --git a/time.go b/time.go
@@ -111,18 +111,19 @@ func (t Time) IsZero() bool {
 
 // Scan implements the Scanner interface.
 func (t *Time) Scan(value interface{}) error {
-	t.set = true
 	var err error
 	switch x := value.(type) {
 	case time.Time:
 		t.Time = x
 	case nil:
-		t.Valid = false
+		t.Valid, t.set = false, false
 		return nil
 	default:
 		err = fmt.Errorf("null: cannot scan type %T into null.Time: %v", value, value)
 	}
-	t.Valid = err == nil
+	if err == nil {
+		t.Valid, t.set = true, true
+	}
 	return err
 }
 
diff --git a/uint.go b/uint.go
@@ -115,12 +115,11 @@ func (u Uint) IsZero() bool {
 
 // Scan implements the Scanner interface.
 func (u *Uint) Scan(value interface{}) error {
-	u.set = true
 	if value == nil {
-		u.Uint, u.Valid = 0, false
+		u.Uint, u.Valid, u.set = 0, false, false
 		return nil
 	}
-	u.Valid = true
+	u.Valid, u.set = true, true
 	return convert.ConvertAssign(&u.Uint, value)
 }
 
diff --git a/uint16.go b/uint16.go
@@ -121,12 +121,11 @@ func (u Uint16) IsZero() bool {
 
 // Scan implements the Scanner interface.
 func (u *Uint16) Scan(value interface{}) error {
-	u.set = true
 	if value == nil {
-		u.Uint16, u.Valid = 0, false
+		u.Uint16, u.Valid, u.set = 0, false, false
 		return nil
 	}
-	u.Valid = true
+	u.Valid, u.set = true, true
 	return convert.ConvertAssign(&u.Uint16, value)
 }
 
diff --git a/uint32.go b/uint32.go
@@ -121,12 +121,11 @@ func (u Uint32) IsZero() bool {
 
 // Scan implements the Scanner interface.
 func (u *Uint32) Scan(value interface{}) error {
-	u.set = true
 	if value == nil {
-		u.Uint32, u.Valid = 0, false
+		u.Uint32, u.Valid, u.set = 0, false, false
 		return nil
 	}
-	u.Valid = true
+	u.Valid, u.set = true, true
 	return convert.ConvertAssign(&u.Uint32, value)
 }
 
diff --git a/uint64.go b/uint64.go
@@ -113,12 +113,11 @@ func (u Uint64) IsZero() bool {
 
 // Scan implements the Scanner interface.
 func (u *Uint64) Scan(value interface{}) error {
-	u.set = true
 	if value == nil {
-		u.Uint64, u.Valid = 0, false
+		u.Uint64, u.Valid, u.set = 0, false, false
 		return nil
 	}
-	u.Valid = true
+	u.Valid, u.set = true, true
 	return convert.ConvertAssign(&u.Uint64, value)
 }
 
diff --git a/uint8.go b/uint8.go
@@ -121,12 +121,11 @@ func (u Uint8) IsZero() bool {
 
 // Scan implements the Scanner interface.
 func (u *Uint8) Scan(value interface{}) error {
-	u.set = true
 	if value == nil {
-		u.Uint8, u.Valid = 0, false
+		u.Uint8, u.Valid, u.set = 0, false, false
 		return nil
 	}
-	u.Valid = true
+	u.Valid, u.set = true, true
 	return convert.ConvertAssign(&u.Uint8, value)
 }
 

Original file line number	Diff line number	Diff line change
`@@ -126,12 +126,11 @@ func (b Bool) IsZero() bool {`
`126`	`126`
`127`	`127`	`// Scan implements the Scanner interface.`
`128`	`128`	`func (b *Bool) Scan(value interface{}) error {`
`129`		`- b.set = true`
`130`	`129`	`if value == nil {`
`131`		`- b.Bool, b.Valid = false, false`
	`130`	`+ b.Bool, b.Valid, b.set = false, false, true`
`132`	`131`	`return nil`
`133`	`132`	`}`
`134`		`- b.Valid = true`
	`133`	`+ b.Valid, b.set = true, true`
`135`	`134`	`return convert.ConvertAssign(&b.Bool, value)`
`136`	`135`	`}`
`137`	`136`
Original file line number	Diff line number	Diff line change
`@@ -117,12 +117,11 @@ func (b Bytes) IsZero() bool {`
`117`	`117`
`118`	`118`	`// Scan implements the Scanner interface.`
`119`	`119`	`func (b *Bytes) Scan(value interface{}) error {`
`120`		`- b.set = true`
`121`	`120`	`if value == nil {`
`122`		`- b.Bytes, b.Valid = []byte{}, false`
	`121`	`+ b.Bytes, b.Valid, b.set = nil, false, false`
`123`	`122`	`return nil`
`124`	`123`	`}`
`125`		`- b.Valid = true`
	`124`	`+ b.Valid, b.set = true, true`
`126`	`125`	`return convert.ConvertAssign(&b.Bytes, value)`
`127`	`126`	`}`
`128`	`127`
Original file line number	Diff line number	Diff line change
`@@ -115,12 +115,11 @@ func (f Float32) IsZero() bool {`
`115`	`115`
`116`	`116`	`// Scan implements the Scanner interface.`
`117`	`117`	`func (f *Float32) Scan(value interface{}) error {`
`118`		`- f.set = true`
`119`	`118`	`if value == nil {`
`120`		`- f.Float32, f.Valid = 0, false`
	`119`	`+ f.Float32, f.Valid, f.set = 0, false, false`
`121`	`120`	`return nil`
`122`	`121`	`}`
`123`		`- f.Valid = true`
	`122`	`+ f.Valid, f.set = true, true`
`124`	`123`	`return convert.ConvertAssign(&f.Float32, value)`
`125`	`124`	`}`
`126`	`125`
Original file line number	Diff line number	Diff line change
`@@ -110,12 +110,11 @@ func (f Float64) IsZero() bool {`
`110`	`110`
`111`	`111`	`// Scan implements the Scanner interface.`
`112`	`112`	`func (f *Float64) Scan(value interface{}) error {`
`113`		`- f.set = true`
`114`	`113`	`if value == nil {`
`115`		`- f.Float64, f.Valid = 0, false`
	`114`	`+ f.Float64, f.Valid, f.set = 0, false, false`
`116`	`115`	`return nil`
`117`	`116`	`}`
`118`		`- f.Valid = true`
	`117`	`+ f.Valid, f.set = true, true`
`119`	`118`	`return convert.ConvertAssign(&f.Float64, value)`
`120`	`119`	`}`
`121`	`120`
Original file line number	Diff line number	Diff line change
`@@ -117,12 +117,11 @@ func (i Int) IsZero() bool {`
`117`	`117`
`118`	`118`	`// Scan implements the Scanner interface.`
`119`	`119`	`func (i *Int) Scan(value interface{}) error {`
`120`		`- i.set = true`
`121`	`120`	`if value == nil {`
`122`		`- i.Int, i.Valid = 0, false`
	`121`	`+ i.Int, i.Valid, i.set = 0, false, false`
`123`	`122`	`return nil`
`124`	`123`	`}`
`125`		`- i.Valid = true`
	`124`	`+ i.Valid, i.set = true, true`
`126`	`125`	`return convert.ConvertAssign(&i.Int, value)`
`127`	`126`	`}`
`128`	`127`
Original file line number	Diff line number	Diff line change
`@@ -48,8 +48,7 @@ func (i Int16) IsSet() bool {`
`48`	`48`	`func (i *Int16) UnmarshalJSON(data []byte) error {`
`49`	`49`	`i.set = true`
`50`	`50`	`if bytes.Equal(data, NullBytes) {`
`51`		`- i.Valid = false`
`52`		`- i.Int16 = 0`
	`51`	`+ i.Int16, i.Valid = 0, false`
`53`	`52`	`return nil`
`54`	`53`	`}`
`55`	`54`
`@@ -62,8 +61,7 @@ func (i *Int16) UnmarshalJSON(data []byte) error {`
`62`	`61`	`return fmt.Errorf("json: %d overflows max int16 value", x)`
`63`	`62`	`}`
`64`	`63`
`65`		`- i.Int16 = int16(x)`
`66`		`- i.Valid = true`
	`64`	`+ i.Int16, i.Valid = int16(x), true`
`67`	`65`	`return nil`
`68`	`66`	`}`
`69`	`67`
`@@ -121,12 +119,11 @@ func (i Int16) IsZero() bool {`
`121`	`119`
`122`	`120`	`// Scan implements the Scanner interface.`
`123`	`121`	`func (i *Int16) Scan(value interface{}) error {`
`124`		`- i.set = true`
`125`	`122`	`if value == nil {`
`126`		`- i.Int16, i.Valid = 0, false`
	`123`	`+ i.Int16, i.Valid, i.set = 0, false, false`
`127`	`124`	`return nil`
`128`	`125`	`}`
`129`		`- i.Valid = true`
	`126`	`+ i.Valid, i.set = true, true`
`130`	`127`	`return convert.ConvertAssign(&i.Int16, value)`
`131`	`128`	`}`
`132`	`129`
Original file line number	Diff line number	Diff line change
`@@ -122,12 +122,11 @@ func (i Int32) IsZero() bool {`
`122`	`122`
`123`	`123`	`// Scan implements the Scanner interface.`
`124`	`124`	`func (i *Int32) Scan(value interface{}) error {`
`125`		`- i.set = true`
`126`	`125`	`if value == nil {`
`127`		`- i.Int32, i.Valid = 0, false`
	`126`	`+ i.Int32, i.Valid, i.set = 0, false, false`
`128`	`127`	`return nil`
`129`	`128`	`}`
`130`		`- i.Valid = true`
	`129`	`+ i.Valid, i.set = true, true`
`131`	`130`	`return convert.ConvertAssign(&i.Int32, value)`
`132`	`131`	`}`
`133`	`132`
Original file line number	Diff line number	Diff line change
`@@ -110,12 +110,11 @@ func (i Int64) IsZero() bool {`
`110`	`110`
`111`	`111`	`// Scan implements the Scanner interface.`
`112`	`112`	`func (i *Int64) Scan(value interface{}) error {`
`113`		`- i.set = true`
`114`	`113`	`if value == nil {`
`115`		`- i.Int64, i.Valid = 0, false`
	`114`	`+ i.Int64, i.Valid, i.set = 0, false, false`
`116`	`115`	`return nil`
`117`	`116`	`}`
`118`		`- i.Valid = true`
	`117`	`+ i.Valid, i.set = true, true`
`119`	`118`	`return convert.ConvertAssign(&i.Int64, value)`
`120`	`119`	`}`
`121`	`120`
Original file line number	Diff line number	Diff line change
`@@ -121,12 +121,11 @@ func (i Int8) IsZero() bool {`
`121`	`121`
`122`	`122`	`// Scan implements the Scanner interface.`
`123`	`123`	`func (i *Int8) Scan(value interface{}) error {`
`124`		`- i.set = true`
`125`	`124`	`if value == nil {`
`126`		`- i.Int8, i.Valid = 0, false`
	`125`	`+ i.Int8, i.Valid, i.set = 0, false, false`
`127`	`126`	`return nil`
`128`	`127`	`}`
`129`		`- i.Valid = true`
	`128`	`+ i.Valid, i.set = true, true`
`130`	`129`	`return convert.ConvertAssign(&i.Int8, value)`
`131`	`130`	`}`
`132`	`131`