Merge pull request #128 from otan-cockroach/decimal_fix

format: format 0E-x where x > 6 like PostgreSQL does

.github/workflows/go.yml

@@ -65,7 +65,7 @@ jobs:
         # staticcheck requires go1.19.
         if: ${{ matrix.arch == 'x64' && matrix.go >= '1.19' }}
         run: |
-          go install honnef.co/go/tools/cmd/staticcheck@latest
+          go install honnef.co/go/tools/cmd/staticcheck@v0.4.3
           staticcheck ./...
 
       - name: 'GCAssert'

decimal_test.go

@@ -447,6 +447,12 @@ func TestFormat(t *testing.T) {
 			f: "000",
 			g: "0e+2",
 		},
+		"0E-9": {
+			e: "0e-9",
+			f: "0.000000000",
+			g: "0.000000000",
+			G: "0.000000000",
+		},
 	}
 	verbs := []string{"%e", "%E", "%f", "%g", "%G"}
 

format.go

@@ -65,9 +65,19 @@ func (d *Decimal) Append(buf []byte, fmt byte) []byte {
 	case 'f':
 		return fmtF(buf, d, digits)
 	case 'g', 'G':
+		// Ensure that we correctly display all 0s like PostgreSQL does.
+		// For 0.00000000, the co-efficient is represented as 0
+		// and hence the digits is incorrectly 0 (for 1.000000, it'd be
+		// 10000000). Hence, pad the digit length before calculating the
+		// adjExponentLimit.
+		// See: https://github.com/cockroachdb/cockroach/issues/102217.
+		digitLen := len(digits)
+		if d.Coeff.BitLen() == 0 && d.Exponent < 0 {
+			digitLen += int(-d.Exponent)
+		}
 		// See: http://speleotrove.com/decimal/daconvs.html#reftostr
 		const adjExponentLimit = -6
-		adj := int(d.Exponent) + (len(digits) - 1)
+		adj := int(d.Exponent) + (digitLen - 1)
 		if d.Exponent <= 0 && adj >= adjExponentLimit {
 			return fmtF(buf, d, digits)
 		}

gda_test.go

@@ -683,8 +683,26 @@ func gdaTest(t *testing.T, path string, tcs []TestCase) {
 				if strings.HasPrefix(tc.Result, "SNAN") {
 					tc.Result = "sNaN"
 				}
-				if !strings.EqualFold(s, tc.Result) {
-					t.Fatalf("expected %s, got %s", tc.Result, s)
+				expected := tc.Result
+				// Adjust 0E- or -0E- tests to match PostgreSQL behavior.
+				// See: https://github.com/cockroachdb/cockroach/issues/102217.
+				if pos, neg := strings.HasPrefix(expected, "0E-"), strings.HasPrefix(expected, "-0E-"); pos || neg {
+					startIdx := 3
+					if neg {
+						startIdx = 4
+					}
+					p, err := strconv.ParseInt(expected[startIdx:], 10, 64)
+					if err != nil {
+						t.Fatalf("unexpected error converting int: %v", err)
+					}
+					expected = ""
+					if neg {
+						expected = "-"
+					}
+					expected += "0." + strings.Repeat("0", int(p))
+				}
+				if !strings.EqualFold(s, expected) {
+					t.Fatalf("expected %s, got %s", expected, s)
 				}
 				return
 			}

sql_test.go

@@ -75,4 +75,16 @@ func TestSQL(t *testing.T) {
 	if nd.Valid {
 		t.Fatal("expected null")
 	}
+
+	var g Decimal
+	if err := db.QueryRow("select 0::decimal(19,9)").Scan(&g); err != nil {
+		t.Fatal(err)
+	}
+	zeroD, _, err := NewFromString("0.000000000")
+	if err != nil {
+		t.Fatal(err)
+	}
+	if g.String() != zeroD.String() {
+		t.Fatalf("expected 0::decimal(19.9) pg value %s match, found %s", g.String(), zeroD.String())
+	}
 }