mirror of
https://github.com/postgres/postgres.git
synced 2025-06-16 06:01:02 +03:00
When setting default thousands separator when locale has "", use logic
so new thousands separator doesn't match decimal symbol.
This commit is contained in:
@ -1,7 +1,7 @@
|
||||
/* -----------------------------------------------------------------------
|
||||
* formatting.c
|
||||
*
|
||||
* $PostgreSQL: pgsql/src/backend/utils/adt/formatting.c,v 1.133 2007/11/21 21:49:22 momjian Exp $
|
||||
* $PostgreSQL: pgsql/src/backend/utils/adt/formatting.c,v 1.134 2007/11/21 22:28:18 momjian Exp $
|
||||
*
|
||||
*
|
||||
* Portions Copyright (c) 1999-2007, PostgreSQL Global Development Group
|
||||
@ -3915,7 +3915,6 @@ NUM_prepare_locale(NUMProc *Np)
|
||||
*/
|
||||
if (lconv->decimal_point && *lconv->decimal_point)
|
||||
Np->decimal = lconv->decimal_point;
|
||||
|
||||
else
|
||||
Np->decimal = ".";
|
||||
|
||||
@ -3926,13 +3925,14 @@ 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 make the thousands_sep comma
|
||||
* too. 2007-02-12
|
||||
* but "" for thousands_sep, so we set the thousands_sep too. 2007-02-12
|
||||
*/
|
||||
if (lconv->thousands_sep && *lconv->thousands_sep)
|
||||
Np->L_thousands_sep = lconv->thousands_sep;
|
||||
else
|
||||
else if (strcmp(Np->decimal, ",") != 0)
|
||||
Np->L_thousands_sep = ",";
|
||||
else
|
||||
Np->L_thousands_sep = ".";
|
||||
|
||||
/*
|
||||
* Currency symbol
|
||||
|
Reference in New Issue
Block a user