mirror of
https://github.com/shopspring/decimal.git
synced 2024-11-22 20:40:48 +01:00
Merge 6e54f647f0
into 0e69d5cd53
This commit is contained in:
commit
a19d52c58f
2 changed files with 54 additions and 1 deletions
10
decimal.go
10
decimal.go
|
@ -65,6 +65,14 @@ var PowPrecisionNegativeExponent = 16
|
||||||
// silently lose precision.
|
// silently lose precision.
|
||||||
var MarshalJSONWithoutQuotes = false
|
var MarshalJSONWithoutQuotes = false
|
||||||
|
|
||||||
|
// StringTrimTrailingZeros should be set to false if you want the decimal stringify without zeros trailing.
|
||||||
|
// By default, when decimal is output as a string (for example, in JSON), zeros are truncated from it (2.00 -> 2, 3.11 -> 3.11, 13.000 -> 13).
|
||||||
|
// But this logic can be changed by this variable.
|
||||||
|
// For example, if you have numeric(10,2) values stored in your database,
|
||||||
|
// and you want your API response to always be given 2 decimal places (even 2.00, 3.00, 17.00 [not 2,3,17]),
|
||||||
|
// then this variable is a great way out.
|
||||||
|
var StringTrimTrailingZeros = true
|
||||||
|
|
||||||
// ExpMaxIterations specifies the maximum number of iterations needed to calculate
|
// ExpMaxIterations specifies the maximum number of iterations needed to calculate
|
||||||
// precise natural exponent value using ExpHullAbrham method.
|
// precise natural exponent value using ExpHullAbrham method.
|
||||||
var ExpMaxIterations = 1000
|
var ExpMaxIterations = 1000
|
||||||
|
@ -1459,7 +1467,7 @@ func (d Decimal) InexactFloat64() float64 {
|
||||||
//
|
//
|
||||||
// -12.345
|
// -12.345
|
||||||
func (d Decimal) String() string {
|
func (d Decimal) String() string {
|
||||||
return d.string(true)
|
return d.string(StringTrimTrailingZeros)
|
||||||
}
|
}
|
||||||
|
|
||||||
// StringFixed returns a rounded fixed-point string with places digits after
|
// StringFixed returns a rounded fixed-point string with places digits after
|
||||||
|
|
|
@ -3673,3 +3673,48 @@ func ExampleNewFromFloat() {
|
||||||
//0.123123123123123
|
//0.123123123123123
|
||||||
//-10000000000000
|
//-10000000000000
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestDecimal_String(t *testing.T) {
|
||||||
|
type testData struct {
|
||||||
|
input string
|
||||||
|
expected string
|
||||||
|
}
|
||||||
|
|
||||||
|
tests := []testData{
|
||||||
|
{"1.22", "1.22"},
|
||||||
|
{"1.00", "1"},
|
||||||
|
{"153.192", "153.192"},
|
||||||
|
{"999.999", "999.999"},
|
||||||
|
{"0.0000000001", "0.0000000001"},
|
||||||
|
{"0.0000000000", "0"},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, test := range tests {
|
||||||
|
d, err := NewFromString(test.input);
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
} else if d.String() != test.expected {
|
||||||
|
t.Errorf("expected %s, got %s", test.expected, d.String())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
defer func() {
|
||||||
|
StringTrimTrailingZeros = true
|
||||||
|
}()
|
||||||
|
|
||||||
|
StringTrimTrailingZeros = false
|
||||||
|
tests = []testData{
|
||||||
|
{"1.00", "1.00"},
|
||||||
|
{"0.00", "0.00"},
|
||||||
|
{"129.123000", "129.123000"},
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, test := range tests {
|
||||||
|
d, err := NewFromString(test.input);
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
} else if d.String() != test.expected {
|
||||||
|
t.Errorf("expected %s, got %s", test.expected, d.String())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in a new issue