OSDN Git Service

Fix char2wchar/wchar2char to support collations properly.
authorTom Lane <tgl@sss.pgh.pa.us>
Sat, 23 Apr 2011 16:35:41 +0000 (12:35 -0400)
committerTom Lane <tgl@sss.pgh.pa.us>
Sat, 23 Apr 2011 16:35:41 +0000 (12:35 -0400)
commit2ab0796d7a3a7116a79b65531fd33f1548514b52
treeb327fa2ba27bef4dbd2dd287e23b5bf6ba8ac2ee
parentbb850306307d3d6ebb611c4039ae127236eb1699
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.
12 files changed:
configure
configure.in
src/backend/tsearch/ts_locale.c
src/backend/tsearch/wparser_def.c
src/backend/utils/adt/formatting.c
src/backend/utils/adt/pg_locale.c
src/backend/utils/mb/mbutils.c
src/include/mb/pg_wchar.h
src/include/pg_config.h.in
src/include/pg_config.h.win32
src/include/port/win32.h
src/include/utils/pg_locale.h