Add Cyrillic and other encodings for encoding conversion.

Patches submitted by Kaori Inaba (i-kaori@sra.co.jp).

2 files changed, 362 insertions, 57 deletions

diff --git a/doc/src/sgml/charset.sgml b/doc/src/sgml/charset.sgml
index 4356e6d01e6..a4093a2382f 100644
--- a/doc/src/sgml/charset.sgml
+++ b/doc/src/sgml/charset.sgml
@@ -1,4 +1,4 @@
-<!-- $Header: /cvsroot/pgsql/doc/src/sgml/charset.sgml,v 2.26 2002/08/08 08:21:52 ishii Exp $ -->
+<!-- $Header: /cvsroot/pgsql/doc/src/sgml/charset.sgml,v 2.27 2002/08/14 02:45:09 ishii Exp $ -->
 
 <chapter id="charset">
  <title>Localization</>
@@ -649,8 +649,7 @@ $ <userinput>psql -l</userinput>
 	</row>
 	<row>  
 	 <entry><literal>LATIN5</literal></entry>
-	 <entry><literal>LATIN5</literal>, <literal>UNICODE</literal>,
-	 <literal>MULE_INTERNAL</literal>
+	 <entry><literal>LATIN5</literal>, <literal>UNICODE</literal>
 	 </entry>
 	</row>
 	<row>  
@@ -687,6 +686,7 @@ $ <userinput>psql -l</userinput>
 	 <entry><literal>ISO_8859_5</literal></entry>
 	 <entry><literal>ISO_8859_5</literal>,
 	 <literal>UNICODE</literal>,
+	 <literal>MULE_INTERNAL</literal>,
 	 <literal>WIN</literal>,
 	 <literal>ALT</literal>,
 	 <literal>KOI8</literal>
@@ -727,13 +727,17 @@ $ <userinput>psql -l</userinput>
 	 <literal>WIN1256</literal>,
 	 <literal>TCVN</literal>,
 	 <literal>WIN874</literal>,
+	 <literal>GB18030</literal>,
+	 <literal>WIN1250</literal>
 	 </entry>
 	</row>
 	<row>
 	 <entry><literal>MULE_INTERNAL</literal></entry>
 	 <entry><literal>EUC_JP</literal>, <literal>SJIS</literal>, <literal>EUC_KR</literal>, <literal>EUC_CN</literal>, 
 	  <literal>EUC_TW</literal>, <literal>BIG5</literal>, <literal>LATIN1</literal> to <literal>LATIN5</literal>, 
-	  <literal>WIN</literal>, <literal>ALT</literal>, <literal>WIN1250</literal></entry>
+	  <literal>WIN</literal>, <literal>ALT</literal>,
+	 <literal>WIN1250</literal>,
+	  <literal>BIG5</literal>, <literal>ISO_8859_5</literal>, <literal>KOI8</literal></entry>
 	</row>
 	<row>
 	 <entry><literal>KOI8</literal></entry>
diff --git a/doc/src/sgml/func.sgml b/doc/src/sgml/func.sgml
index 475af474649..f136088fe84 100644
--- a/doc/src/sgml/func.sgml
+++ b/doc/src/sgml/func.sgml
@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/func.sgml,v 1.110 2002/08/09 16:45:13 tgl Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/func.sgml,v 1.111 2002/08/14 02:45:09 ishii Exp $
 PostgreSQL documentation
 -->
 
@@ -970,9 +970,16 @@ PostgreSQL documentation
        <entry>destination encoding</entry>
       </row>
      </thead>
+
      <tbody>
       <row>
-       <entry>ascii_to_utf8</entry>
+       <entry>ascii_to_mic</entry>
+       <entry>SQL_ASCII</entry>
+       <entry>MULE_INTERNAL</entry>
+      </row>
+
+      <row>
+       <entry>ascii_to_utf_8</entry>
        <entry>SQL_ASCII</entry>
        <entry>UNICODE</entry>
       </row>
@@ -990,13 +997,19 @@ PostgreSQL documentation
       </row>
 
       <row>
-       <entry>big5_to_utf8</entry>
+       <entry>big5_to_utf_8</entry>
        <entry>BIG5</entry>
        <entry>UNICODE</entry>
       </row>
 
       <row>
-       <entry>euc_cn_to_utf8</entry>
+       <entry>euc_cn_to_mic</entry>
+       <entry>EUC_CN</entry>
+       <entry>MULE_INTERNAL</entry>
+      </row>
+
+      <row>
+       <entry>euc_cn_to_utf_8</entry>
        <entry>EUC_CN</entry>
        <entry>UNICODE</entry>
       </row>
@@ -1014,13 +1027,19 @@ PostgreSQL documentation
       </row>
 
       <row>
-       <entry>euc_jp_to_utf8</entry>
+       <entry>euc_jp_to_utf_8</entry>
        <entry>EUC_JP</entry>
        <entry>UNICODE</entry>
       </row>
 
       <row>
-       <entry>euc_kr_to_utf8</entry>
+       <entry>euc_kr_to_mic</entry>
+       <entry>EUC_KR</entry>
+       <entry>MULE_INTERNAL</entry>
+      </row>
+
+      <row>
+       <entry>euc_kr_to_utf_8</entry>
        <entry>EUC_KR</entry>
        <entry>UNICODE</entry>
       </row>
@@ -1038,138 +1057,294 @@ PostgreSQL documentation
       </row>
 
       <row>
-       <entry>euc_tw_to_utf8</entry>
+       <entry>euc_tw_to_utf_8</entry>
        <entry>EUC_TW</entry>
        <entry>UNICODE</entry>
       </row>
 
       <row>
-       <entry>gb18030_to_utf8</entry>
+       <entry>gb18030_to_utf_8</entry>
        <entry>GB18030</entry>
        <entry>UNICODE</entry>
       </row>
 
       <row>
-       <entry>gbk_to_utf8</entry>
+       <entry>gbk_to_utf_8</entry>
        <entry>GBK</entry>
        <entry>UNICODE</entry>
       </row>
 
       <row>
-       <entry>iso8859_10_to_utf8</entry>
+       <entry>iso_8859_10_to_utf_8</entry>
        <entry>LATIN6</entry>
        <entry>UNICODE</entry>
       </row>
 
       <row>
-       <entry>iso8859_13_to_utf8</entry>
+       <entry>iso_8859_13_to_utf_8</entry>
        <entry>LATIN7</entry>
        <entry>UNICODE</entry>
       </row>
 
       <row>
-       <entry>iso8859_14_to_utf8</entry>
+       <entry>iso_8859_14_to_utf_8</entry>
        <entry>LATIN8</entry>
        <entry>UNICODE</entry>
       </row>
 
       <row>
-       <entry>iso8859_15_to_utf8</entry>
+       <entry>iso_8859_15_to_utf_8</entry>
        <entry>LATIN9</entry>
        <entry>UNICODE</entry>
       </row>
 
       <row>
-       <entry>iso8859_16_to_utf8</entry>
+       <entry>iso_8859_16_to_utf_8</entry>
        <entry>LATIN10</entry>
        <entry>UNICODE</entry>
       </row>
 
       <row>
-       <entry>iso8859_1_to_utf8</entry>
+       <entry>iso_8859_1_to_mic</entry>
+       <entry>LATIN1</entry>
+       <entry>MULE_INTERNAL</entry>
+      </row>
+
+      <row>
+       <entry>iso_8859_1_to_utf_8</entry>
        <entry>LATIN1</entry>
        <entry>UNICODE</entry>
       </row>
 
       <row>
-       <entry>iso8859_2_to_utf8</entry>
+       <entry>iso_8859_2_to_mic</entry>
+       <entry>LATIN2</entry>
+       <entry>MULE_INTERNAL</entry>
+      </row>
+
+      <row>
+       <entry>iso_8859_2_to_utf_8</entry>
        <entry>LATIN2</entry>
        <entry>UNICODE</entry>
       </row>
 
       <row>
-       <entry>iso8859_3_to_utf8</entry>
+       <entry>iso_8859_2_to_win1250</entry>
+       <entry>LATIN2</entry>
+       <entry>WIN1250</entry>
+      </row>
+
+      <row>
+       <entry>iso_8859_3_to_mic</entry>
+       <entry>LATIN3</entry>
+       <entry>MULE_INTERNAL</entry>
+      </row>
+
+      <row>
+       <entry>iso_8859_3_to_utf_8</entry>
        <entry>LATIN3</entry>
        <entry>UNICODE</entry>
       </row>
 
       <row>
-       <entry>iso8859_4_to_utf8</entry>
+       <entry>iso_8859_4_to_mic</entry>
+       <entry>LATIN4</entry>
+       <entry>MULE_INTERNAL</entry>
+      </row>
+
+      <row>
+       <entry>iso_8859_4_to_utf_8</entry>
        <entry>LATIN4</entry>
        <entry>UNICODE</entry>
       </row>
 
       <row>
-       <entry>iso8859_5_to_utf8</entry>
+       <entry>iso_8859_5_to_koi8r</entry>
+       <entry>ISO_8859_5</entry>
+       <entry>KOI8</entry>
+      </row>
+
+      <row>
+       <entry>iso_8859_5_to_mic</entry>
+       <entry>ISO_8859_5</entry>
+       <entry>MULE_INTERNAL</entry>
+      </row>
+
+      <row>
+       <entry>iso_8859_5_to_utf_8</entry>
        <entry>ISO_8859_5</entry>
        <entry>UNICODE</entry>
       </row>
 
       <row>
-       <entry>iso8859_6_to_utf8</entry>
+       <entry>iso_8859_5_to_win1251</entry>
+       <entry>ISO_8859_5</entry>
+       <entry>WIN</entry>
+      </row>
+
+      <row>
+       <entry>iso_8859_5_to_win866</entry>
+       <entry>ISO_8859_5</entry>
+       <entry>ALT</entry>
+      </row>
+
+      <row>
+       <entry>iso_8859_6_to_utf_8</entry>
        <entry>ISO_8859_6</entry>
        <entry>UNICODE</entry>
       </row>
 
       <row>
-       <entry>iso8859_7_to_utf8</entry>
+       <entry>iso_8859_7_to_utf_8</entry>
        <entry>ISO_8859_7</entry>
        <entry>UNICODE</entry>
       </row>
 
       <row>
-       <entry>iso8859_8_to_utf8</entry>
+       <entry>iso_8859_8_to_utf_8</entry>
        <entry>ISO_8859_8</entry>
        <entry>UNICODE</entry>
       </row>
 
       <row>
-       <entry>iso8859_9_to_utf8</entry>
+       <entry>iso_8859_9_to_utf_8</entry>
        <entry>LATIN5</entry>
        <entry>UNICODE</entry>
       </row>
 
       <row>
-       <entry>johab_to_utf8</entry>
+       <entry>johab_to_utf_8</entry>
        <entry>JOHAB</entry>
        <entry>UNICODE</entry>
       </row>
 
       <row>
+       <entry>koi8r_to_iso_8859_5</entry>
+       <entry>KOI8</entry>
+       <entry>ISO_8859_5</entry>
+      </row>
+
+      <row>
+       <entry>koi8r_to_mic</entry>
+       <entry>KOI8</entry>
+       <entry>MULE_INTERNAL</entry>
+      </row>
+
+      <row>
+       <entry>koi8r_to_utf_8</entry>
+       <entry>KOI8</entry>
+       <entry>UNICODE</entry>
+      </row>
+
+      <row>
+       <entry>koi8r_to_win1251</entry>
+       <entry>KOI8</entry>
+       <entry>WIN</entry>
+      </row>
+
+      <row>
+       <entry>koi8r_to_win866</entry>
+       <entry>KOI8</entry>
+       <entry>ALT</entry>
+      </row>
+
+      <row>
+       <entry>mic_to_ascii</entry>
+       <entry>MULE_INTERNAL</entry>
+       <entry>SQL_ASCII</entry>
+      </row>
+
+      <row>
        <entry>mic_to_big5</entry>
        <entry>MULE_INTERNAL</entry>
        <entry>BIG5</entry>
       </row>
 
       <row>
+       <entry>mic_to_euc_cn</entry>
+       <entry>MULE_INTERNAL</entry>
+       <entry>EUC_CN</entry>
+      </row>
+
+      <row>
        <entry>mic_to_euc_jp</entry>
        <entry>MULE_INTERNAL</entry>
        <entry>EUC_JP</entry>
       </row>
 
       <row>
+       <entry>mic_to_euc_kr</entry>
+       <entry>MULE_INTERNAL</entry>
+       <entry>EUC_KR</entry>
+      </row>
+
+      <row>
        <entry>mic_to_euc_tw</entry>
        <entry>MULE_INTERNAL</entry>
        <entry>EUC_TW</entry>
       </row>
 
       <row>
+       <entry>mic_to_iso_8859_1</entry>
+       <entry>MULE_INTERNAL</entry>
+       <entry>LATIN1</entry>
+      </row>
+
+      <row>
+       <entry>mic_to_iso_8859_2</entry>
+       <entry>MULE_INTERNAL</entry>
+       <entry>LATIN2</entry>
+      </row>
+
+      <row>
+       <entry>mic_to_iso_8859_3</entry>
+       <entry>MULE_INTERNAL</entry>
+       <entry>LATIN3</entry>
+      </row>
+
+      <row>
+       <entry>mic_to_iso_8859_4</entry>
+       <entry>MULE_INTERNAL</entry>
+       <entry>LATIN4</entry>
+      </row>
+
+      <row>
+       <entry>mic_to_iso_8859_5</entry>
+       <entry>MULE_INTERNAL</entry>
+       <entry>ISO_8859_5</entry>
+      </row>
+
+      <row>
+       <entry>mic_to_koi8r</entry>
+       <entry>MULE_INTERNAL</entry>
+       <entry>KOI8</entry>
+      </row>
+
+      <row>
        <entry>mic_to_sjis</entry>
        <entry>MULE_INTERNAL</entry>
        <entry>SJIS</entry>
       </row>
 
       <row>
+       <entry>mic_to_win1250</entry>
+       <entry>MULE_INTERNAL</entry>
+       <entry>WIN1250</entry>
+      </row>
+
+      <row>
+       <entry>mic_to_win1251</entry>
+       <entry>MULE_INTERNAL</entry>
+       <entry>WIN</entry>
+      </row>
+
+      <row>
+       <entry>mic_to_win866</entry>
+       <entry>MULE_INTERNAL</entry>
+       <entry>ALT</entry>
+      </row>
+
+      <row>
        <entry>sjis_to_euc_jp</entry>
        <entry>SJIS</entry>
        <entry>EUC_JP</entry>
@@ -1182,179 +1357,305 @@ PostgreSQL documentation
       </row>
 
       <row>
-       <entry>sjis_to_utf8</entry>
+       <entry>sjis_to_utf_8</entry>
        <entry>SJIS</entry>
        <entry>UNICODE</entry>
       </row>
 
       <row>
-       <entry>tcvn_to_utf8</entry>
+       <entry>tcvn_to_utf_8</entry>
        <entry>TCVN</entry>
        <entry>UNICODE</entry>
       </row>
 
       <row>
-       <entry>uhc_to_utf8</entry>
+       <entry>uhc_to_utf_8</entry>
        <entry>UHC</entry>
        <entry>UNICODE</entry>
       </row>
 
       <row>
-       <entry>utf8_to_ascii</entry>
+       <entry>utf_8_to_ascii</entry>
        <entry>UNICODE</entry>
        <entry>SQL_ASCII</entry>
       </row>
 
       <row>
-       <entry>utf8_to_big5</entry>
+       <entry>utf_8_to_big5</entry>
        <entry>UNICODE</entry>
        <entry>BIG5</entry>
       </row>
 
       <row>
-       <entry>utf8_to_euc_cn</entry>
+       <entry>utf_8_to_euc_cn</entry>
        <entry>UNICODE</entry>
        <entry>EUC_CN</entry>
       </row>
 
       <row>
-       <entry>utf8_to_euc_jp</entry>
+       <entry>utf_8_to_euc_jp</entry>
        <entry>UNICODE</entry>
        <entry>EUC_JP</entry>
       </row>
 
       <row>
-       <entry>utf8_to_euc_kr</entry>
+       <entry>utf_8_to_euc_kr</entry>
        <entry>UNICODE</entry>
        <entry>EUC_KR</entry>
       </row>
 
       <row>
-       <entry>utf8_to_euc_tw</entry>
+       <entry>utf_8_to_euc_tw</entry>
        <entry>UNICODE</entry>
        <entry>EUC_TW</entry>
       </row>
 
       <row>
-       <entry>utf8_to_gb18030</entry>
+       <entry>utf_8_to_gb18030</entry>
        <entry>UNICODE</entry>
        <entry>GB18030</entry>
       </row>
 
       <row>
-       <entry>utf8_to_gbk</entry>
+       <entry>utf_8_to_gbk</entry>
        <entry>UNICODE</entry>
        <entry>GBK</entry>
       </row>
 
       <row>
-       <entry>utf8_to_iso8859_1</entry>
+       <entry>utf_8_to_iso_8859_1</entry>
        <entry>UNICODE</entry>
        <entry>LATIN1</entry>
       </row>
 
       <row>
-       <entry>utf8_to_iso8859_10</entry>
+       <entry>utf_8_to_iso_8859_10</entry>
        <entry>UNICODE</entry>
        <entry>LATIN6</entry>
       </row>
 
       <row>
-       <entry>utf8_to_iso8859_13</entry>
+       <entry>utf_8_to_iso_8859_13</entry>
        <entry>UNICODE</entry>
        <entry>LATIN7</entry>
       </row>
 
       <row>
-       <entry>utf8_to_iso8859_14</entry>
+       <entry>utf_8_to_iso_8859_14</entry>
        <entry>UNICODE</entry>
        <entry>LATIN8</entry>
       </row>
 
       <row>
-       <entry>utf8_to_iso8859_15</entry>
+       <entry>utf_8_to_iso_8859_15</entry>
        <entry>UNICODE</entry>
        <entry>LATIN9</entry>
       </row>
 
       <row>
-       <entry>utf8_to_iso8859_16</entry>
+       <entry>utf_8_to_iso_8859_16</entry>
        <entry>UNICODE</entry>
        <entry>LATIN10</entry>
       </row>
 
       <row>
-       <entry>utf8_to_iso8859_2</entry>
+       <entry>utf_8_to_iso_8859_2</entry>
        <entry>UNICODE</entry>
        <entry>LATIN2</entry>
       </row>
 
       <row>
-       <entry>utf8_to_iso8859_3</entry>
+       <entry>utf_8_to_iso_8859_3</entry>
        <entry>UNICODE</entry>
        <entry>LATIN3</entry>
       </row>
 
       <row>
-       <entry>utf8_to_iso8859_4</entry>
+       <entry>utf_8_to_iso_8859_4</entry>
        <entry>UNICODE</entry>
        <entry>LATIN4</entry>
       </row>
 
       <row>
-       <entry>utf8_to_iso8859_5</entry>
+       <entry>utf_8_to_iso_8859_5</entry>
        <entry>UNICODE</entry>
        <entry>ISO_8859_5</entry>
       </row>
 
       <row>
-       <entry>utf8_to_iso8859_6</entry>
+       <entry>utf_8_to_iso_8859_6</entry>
        <entry>UNICODE</entry>
        <entry>ISO_8859_6</entry>
       </row>
 
       <row>
-       <entry>utf8_to_iso8859_7</entry>
+       <entry>utf_8_to_iso_8859_7</entry>
        <entry>UNICODE</entry>
        <entry>ISO_8859_7</entry>
       </row>
 
       <row>
-       <entry>utf8_to_iso8859_8</entry>
+       <entry>utf_8_to_iso_8859_8</entry>
        <entry>UNICODE</entry>
        <entry>ISO_8859_8</entry>
       </row>
 
       <row>
-       <entry>utf8_to_iso8859_9</entry>
+       <entry>utf_8_to_iso_8859_9</entry>
        <entry>UNICODE</entry>
        <entry>LATIN5</entry>
       </row>
 
       <row>
-       <entry>utf8_to_johab</entry>
+       <entry>utf_8_to_johab</entry>
        <entry>UNICODE</entry>
        <entry>JOHAB</entry>
       </row>
 
       <row>
-       <entry>utf8_to_sjis</entry>
+       <entry>utf_8_to_koi8r</entry>
+       <entry>UNICODE</entry>
+       <entry>KOI8</entry>
+      </row>
+
+      <row>
+       <entry>utf_8_to_sjis</entry>
        <entry>UNICODE</entry>
        <entry>SJIS</entry>
       </row>
 
       <row>
-       <entry>utf8_to_tcvn</entry>
+       <entry>utf_8_to_tcvn</entry>
        <entry>UNICODE</entry>
        <entry>TCVN</entry>
       </row>
 
       <row>
-       <entry>utf8_to_uhc</entry>
+       <entry>utf_8_to_uhc</entry>
        <entry>UNICODE</entry>
        <entry>UHC</entry>
       </row>
 
+      <row>
+       <entry>utf_8_to_win1250</entry>
+       <entry>UNICODE</entry>
+       <entry>WIN1250</entry>
+      </row>
+
+      <row>
+       <entry>utf_8_to_win1251</entry>
+       <entry>UNICODE</entry>
+       <entry>WIN</entry>
+      </row>
+
+      <row>
+       <entry>utf_8_to_win1256</entry>
+       <entry>UNICODE</entry>
+       <entry>WIN1256</entry>
+      </row>
+
+      <row>
+       <entry>utf_8_to_win866</entry>
+       <entry>UNICODE</entry>
+       <entry>ALT</entry>
+      </row>
+
+      <row>
+       <entry>utf_8_to_win874</entry>
+       <entry>UNICODE</entry>
+       <entry>WIN874</entry>
+      </row>
+
+      <row>
+       <entry>win1250_to_iso_8859_2</entry>
+       <entry>WIN1250</entry>
+       <entry>LATIN2</entry>
+      </row>
+
+      <row>
+       <entry>win1250_to_mic</entry>
+       <entry>WIN1250</entry>
+       <entry>MULE_INTERNAL</entry>
+      </row>
+
+      <row>
+       <entry>win1250_to_utf_8</entry>
+       <entry>WIN1250</entry>
+       <entry>UNICODE</entry>
+      </row>
+
+      <row>
+       <entry>win1251_to_iso_8859_5</entry>
+       <entry>WIN</entry>
+       <entry>ISO_8859_5</entry>
+      </row>
+
+      <row>
+       <entry>win1251_to_koi8r</entry>
+       <entry>WIN</entry>
+       <entry>KOI8</entry>
+      </row>
+
+      <row>
+       <entry>win1251_to_mic</entry>
+       <entry>WIN</entry>
+       <entry>MULE_INTERNAL</entry>
+      </row>
+
+      <row>
+       <entry>win1251_to_utf_8</entry>
+       <entry>WIN</entry>
+       <entry>UNICODE</entry>
+      </row>
+
+      <row>
+       <entry>win1251_to_win866</entry>
+       <entry>WIN</entry>
+       <entry>ALT</entry>
+      </row>
+
+      <row>
+       <entry>win1256_to_utf_8</entry>
+       <entry>WIN1256</entry>
+       <entry>UNICODE</entry>
+      </row>
+
+      <row>
+       <entry>win866_to_iso_8859_5</entry>
+       <entry>ALT</entry>
+       <entry>ISO_8859_5</entry>
+      </row>
+
+      <row>
+       <entry>win866_to_koi8r</entry>
+       <entry>ALT</entry>
+       <entry>KOI8</entry>
+      </row>
+
+      <row>
+       <entry>win866_to_mic</entry>
+       <entry>ALT</entry>
+       <entry>MULE_INTERNAL</entry>
+      </row>
+
+      <row>
+       <entry>win866_to_utf_8</entry>
+       <entry>ALT</entry>
+       <entry>UNICODE</entry>
+      </row>
+
+      <row>
+       <entry>win866_to_win1251</entry>
+       <entry>ALT</entry>
+       <entry>WIN</entry>
+      </row>
+
+      <row>
+       <entry>win874_to_utf_8</entry>
+       <entry>WIN874</entry>
+       <entry>UNICODE</entry>
+      </row>
+
      </tbody>
     </tgroup>
    </table>