database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-11-21 00:42:43 +03:00
Code Activity

On Windows, call bind_textdomain_codeset on domains other than the default one,

Browse Source 
too, so that the codeset is properly mapped on the newly added PL domains.
This commit is contained in:
Alvaro Herrera
2009-03-08 16:07:12 +00:00
parent 387efd3648
commit c3b5d2f138
3 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/backend/utils/mb/mbutils.c
View File

@@ -4,7 +4,7 @@
* (currently mule internal code (mic) is used)
* Tatsuo Ishii
*
* $PostgreSQL: pgsql/src/backend/utils/mb/mbutils.c,v 1.79 2009/03/02 15:10:09 teodor Exp $
* $PostgreSQL: pgsql/src/backend/utils/mb/mbutils.c,v 1.80 2009/03/08 16:07:12 alvherre Exp $
*/
#include "postgres.h"
@@ -891,22 +891,27 @@ SetDatabaseEncoding(int encoding)
DatabaseEncoding = &pg_enc2name_tbl[encoding];
Assert(DatabaseEncoding->encoding == encoding);
/*
* On Windows, we need to explicitly bind gettext to the correct
* encoding, because gettext() tends to get confused.
*/
#if defined(ENABLE_NLS) && defined(WIN32)
{
int i;
pg_bind_textdomain_codeset(textdomain(NULL), encoding);
}
for (i = 0; i < sizeof(codeset_map_array) / sizeof(codeset_map_array[0]); i++)
/*
* On Windows, we need to explicitly bind gettext to the correct
* encoding, because gettext() tends to get confused.
*/
void
pg_bind_textdomain_codeset(const char *domainname, int encoding)
{
#if defined(ENABLE_NLS) && defined(WIN32)
int i;
for (i = 0; i < lengthof(codeset_map_array); i++)
{
if (codeset_map_array[i].encoding == encoding)
{
if (codeset_map_array[i].encoding == encoding)
{
if (bind_textdomain_codeset(textdomain(NULL), codeset_map_array[i].codeset) == NULL)
elog(LOG, "bind_textdomain_codeset failed");
break;
}
if (bind_textdomain_codeset(domainname,
codeset_map_array[i].codeset) == NULL)
elog(LOG, "bind_textdomain_codeset failed");
break;
}
}
#endif