1
1
/* -----------------------------------------------------------------------
2
2
* formatting.c
3
3
*
4
- * $PostgreSQL: pgsql/src/backend/utils/adt/formatting.c,v 1.122 2007/02/09 04:17:58 momjian Exp $
4
+ * $PostgreSQL: pgsql/src/backend/utils/adt/formatting.c,v 1.123 2007/02/13 02:00:55 momjian Exp $
5
5
*
6
6
*
7
7
* Portions Copyright (c) 1999-2007, PostgreSQL Global Development Group
@@ -3834,14 +3834,6 @@ NUM_prepare_locale(NUMProc *Np)
3834
3834
else
3835
3835
Np -> L_positive_sign = "+" ;
3836
3836
3837
- /*
3838
- * Number thousands separator
3839
- */
3840
- if (lconv -> thousands_sep && * lconv -> thousands_sep )
3841
- Np -> L_thousands_sep = lconv -> thousands_sep ;
3842
- else
3843
- Np -> L_thousands_sep = "," ;
3844
-
3845
3837
/*
3846
3838
* Number decimal point
3847
3839
*/
@@ -3850,16 +3842,28 @@ NUM_prepare_locale(NUMProc *Np)
3850
3842
else
3851
3843
Np -> decimal = "." ;
3852
3844
3845
+ if (!IS_LDECIMAL (Np -> Num ))
3846
+ Np -> decimal = "." ;
3847
+
3848
+ /*
3849
+ * Number thousands separator
3850
+ *
3851
+ * Some locales (e.g. broken glibc pt_BR), have a comma for
3852
+ * decimal, but "" for thousands_sep, so we might make the
3853
+ * thousands_sep comma too. 2007-02-12
3854
+ */
3855
+ if (lconv -> thousands_sep && * lconv -> thousands_sep )
3856
+ Np -> L_thousands_sep = lconv -> thousands_sep ;
3857
+ else
3858
+ Np -> L_thousands_sep = "," ;
3859
+
3853
3860
/*
3854
3861
* Currency symbol
3855
3862
*/
3856
3863
if (lconv -> currency_symbol && * lconv -> currency_symbol )
3857
3864
Np -> L_currency_symbol = lconv -> currency_symbol ;
3858
3865
else
3859
3866
Np -> L_currency_symbol = " " ;
3860
-
3861
- if (!IS_LDECIMAL (Np -> Num ))
3862
- Np -> decimal = "." ;
3863
3867
}
3864
3868
else
3865
3869
{
0 commit comments