BTW it does not add encodign it just patches existing one (KOI8) to

support two - KOI8-R and KOI8-U (latter is superset of the former if
not to take to the account pseudographics)

Andy Rysin

diff --git a/doc/src/sgml/charset.sgml b/doc/src/sgml/charset.sgml
index 97354a71bf165a2a5bd9e02646e48b501f5757e6..e7cf5612eb7d71fada875e007bf94e7b4d1a47b3 100644 (file)
--- a/doc/src/sgml/charset.sgml
+++ b/doc/src/sgml/charset.sgml
@@ -353,7 +353,7 @@ perl: warning: Falling back to the standard locale ("C").
        </row>
        <row>
         <entry>KOI8</entry>
-        <entry>KOI8-R</entry>
+        <entry>KOI8-R(U)</entry>
        </row>
        <row>
         <entry>WIN</entry>

diff --git a/src/backend/utils/mb/Unicode/KOI8_to_utf8.map b/src/backend/utils/mb/Unicode/KOI8_to_utf8.map
index 54a84df52b8c4859ee8e8e9b33bd0650d2543a40..9531d54f114540674b12b62d6f3d12b9d95573cc 100644 (file)
--- a/src/backend/utils/mb/Unicode/KOI8_to_utf8.map
+++ b/src/backend/utils/mb/Unicode/KOI8_to_utf8.map
@@ -35,32 +35,32 @@ static pg_local_to_utf LUmapKOI8[ 128 ] = {
   {0x00a1, 0xe29591},
   {0x00a2, 0xe29592},
   {0x00a3, 0xd191},
-  {0x00a4, 0xe29593},
+  {0x00a4, 0xd194},
   {0x00a5, 0xe29594},
-  {0x00a6, 0xe29595},
-  {0x00a7, 0xe29596},
+  {0x00a6, 0xd196},
+  {0x00a7, 0xd197},
   {0x00a8, 0xe29597},
   {0x00a9, 0xe29598},
   {0x00aa, 0xe29599},
   {0x00ab, 0xe2959a},
   {0x00ac, 0xe2959b},
-  {0x00ad, 0xe2959c},
+  {0x00ad, 0xd291},
   {0x00ae, 0xe2959d},
   {0x00af, 0xe2959e},
   {0x00b0, 0xe2959f},
   {0x00b1, 0xe295a0},
   {0x00b2, 0xe295a1},
   {0x00b3, 0xd081},
-  {0x00b4, 0xe295a2},
+  {0x00b4, 0xd084},
   {0x00b5, 0xe295a3},
-  {0x00b6, 0xe295a4},
-  {0x00b7, 0xe295a5},
+  {0x00b6, 0xd086},
+  {0x00b7, 0xd087},
   {0x00b8, 0xe295a6},
   {0x00b9, 0xe295a7},
   {0x00ba, 0xe295a8},
   {0x00bb, 0xe295a9},
   {0x00bc, 0xe295aa},
-  {0x00bd, 0xe295ab},
+  {0x00bd, 0xd290},
   {0x00be, 0xe295ac},
   {0x00bf, 0xc2a9},
   {0x00c0, 0xd18e},

diff --git a/src/backend/utils/mb/Unicode/utf8_to_KOI8.map b/src/backend/utils/mb/Unicode/utf8_to_KOI8.map
index 6ad89e160568d0ab4bc98a8e138d7997c569833a..53bd1af2dc4cb51ed6d780fea36e7ab75eaff952 100644 (file)
--- a/src/backend/utils/mb/Unicode/utf8_to_KOI8.map
+++ b/src/backend/utils/mb/Unicode/utf8_to_KOI8.map
@@ -6,6 +6,9 @@ static pg_utf_to_local ULmap_KOI8[ 128 ] = {
   {0xc2b7, 0x009e},
   {0xc3b7, 0x009f},
   {0xd081, 0x00b3},
+  {0xd084, 0x00b4},
+  {0xd086, 0x00b6},
+  {0xd087, 0x00b7},
   {0xd090, 0x00e1},
   {0xd091, 0x00e2},
   {0xd092, 0x00f7},
@@ -71,6 +74,11 @@ static pg_utf_to_local ULmap_KOI8[ 128 ] = {
   {0xd18e, 0x00c0},
   {0xd18f, 0x00d1},
   {0xd191, 0x00a3},
+  {0xd194, 0x00a4},
+  {0xd196, 0x00a6},
+  {0xd197, 0x00a7},
+  {0xd290, 0x00bd},
+  {0xd291, 0x00ad},
   {0xe28899, 0x0095},
   {0xe2889a, 0x0096},
   {0xe28988, 0x0097},
@@ -92,31 +100,23 @@ static pg_utf_to_local ULmap_KOI8[ 128 ] = {
   {0xe29590, 0x00a0},
   {0xe29591, 0x00a1},
   {0xe29592, 0x00a2},
-  {0xe29593, 0x00a4},
   {0xe29594, 0x00a5},
-  {0xe29595, 0x00a6},
-  {0xe29596, 0x00a7},
   {0xe29597, 0x00a8},
   {0xe29598, 0x00a9},
   {0xe29599, 0x00aa},
   {0xe2959a, 0x00ab},
   {0xe2959b, 0x00ac},
-  {0xe2959c, 0x00ad},
   {0xe2959d, 0x00ae},
   {0xe2959e, 0x00af},
   {0xe2959f, 0x00b0},
   {0xe295a0, 0x00b1},
   {0xe295a1, 0x00b2},
-  {0xe295a2, 0x00b4},
   {0xe295a3, 0x00b5},
-  {0xe295a4, 0x00b6},
-  {0xe295a5, 0x00b7},
   {0xe295a6, 0x00b8},
   {0xe295a7, 0x00b9},
   {0xe295a8, 0x00ba},
   {0xe295a9, 0x00bb},
   {0xe295aa, 0x00bc},
-  {0xe295ab, 0x00bd},
   {0xe295ac, 0x00be},
   {0xe29680, 0x008b},
   {0xe29684, 0x008c},

diff --git a/src/include/mb/pg_wchar.h b/src/include/mb/pg_wchar.h
index ce982c09961b1686069d38a1ec0a06fb8945a90a..7e0178825d147678fea0c447c5d19c36472f02fe 100644 (file)
--- a/src/include/mb/pg_wchar.h
+++ b/src/include/mb/pg_wchar.h
@@ -28,7 +28,7 @@
 #define LATIN7 13                              /* ISO-8859 Latin 7 */
 #define LATIN8 14                              /* ISO-8859 Latin 8 */
 #define LATIN9 15                              /* ISO-8859 Latin 9 */
-#define KOI8   16                              /* KOI8-R */
+#define KOI8   16                              /* KOI8-R/U */
 #define WIN    17                              /* windows-1251 */
 #define ALT    18                              /* Alternativny Variant (MS-DOS CP866) */
 /* followings are for client encoding only */
@@ -68,6 +68,7 @@ typedef unsigned int pg_wchar;
 #define LC_JISX0201K   0x89    /* Japanese 1 byte kana */
 #define LC_JISX0201R   0x8a    /* Japanese 1 byte Roman */
 #define LC_KOI8_R      0x8c            /* Cyrillic KOI8-R */
+#define LC_KOI8_U      0x8c            /* Cyrillic KOI8-U */
 #define LC_GB2312_80   0x91    /* Chinese */
 #define LC_JISX0208 0x92               /* Japanese Kanji */
 #define LC_KS5601      0x93            /* Korean */

diff --git a/src/interfaces/odbc/multibyte.h b/src/interfaces/odbc/multibyte.h
index 2c3f04cc7ac58688442b82c4b634f6c48d983458..c7d8b20d9519ffdb27c1c67b82fd8ad54c7396c0 100644 (file)
--- a/src/interfaces/odbc/multibyte.h
+++ b/src/interfaces/odbc/multibyte.h
@@ -21,7 +21,7 @@
 #define LATIN7                         13      /* ISO-8859 Latin 7 */
 #define LATIN8                         14      /* ISO-8859 Latin 8 */
 #define LATIN9                         15      /* ISO-8859 Latin 9 */
-#define KOI8                           16      /* KOI8-R */
+#define KOI8                           16      /* KOI8-R/U */
 #define WIN                                    17      /* windows-1251 */
 #define ALT                                    18      /* Alternativny Variant (MS-DOS CP866) */
 #define SJIS                           32      /* Shift JIS */