Commit3894e7c

committed

When setting default thousands separator when locale has "", use logic

so new thousands separator doesn't match decimal symbol.

1 parent6f3149e commit3894e7cCopy full SHA for 3894e7c

File tree

-7

lines changed

-7

lines changed

Lines changed: 5 additions & 5 deletions

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.133 2007/11/2121:49:22 momjian Exp $`
	`4`	`+ * $PostgreSQL: pgsql/src/backend/utils/adt/formatting.c,v 1.134 2007/11/2122:28:18 momjian Exp $`
`5`	`5`	`*`
`6`	`6`	`*`
`7`	`7`	`* Portions Copyright (c) 1999-2007, PostgreSQL Global Development Group`
`@@ -3915,7 +3915,6 @@ NUM_prepare_locale(NUMProc *Np)`
`3915`	`3915`	`*/`
`3916`	`3916`	`if (lconv->decimal_point&&*lconv->decimal_point)`
`3917`	`3917`	`Np->decimal=lconv->decimal_point;`
`3918`		`-`
`3919`	`3918`	`else`
`3920`	`3919`	`Np->decimal=".";`
`3921`	`3920`
`@@ -3926,13 +3925,14 @@ NUM_prepare_locale(NUMProc *Np)`
`3926`	`3925`	`* Number thousands separator`
`3927`	`3926`	`*`
`3928`	`3927`	`* Some locales (e.g. broken glibc pt_BR), have a comma for decimal,`
`3929`		`- * but "" for thousands_sep, so we make the thousands_sep comma`
`3930`		`- * too. 2007-02-12`
	`3928`	`+ * but "" for thousands_sep, so we set the thousands_sep too. 2007-02-12`
`3931`	`3929`	`*/`
`3932`	`3930`	`if (lconv->thousands_sep&&*lconv->thousands_sep)`
`3933`	`3931`	`Np->L_thousands_sep=lconv->thousands_sep;`
`3934`		`-else`
	`3932`	`+elseif (strcmp(Np->decimal,",")!=0)`
`3935`	`3933`	`Np->L_thousands_sep=",";`
	`3934`	`+else`
	`3935`	`+Np->L_thousands_sep=".";`
`3936`	`3936`
`3937`	`3937`	`/*`
`3938`	`3938`	`* Currency symbol`

Lines changed: 2 additions & 2 deletions

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.91 2007/01/05 22:19:49 momjian Exp $`
	`6`	`+ * $PostgreSQL: pgsql/src/bin/psql/print.c,v 1.92 2007/11/21 22:28:18 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,7 +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`		`-elseif (*decimal_point!=',')`
	`2042`	`+elseif (strcmp(decimal_point,",")!=0)`
`2043`	`2043`	`thousands_sep=",";`
`2044`	`2044`	`else`
`2045`	`2045`	`thousands_sep=".";`

Comments

(0)