Fix char2wchar/wchar2char to support collations properly.
Tom Lane <tgl@sss.pgh.pa.us>
Fix char2wchar/wchar2char to support collations properly. These functions should take a pg_locale_t, not a collation OID, and should call mbstowcs_l/wcstombs_l where available. Where those functions are not available, temporarily select the correct locale with uselocale(). This change removes the bogus assumption that all locales selectable in a given database have the same wide-character conversion method; in particular, the collate.linux.utf8 regression test now passes with LC_CTYPE=C, so long as the database encoding is UTF8. I decided to move the char2wchar/wchar2char functions out of mbutils.c and into pg_locale.c, because they work on wchar_t not pg_wchar_t and thus don't really belong with the mbutils.c functions. Keeping them where they were would have required importing pg_locale_t into pg_wchar.h somehow, which did not seem like a good plan.
Files
| Path | Change | +/− |
|---|---|---|
| configure | modified | +2 −1 |
| configure.in | modified | +1 −1 |
| src/backend/tsearch/ts_locale.c | modified | +11 −6 |
| src/backend/tsearch/wparser_def.c | modified | +4 −2 |
| src/backend/utils/adt/formatting.c | modified | +10 −6 |
| src/backend/utils/adt/pg_locale.c | modified | +173 −0 |
| src/backend/utils/mb/mbutils.c | modified | +0 −121 |
| src/include/mb/pg_wchar.h | modified | +0 −7 |
| src/include/pg_config.h.in | modified | +3 −0 |
| src/include/pg_config.h.win32 | modified | +3 −0 |
| src/include/port/win32.h | modified | +2 −0 |
| src/include/utils/pg_locale.h | modified | +8 −0 |