Add comments about thousands separator logic.

bmomjian · bmomjian · commit d9bc7a39465f · 2007-11-22T15:10:05.000Z
diff --git a/src/backend/utils/adt/formatting.c b/src/backend/utils/adt/formatting.c
@@ -1,7 +1,7 @@
 /* -----------------------------------------------------------------------
  * formatting.c
  *
- * $PostgreSQL: pgsql/src/backend/utils/adt/formatting.c,v 1.134 2007/11/21 22:28:18 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/adt/formatting.c,v 1.135 2007/11/22 15:10:05 momjian Exp $
  *
  *
  *	 Portions Copyright (c) 1999-2007, PostgreSQL Global Development Group
@@ -3925,10 +3925,11 @@ NUM_prepare_locale(NUMProc *Np)
 		 * Number thousands separator
 		 *
 		 * Some locales (e.g. broken glibc pt_BR), have a comma for decimal,
-		 * but "" for thousands_sep, so we set the thousands_sep too. 2007-02-12
+		 * but "" for thousands_sep, so we set the thousands_sep too.
 		 */
 		if (lconv->thousands_sep && *lconv->thousands_sep)
 			Np->L_thousands_sep = lconv->thousands_sep;
+		/* Make sure thousands separator doesn't match decimal point symbol. */
 		else if (strcmp(Np->decimal, ",") != 0)
 			Np->L_thousands_sep = ",";
 		else
diff --git a/src/bin/psql/print.c b/src/bin/psql/print.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2000-2007, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/psql/print.c,v 1.92 2007/11/21 22:28:18 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/print.c,v 1.93 2007/11/22 15:10:05 momjian Exp $
  *
  * Note: we include postgres.h not postgres_fe.h so that we can include
  * catalog/pg_type.h, and thereby have access to INT4OID and similar macros.
@@ -2039,6 +2039,7 @@ setDecimalLocale(void)
 		grouping = "3";			/* most common */
 	if (*extlconv->thousands_sep)
 		thousands_sep = strdup(extlconv->thousands_sep);
+	/* Make sure thousands separator doesn't match decimal point symbol. */
 	else if (strcmp(decimal_point, ",") != 0)
 		thousands_sep = ",";
 	else

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`/* -----------------------------------------------------------------------`
`2`	`2`	`* formatting.c`
`3`	`3`	`*`
`4`		`- * $PostgreSQL: pgsql/src/backend/utils/adt/formatting.c,v 1.134 2007/11/21 22:28:18 momjian Exp $`
	`4`	`+ * $PostgreSQL: pgsql/src/backend/utils/adt/formatting.c,v 1.135 2007/11/22 15:10:05 momjian Exp $`
`5`	`5`	`*`
`6`	`6`	`*`
`7`	`7`	`* Portions Copyright (c) 1999-2007, PostgreSQL Global Development Group`
`@@ -3925,10 +3925,11 @@ NUM_prepare_locale(NUMProc *Np)`
`3925`	`3925`	`* Number thousands separator`
`3926`	`3926`	`*`
`3927`	`3927`	`* Some locales (e.g. broken glibc pt_BR), have a comma for decimal,`
`3928`		`- * but "" for thousands_sep, so we set the thousands_sep too. 2007-02-12`
	`3928`	`+ * but "" for thousands_sep, so we set the thousands_sep too.`
`3929`	`3929`	`*/`
`3930`	`3930`	`if (lconv->thousands_sep && *lconv->thousands_sep)`
`3931`	`3931`	`Np->L_thousands_sep = lconv->thousands_sep;`
	`3932`	`+ /* Make sure thousands separator doesn't match decimal point symbol. */`
`3932`	`3933`	`else if (strcmp(Np->decimal, ",") != 0)`
`3933`	`3934`	`Np->L_thousands_sep = ",";`
`3934`	`3935`	`else`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`*`
`4`	`4`	`* Copyright (c) 2000-2007, PostgreSQL Global Development Group`
`5`	`5`	`*`
`6`		`- * $PostgreSQL: pgsql/src/bin/psql/print.c,v 1.92 2007/11/21 22:28:18 momjian Exp $`
	`6`	`+ * $PostgreSQL: pgsql/src/bin/psql/print.c,v 1.93 2007/11/22 15:10:05 momjian Exp $`
`7`	`7`	`*`
`8`	`8`	`* Note: we include postgres.h not postgres_fe.h so that we can include`
`9`	`9`	`* catalog/pg_type.h, and thereby have access to INT4OID and similar macros.`
`@@ -2039,6 +2039,7 @@ setDecimalLocale(void)`
`2039`	`2039`	`grouping = "3"; /* most common */`
`2040`	`2040`	`if (*extlconv->thousands_sep)`
`2041`	`2041`	`thousands_sep = strdup(extlconv->thousands_sep);`
	`2042`	`+ /* Make sure thousands separator doesn't match decimal point symbol. */`
`2042`	`2043`	`else if (strcmp(decimal_point, ",") != 0)`
`2043`	`2044`	`thousands_sep = ",";`
`2044`	`2045`	`else`