Add new encoding EUC_JIS_2004 and SHIFT_JIS_2004,

along with new conversions among EUC_JIS_2004, SHIFT_JIS_2004 and UTF-8.
catalog version has been bump up.

2 files changed, 96 insertions, 0 deletions

diff --git a/src/test/regress/expected/conversion.out b/src/test/regress/expected/conversion.out
index 00a1ecf638..cd3f0e2c48 100644
--- a/src/test/regress/expected/conversion.out
+++ b/src/test/regress/expected/conversion.out
@@ -1642,6 +1642,84 @@ SELECT CONVERT('foo', 'WIN1257', 'UTF8');
  foo
 (1 row)
 
+-- UTF8 --> EUC_JIS_2004
+SELECT CONVERT('foo' USING utf8_to_euc_jis_2004);
+ convert_using 
+---------------
+ foo
+(1 row)
+
+SELECT CONVERT('foo', 'UTF8', 'EUC_JIS_2004');
+ convert 
+---------
+ foo
+(1 row)
+
+-- EUC_JIS_2004 --> UTF8
+SELECT CONVERT('foo' USING euc_jis_2004_to_utf8);
+ convert_using 
+---------------
+ foo
+(1 row)
+
+SELECT CONVERT('foo', 'EUC_JIS_2004', 'UTF8');
+ convert 
+---------
+ foo
+(1 row)
+
+-- UTF8 --> SHIFT_JIS_2004
+SELECT CONVERT('foo' USING utf8_to_euc_jis_2004);
+ convert_using 
+---------------
+ foo
+(1 row)
+
+SELECT CONVERT('foo', 'UTF8', 'SHIFT_JIS_2004');
+ convert 
+---------
+ foo
+(1 row)
+
+-- SHIFT_JIS_2004 --> UTF8
+SELECT CONVERT('foo' USING shift_jis_2004_to_utf8);
+ convert_using 
+---------------
+ foo
+(1 row)
+
+SELECT CONVERT('foo', 'SHIFT_JIS_2004', 'UTF8');
+ convert 
+---------
+ foo
+(1 row)
+
+-- EUC_JIS_2004 --> SHIFT_JIS_2004
+SELECT CONVERT('foo' USING euc_jis_2004_to_shift_jis_2004);
+ convert_using 
+---------------
+ foo
+(1 row)
+
+SELECT CONVERT('foo', 'EUC_JIS_2004', 'SHIFT_JIS_2004');
+ convert 
+---------
+ foo
+(1 row)
+
+-- SHIFT_JIS_2004 --> EUC_JIS_2004
+SELECT CONVERT('foo' USING shift_jis_2004_to_euc_jis_2004);
+ convert_using 
+---------------
+ foo
+(1 row)
+
+SELECT CONVERT('foo', 'SHIFT_JIS_2004', 'EUC_JIS_2004');
+ convert 
+---------
+ foo
+(1 row)
+
 --
 -- return to the super user
 --
diff --git a/src/test/regress/sql/conversion.sql b/src/test/regress/sql/conversion.sql
index 64a4ca5650..be5c8628f5 100644
--- a/src/test/regress/sql/conversion.sql
+++ b/src/test/regress/sql/conversion.sql
@@ -399,6 +399,24 @@ SELECT CONVERT('foo', 'UTF8', 'WIN1257');
 -- WIN1257 --> UTF8
 SELECT CONVERT('foo' USING windows_1257_to_utf8);
 SELECT CONVERT('foo', 'WIN1257', 'UTF8');
+-- UTF8 --> EUC_JIS_2004
+SELECT CONVERT('foo' USING utf8_to_euc_jis_2004);
+SELECT CONVERT('foo', 'UTF8', 'EUC_JIS_2004');
+-- EUC_JIS_2004 --> UTF8
+SELECT CONVERT('foo' USING euc_jis_2004_to_utf8);
+SELECT CONVERT('foo', 'EUC_JIS_2004', 'UTF8');
+-- UTF8 --> SHIFT_JIS_2004
+SELECT CONVERT('foo' USING utf8_to_euc_jis_2004);
+SELECT CONVERT('foo', 'UTF8', 'SHIFT_JIS_2004');
+-- SHIFT_JIS_2004 --> UTF8
+SELECT CONVERT('foo' USING shift_jis_2004_to_utf8);
+SELECT CONVERT('foo', 'SHIFT_JIS_2004', 'UTF8');
+-- EUC_JIS_2004 --> SHIFT_JIS_2004
+SELECT CONVERT('foo' USING euc_jis_2004_to_shift_jis_2004);
+SELECT CONVERT('foo', 'EUC_JIS_2004', 'SHIFT_JIS_2004');
+-- SHIFT_JIS_2004 --> EUC_JIS_2004
+SELECT CONVERT('foo' USING shift_jis_2004_to_euc_jis_2004);
+SELECT CONVERT('foo', 'SHIFT_JIS_2004', 'EUC_JIS_2004');
 --
 -- return to the super user
 --