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

tglsfdc · tglsfdc · commit 2ef8c1acfd5a · 2009-06-10T16:31:32.000Z
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.
diff --git a/src/backend/utils/adt/cash.c b/src/backend/utils/adt/cash.c
@@ -13,7 +13,7 @@
  * this version handles 64 bit numbers and so can hold values up to
  * $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"
@@ -191,23 +191,21 @@ cash_in(PG_FUNCTION_ARGS)
 
 	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 */
-		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)
 				dec++;
-
 		}
 		/* decimal point? then start counting fractions... */
 		else if (*s == dsymbol && !seen_dot)
 		{
 			seen_dot = 1;
-
 		}
-		/* not "thousands" separator? */
+		/* ignore if "thousands" separator, else we're done */
 		else if (*s != ssymbol)
 		{
 			/* round off */
@@ -236,7 +234,7 @@ cash_in(PG_FUNCTION_ARGS)
 	result = value * sgn;
 
 #ifdef CASHDEBUG
-	printf("cashin- result is %d\n", result);
+	printf("cashin- result is " INT64_FORMAT "\n", result);
 #endif
 
 	PG_RETURN_CASH(result);

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`* this version handles 64 bit numbers and so can hold values up to`
`14`	`14`	`* $92,233,720,368,547,758.07.`
`15`	`15`	`*`
`16`		`- * $PostgreSQL: pgsql/src/backend/utils/adt/cash.c,v 1.80 2008/06/09 19:58:39 tgl Exp $`
	`16`	`+ * $PostgreSQL: pgsql/src/backend/utils/adt/cash.c,v 1.81 2009/06/10 16:31:32 tgl Exp $`
`17`	`17`	`*/`
`18`	`18`
`19`	`19`	`#include "postgres.h"`
`@@ -191,23 +191,21 @@ cash_in(PG_FUNCTION_ARGS)`
`191`	`191`
`192`	`192`	`for (;; s++)`
`193`	`193`	`{`
`194`		`- /* we look for digits as int8 as we have less */`
	`194`	`+ /* we look for digits as long as we have found less */`
`195`	`195`	`/* than the required number of decimal places */`
`196`		`- if (isdigit((unsigned char) *s) && dec < fpoint)`
	`196`	`+ if (isdigit((unsigned char) *s) && (!seen_dot \|\| dec < fpoint))`
`197`	`197`	`{`
`198`		`- value = (value * 10) + *s - '0';`
	`198`	`+ value = (value * 10) + (*s - '0');`
`199`	`199`
`200`	`200`	`if (seen_dot)`
`201`	`201`	`dec++;`
`202`		`-`
`203`	`202`	`}`
`204`	`203`	`/* decimal point? then start counting fractions... */`
`205`	`204`	`else if (*s == dsymbol && !seen_dot)`
`206`	`205`	`{`
`207`	`206`	`seen_dot = 1;`
`208`		`-`
`209`	`207`	`}`
`210`		`- /* not "thousands" separator? */`
	`208`	`+ /* ignore if "thousands" separator, else we're done */`
`211`	`209`	`else if (*s != ssymbol)`
`212`	`210`	`{`
`213`	`211`	`/* round off */`
`@@ -236,7 +234,7 @@ cash_in(PG_FUNCTION_ARGS)`
`236`	`234`	`result = value * sgn;`
`237`	`235`
`238`	`236`	`#ifdef CASHDEBUG`
`239`		`- printf("cashin- result is %d\n", result);`
	`237`	`+ printf("cashin- result is " INT64_FORMAT "\n", result);`
`240`	`238`	`#endif`
`241`	`239`
`242`	`240`	`PG_RETURN_CASH(result);`