From cfe01796e6e9a9f644247b6e1810ba95bf89832d Mon Sep 17 00:00:00 2001
From: Tatsuo Ishii <ishii@postgresql.org>
Date: Tue, 16 Oct 2001 10:09:17 +0000
Subject: Ok, here is the modified encoding table (column1 is the standard
 name, 2 is our "official" name, and 3 is alias). If there's no objection, I
 will change them.

ASCII		SQL_ASCII
UTF-8		UNICODE		UTF_8
MULE-INTERNAL	MULE_INTERNAL
ISO-8859-1	LATIN1		ISO_8859_1
ISO-8859-2	LATIN2		ISO_8859_2
ISO-8859-3	LATIN3		ISO_8859_3
ISO-8859-4	LATIN4		ISO_8859_4
ISO-8859-5	ISO_8859_5
ISO-8859-6	ISO_8859_6
ISO-8859-7	ISO_8859_7
ISO-8859-8	ISO_8859_8
ISO-8859-9	LATIN5		ISO_8859_9
ISO-8859-10	LATIN6		ISO_8859_10
ISO-8859-13	LATIN7		ISO_8859_13
ISO-8859-14	LATIN8		ISO_8859_14
ISO-8859-15	LATIN9		ISO_8859_15
ISO-8859-16	LATIN10		ISO_8859_16
---
 src/backend/utils/mb/conv.c | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

(limited to 'src/backend/utils/mb/conv.c')

diff --git a/src/backend/utils/mb/conv.c b/src/backend/utils/mb/conv.c
index f6c0ac090a6..68fec7e0903 100644
--- a/src/backend/utils/mb/conv.c
+++ b/src/backend/utils/mb/conv.c
@@ -6,7 +6,7 @@
  * WIN1250 client encoding support contributed by Pavel Behal
  * SJIS UDC (NEC selection IBM kanji) support contributed by Eiji Tokuya
  *
- * $Id: conv.c,v 1.31 2001/10/11 14:20:35 ishii Exp $
+ * $Id: conv.c,v 1.32 2001/10/16 10:09:17 ishii Exp $
  *
  *
  */
@@ -1692,6 +1692,11 @@ pg_enconv pg_enconv_tbl[] =
 	{ PG_LATIN3,	latin32mic, mic2latin3, iso8859_3_to_utf, utf_to_iso8859_3},
 	{ PG_LATIN4,	latin42mic, mic2latin4, iso8859_4_to_utf, utf_to_iso8859_4},
 	{ PG_LATIN5,	iso2mic, mic2iso, iso8859_9_to_utf, utf_to_iso8859_9},
+	{ PG_LATIN6,	0, 0, iso8859_10_to_utf, utf_to_iso8859_10},
+	{ PG_LATIN7,	0, 0, iso8859_13_to_utf, utf_to_iso8859_13},
+	{ PG_LATIN8,	0, 0, iso8859_14_to_utf, utf_to_iso8859_14},
+	{ PG_LATIN9,	0, 0, iso8859_15_to_utf, utf_to_iso8859_15},
+	{ PG_LATIN10,	0, 0, iso8859_16_to_utf, utf_to_iso8859_16},
 	{ PG_KOI8R,	koi8r2mic, mic2koi8r, KOI8R_to_utf, utf_to_KOI8R},
 	{ PG_WIN1251,	win12512mic, mic2win1251, WIN1251_to_utf, utf_to_WIN1251},
 	{ PG_ALT,	alt2mic, mic2alt, ALT_to_utf, utf_to_ALT},
@@ -1699,11 +1704,7 @@ pg_enconv pg_enconv_tbl[] =
 	{ PG_ISO_8859_6,	0, 0, iso8859_6_to_utf, utf_to_iso8859_6},
 	{ PG_ISO_8859_7,	0, 0, iso8859_7_to_utf, utf_to_iso8859_7},
 	{ PG_ISO_8859_8,	0, 0, iso8859_8_to_utf, utf_to_iso8859_8},
-	{ PG_ISO_8859_10,	0, 0, iso8859_10_to_utf, utf_to_iso8859_10},
-	{ PG_ISO_8859_13,	0, 0, iso8859_13_to_utf, utf_to_iso8859_13},
-	{ PG_ISO_8859_14,	0, 0, iso8859_14_to_utf, utf_to_iso8859_14},
-	{ PG_ISO_8859_15,	0, 0, iso8859_15_to_utf, utf_to_iso8859_15},
-	{ PG_ISO_8859_16,	0, 0, iso8859_16_to_utf, utf_to_iso8859_16},
+
 	{ PG_SJIS,	sjis2mic, mic2sjis, sjis_to_utf, utf_to_sjis},
 	{ PG_BIG5,	big52mic, mic2big5, big5_to_utf, utf_to_big5},
 	{ PG_WIN1250,	win12502mic, mic2win1250, 0, 0},
@@ -1725,6 +1726,11 @@ pg_enconv pg_enconv_tbl[] =
 	{ PG_LATIN3,	latin32mic, mic2latin3, 0, 0},
 	{ PG_LATIN4,	latin42mic, mic2latin4, 0, 0},
 	{ PG_LATIN5,	iso2mic, mic2iso, 0, 0},
+	{ PG_LATIN6,	0, 0, 0, 0},
+	{ PG_LATIN7,	0, 0, 0, 0},
+	{ PG_LATIN8,	0, 0, 0, 0},
+	{ PG_LATIN9,	0, 0, 0, 0},
+	{ PG_LATIN10,	0, 0, 0, 0},
 	{ PG_KOI8R,	koi8r2mic, mic2koi8r, 0, 0},
 	{ PG_WIN1251,	win12512mic, mic2win1251, 0, 0},
 	{ PG_ALT,	alt2mic, mic2alt, 0, 0},
@@ -1732,11 +1738,6 @@ pg_enconv pg_enconv_tbl[] =
 	{ PG_ISO_8859_6,	0, 0, 0, 0},
 	{ PG_ISO_8859_7,	0, 0, 0, 0},
 	{ PG_ISO_8859_8,	0, 0, 0, 0},
-	{ PG_ISO_8859_10,	0, 0, 0, 0},
-	{ PG_ISO_8859_13,	0, 0, 0, 0},
-	{ PG_ISO_8859_14,	0, 0, 0, 0},
-	{ PG_ISO_8859_15,	0, 0, 0, 0},
-	{ PG_ISO_8859_16,	0, 0, 0, 0},
 	{ PG_SJIS,	sjis2mic, mic2sjis, 0, 0},
 	{ PG_BIG5,	big52mic, mic2big5, 0, 0},
 	{ PG_WIN1250,	win12502mic, mic2win1250, 0, 0},
-- 
cgit v1.2.3