mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix cash_in() to behave properly in locales where frac_digits is zero,

Browse Source 
eg Japan.  Report and fix by Itagaki Takahiro.  Also fix CASHDEBUG printout
format for branches with 64-bit money type, and some minor comment cleanup.

Back-patch to 7.4, because it's broken all the way back.
This commit is contained in:
Tom Lane 2009-06-10 16:31:32 +00:00
parent 09cba66235
commit 2ef8c1acfd
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/backend/utils/adt/cash.c
View File

@ -13,7 +13,7 @@
* this version handles 64 bit numbers and so can hold values up to * this version handles 64 bit numbers and so can hold values up to
* $92,233,720,368,547,758.07. * $92,233,720,368,547,758.07.
* *
* $PostgreSQL: pgsql/src/backend/utils/adt/cash.c,v 1.80 2008/06/09 19:58:39 tgl Exp $ * $PostgreSQL: pgsql/src/backend/utils/adt/cash.c,v 1.81 2009/06/10 16:31:32 tgl Exp $
*/ */
#include "postgres.h" #include "postgres.h"
@ -191,23 +191,21 @@ cash_in(PG_FUNCTION_ARGS)
for (;; s++) for (;; s++)
{ {
/* we look for digits as int8 as we have less */ /* we look for digits as long as we have found less */
/* than the required number of decimal places */ /* than the required number of decimal places */
if (isdigit((unsigned char) *s) && dec < fpoint) if (isdigit((unsigned char) *s) && (!seen_dot || dec < fpoint))
{ {
value = (value * 10) + *s - '0'; value = (value * 10) + (*s - '0');
if (seen_dot) if (seen_dot)
dec++; dec++;
} }
/* decimal point? then start counting fractions... */ /* decimal point? then start counting fractions... */
else if (*s == dsymbol && !seen_dot) else if (*s == dsymbol && !seen_dot)
{ {
seen_dot = 1; seen_dot = 1;
} }
/* not "thousands" separator? */ /* ignore if "thousands" separator, else we're done */
else if (*s != ssymbol) else if (*s != ssymbol)
{ {
/* round off */ /* round off */
@ -236,7 +234,7 @@ cash_in(PG_FUNCTION_ARGS)
result = value * sgn; result = value * sgn;
#ifdef CASHDEBUG #ifdef CASHDEBUG
printf("cashin- result is %d\n", result); printf("cashin- result is " INT64_FORMAT "\n", result);
#endif #endif
PG_RETURN_CASH(result); PG_RETURN_CASH(result);