diff options
author | Peter Eisentraut | 2006-02-18 16:15:23 +0000 |
---|---|---|
committer | Peter Eisentraut | 2006-02-18 16:15:23 +0000 |
commit | 1b658473eaa411cc722f0eeb0c576a5f459ca360 (patch) | |
tree | cc7c4e86275da49ac5b72ed82d230c099443b5fd /src/test/regress/sql/conversion.sql | |
parent | a6d3b5b944cfcb6a2687b112621b76f6b3c9bcd8 (diff) |
Add support for Windows codepages 1253, 1254, 1255, and 1257 and clean
up a bunch of the support utilities.
In src/backend/utils/mb/Unicode remove nearly duplicate copies of the
UCS_to_XXX perl script and replace with one version to handle all generic
files. Update the Makefile so that it knows about all the map files.
This produces a slight difference in some of the map files, using a
uniform naming convention and not mapping the null character.
In src/backend/utils/mb/conversion_procs create a master utf8<->win
codepage function like the ISO 8859 versions instead of having a separate
handler for each conversion.
There is an externally visible change in the name of the win1258 to utf8
conversion. According to the documentation notes, it was named
incorrectly and this changes it to a standard name.
Running the Unicode mapping perl scripts has shown some additional mapping
changes in koi8r and iso8859-7.
Diffstat (limited to 'src/test/regress/sql/conversion.sql')
-rw-r--r-- | src/test/regress/sql/conversion.sql | 28 |
1 files changed, 26 insertions, 2 deletions
diff --git a/src/test/regress/sql/conversion.sql b/src/test/regress/sql/conversion.sql index b172d764ad0..64a4ca5650c 100644 --- a/src/test/regress/sql/conversion.sql +++ b/src/test/regress/sql/conversion.sql @@ -346,10 +346,10 @@ SELECT CONVERT('foo', 'SJIS', 'UTF8'); SELECT CONVERT('foo' USING utf8_to_sjis); SELECT CONVERT('foo', 'UTF8', 'SJIS'); -- WIN1258 --> UTF8 -SELECT CONVERT('foo' USING win1258_to_utf8); +SELECT CONVERT('foo' USING windows_1258_to_utf8); SELECT CONVERT('foo', 'WIN1258', 'UTF8'); -- UTF8 --> WIN1258 -SELECT CONVERT('foo' USING utf8_to_win1258); +SELECT CONVERT('foo' USING utf8_to_windows_1258); SELECT CONVERT('foo', 'UTF8', 'WIN1258'); -- UHC --> UTF8 SELECT CONVERT('foo' USING uhc_to_utf8); @@ -375,6 +375,30 @@ SELECT CONVERT('foo', 'UTF8', 'WIN874'); -- WIN874 --> UTF8 SELECT CONVERT('foo' USING windows_874_to_utf8); SELECT CONVERT('foo', 'WIN874', 'UTF8'); +-- UTF8 --> WIN1253 +SELECT CONVERT('foo' USING utf8_to_windows_1253); +SELECT CONVERT('foo', 'UTF8', 'WIN1253'); +-- WIN1253 --> UTF8 +SELECT CONVERT('foo' USING windows_1253_to_utf8); +SELECT CONVERT('foo', 'WIN1253', 'UTF8'); +-- UTF8 --> WIN1254 +SELECT CONVERT('foo' USING utf8_to_windows_1254); +SELECT CONVERT('foo', 'UTF8', 'WIN1254'); +-- WIN1254 --> UTF8 +SELECT CONVERT('foo' USING windows_1254_to_utf8); +SELECT CONVERT('foo', 'WIN1254', 'UTF8'); +-- UTF8 --> WIN1255 +SELECT CONVERT('foo' USING utf8_to_windows_1255); +SELECT CONVERT('foo', 'UTF8', 'WIN1255'); +-- WIN1255 --> UTF8 +SELECT CONVERT('foo' USING windows_1255_to_utf8); +SELECT CONVERT('foo', 'WIN1255', 'UTF8'); +-- UTF8 --> WIN1257 +SELECT CONVERT('foo' USING utf8_to_windows_1257); +SELECT CONVERT('foo', 'UTF8', 'WIN1257'); +-- WIN1257 --> UTF8 +SELECT CONVERT('foo' USING windows_1257_to_utf8); +SELECT CONVERT('foo', 'WIN1257', 'UTF8'); -- -- return to the super user -- |