Skip to content

Commit ee1bd33

Browse files
bmomjianbmomjian
committed
Document aliases for our supported encodings.
Add a few encodings that were not documented.
1 parent 78a572b commit ee1bd33

File tree

2 files changed

+41
-5
lines changed

2 files changed

+41
-5
lines changed

‎doc/src/sgml/charset.sgml

Lines changed: 40 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $PostgreSQL: pgsql/doc/src/sgml/charset.sgml,v 2.50 2005/03/12 06:28:17 momjian Exp $ -->
1+
<!-- $PostgreSQL: pgsql/doc/src/sgml/charset.sgml,v 2.51 2005/03/13 01:26:30 momjian Exp $ -->
22

33
<chapter id="charset">
44
<title>Localization</>
@@ -318,6 +318,11 @@ initdb --locale=sv_SE
318318
<entry><literal>SQL_ASCII</literal></entry>
319319
<entry><acronym>ASCII</acronym></entry>
320320
</row>
321+
<row>
322+
<entry><literal>BIG5</literal></entry>
323+
<entry>Chinese</entry>
324+
<entry>Aliases: WIN950, Windows950</entry>
325+
</row>
321326
<row>
322327
<entry><literal>EUC_JP</literal></entry>
323328
<entry>Japanese <acronym>EUC</></entry>
@@ -338,9 +343,19 @@ initdb --locale=sv_SE
338343
<entry><literal>EUC_TW</literal></entry>
339344
<entry>Taiwan <acronym>EUC</acronym></entry>
340345
</row>
346+
<row>
347+
<entry><literal>GBK</literal></entry>
348+
<entry>Chinese <acronym>EUC</acronym></entry>
349+
<entry>Aliases: WIN936, Windows936</entry>
350+
</row>
351+
<row>
352+
<entry><literal>GB18030</literal></entry>
353+
<entry>Chinese </entry>
354+
</row>
341355
<row>
342356
<entry><literal>UTF8</literal></entry>
343357
<entry>UTF-8 (Unicode, 8-bit)</entry>
358+
<entry>Aliases: Unicode</entry>
344359
</row>
345360
<row>
346361
<entry><literal>MULE_INTERNAL</literal></entry>
@@ -349,42 +364,52 @@ initdb --locale=sv_SE
349364
<row>
350365
<entry><literal>LATIN1</literal></entry>
351366
<entry>ISO 8859-1/<acronym>ECMA</> 94 (Western European)</entry>
367+
<entry>Aliases: ISO88591</entry>
352368
</row>
353369
<row>
354370
<entry><literal>LATIN2</literal></entry>
355371
<entry>ISO 8859-2/<acronym>ECMA</> 94 (Central European)</entry>
372+
<entry>Aliases: ISO88592</entry>
356373
</row>
357374
<row>
358375
<entry><literal>LATIN3</literal></entry>
359376
<entry>ISO 8859-3/<acronym>ECMA</> 94 (South European)</entry>
377+
<entry>Aliases: ISO88593</entry>
360378
</row>
361379
<row>
362380
<entry><literal>LATIN4</literal></entry>
363381
<entry>ISO 8859-4/<acronym>ECMA</> 94 (North European)</entry>
382+
<entry>Aliases: ISO88594</entry>
364383
</row>
365384
<row>
366385
<entry><literal>LATIN5</literal></entry>
367386
<entry>ISO 8859-9/<acronym>ECMA</> 128 (Turkish)</entry>
387+
<entry>Aliases: ISO88599</entry>
368388
</row>
369389
<row>
370390
<entry><literal>LATIN6</literal></entry>
371391
<entry>ISO 8859-10/<acronym>ECMA</> 144 (Nordic)</entry>
392+
<entry>Aliases: ISO885910</entry>
372393
</row>
373394
<row>
374395
<entry><literal>LATIN7</literal></entry>
375396
<entry>ISO 8859-13 (Baltic)</entry>
397+
<entry>Aliases: ISO885913</entry>
376398
</row>
377399
<row>
378400
<entry><literal>LATIN8</literal></entry>
379401
<entry>ISO 8859-14 (Celtic)</entry>
402+
<entry>Aliases: ISO885914</entry>
380403
</row>
381404
<row>
382405
<entry><literal>LATIN9</literal></entry>
383406
<entry>ISO 8859-15 (LATIN1 with Euro and accents)</entry>
407+
<entry>Aliases: ISO885915</entry>
384408
</row>
385409
<row>
386410
<entry><literal>LATIN10</literal></entry>
387411
<entry>ISO 8859-16/<acronym>ASRO</> SR 14111 (Romanian)</entry>
412+
<entry>Aliases: ISO885916</entry>
388413
</row>
389414
<row>
390415
<entry><literal>ISO_8859_5</literal></entry>
@@ -405,10 +430,22 @@ initdb --locale=sv_SE
405430
<row>
406431
<entry><literal>KOI8</literal></entry>
407432
<entry><acronym>KOI</acronym>8-R(U) (Cyrillic)</entry>
433+
<entry>Aliases: KOI8</entry>
434+
</row>
435+
<row>
436+
<entry><literal>SJIS</literal></entry>
437+
<entry>SJIS (Japanese)</entry>
438+
<entry>Aliases: Mskanji, ShiftJIS, WIN932, Windows932</entry>
439+
</row>
440+
<row>
441+
<entry><literal>UHC</literal></entry>
442+
<entry>Unified Hangul Code (Korean)</entry>
443+
<entry>Aliases: WIN949, Windows949</entry>
408444
</row>
409445
<row>
410446
<entry><literal>WIN866</literal></entry>
411447
<entry>Windows CP866 (Cyrillic)</entry>
448+
<entry>Aliases: ALT</entry>
412449
</row>
413450
<row>
414451
<entry><literal>WIN874</literal></entry>
@@ -421,6 +458,7 @@ initdb --locale=sv_SE
421458
<row>
422459
<entry><literal>WIN1251</literal></entry>
423460
<entry>Windows CP1251 (Cyrillic)</entry>
461+
<entry>Aliases: WIN</entry>
424462
</row>
425463
<row>
426464
<entry><literal>WIN1256</literal></entry>
@@ -429,6 +467,7 @@ initdb --locale=sv_SE
429467
<row>
430468
<entry><literal>WIN1258</literal></entry>
431469
<entry>Windows CP1258 (Vietnamese)/<acronym>TCVN</>-5712</entry>
470+
<entry>Aliases: ABC, TCVN, TCVN5712, VSCII</entry>
432471
</row>
433472
</tbody>
434473
</tgroup>

‎src/backend/utils/mb/encnames.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Encoding names and routines for work with it. All
33
* in this file is shared bedween FE and BE.
44
*
5-
* $PostgreSQL: pgsql/src/backend/utils/mb/encnames.c,v 1.23 2005/03/07 04:30:52 momjian Exp $
5+
* $PostgreSQL: pgsql/src/backend/utils/mb/encnames.c,v 1.24 2005/03/13 01:26:30 momjian Exp $
66
*/
77
#ifdef FRONTEND
88
#include "postgres_fe.h"
@@ -177,9 +177,6 @@ pg_encname pg_encname_tbl[] =
177177
{
178178
"unicode", PG_UTF8
179179
}, /* alias for UTF8 */
180-
{
181-
"utf-8", PG_UTF8
182-
}, /* UTF8; RFC2279 */
183180
{
184181
"utf8", PG_UTF8
185182
}, /* alias for UTF8 */

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy