Fix unmarshaling fixed value over existing decimal

alpacahq · Aug 22, 2023 · 3ba6eae · 3ba6eae
1 parent 3145a27
commit 3ba6eae
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/decimal.go b/decimal.go
@@ -774,13 +774,15 @@ func (d *Decimal) Scan(value interface{}) error {
 		fixed, ok := parseFixed(v)
 		if ok {
 			d.fixed = fixed
+			d.fallback = nil
 			return nil
 		}
 
 	case string:
 		fixed, ok := parseFixed(v)
 		if ok {
 			d.fixed = fixed
+			d.fallback = nil
 			return nil
 		}
 	}
@@ -959,6 +961,7 @@ func (d *Decimal) UnmarshalBinary(data []byte) error {
 func (d *Decimal) UnmarshalJSON(decimalBytes []byte) error {
 	if fixed, ok := parseFixed(decimalBytes); ok {
 		d.fixed = fixed
+		d.fallback = nil
 		return nil
 	}
 
@@ -976,6 +979,7 @@ func (d *Decimal) UnmarshalJSON(decimalBytes []byte) error {
 func (d *Decimal) UnmarshalText(text []byte) error {
 	if fixed, ok := parseFixed(text); ok {
 		d.fixed = fixed
+		d.fallback = nil
 		return nil
 	}