From: Tatsuo Ishii <ishii@postgresql.org>
Date: Sun, 15 Dec 2013 01:33:06 +0000 (+0900)
Subject: Add "SHIFT_JIS" as an accepted encoding name for locale checking.
X-Git-Tag: REL9_3_3~97
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8122e6f85a77872f9c67ed384398244e95c1e8e9;p=postgresql

Add "SHIFT_JIS" as an accepted encoding name for locale checking.

When locale is "ja_JP.SJIS", nl_langinfo(CODESET) returns "SHIFT_JIS"
on some platforms, at least on RedHat Linux. So the encoding/locale
match table (encoding_match_list) needs the entry. Otherwise client
encoding is set to SQL_ASCII.

Back patch to all supported branches.
---

diff --git a/src/port/chklocale.c b/src/port/chklocale.c
index 9e889383f2..36296a18bc 100644
--- a/src/port/chklocale.c
+++ b/src/port/chklocale.c
@@ -162,6 +162,7 @@ static const struct encoding_match encoding_match_list[] = {
 	{PG_SJIS, "SJIS"},
 	{PG_SJIS, "PCK"},
 	{PG_SJIS, "CP932"},
+	{PG_SJIS, "SHIFT_JIS"},
 
 	{PG_BIG5, "BIG5"},
 	{PG_BIG5, "BIG5HKSCS"},