Prepare for new psql

diff --git a/src/test/regress/expected/euc_jp.out b/src/test/regress/expected/euc_jp.out
index b0bdfbac9afd341fa4f43442a03b7f92049af5a8..6f38e998a899e3b6beeece548b1542246561fec6 100644 (file)
--- a/src/test/regress/expected/euc_jp.out
+++ b/src/test/regress/expected/euc_jp.out
@@ -1,87 +1,87 @@
-QUERY: drop table ·×»»µ¡ÍѸì;
+drop table ·×»»µ¡ÍѸì;
 ERROR:  Relation '·×»»µ¡ÍѸì' does not exist
-QUERY: create table ·×»»µ¡ÍѸì (ÍѸì text, ʬÎॳ¡¼¥É varchar, È÷¹Í1A¤À¤è char(16));
-QUERY: create index ·×»»µ¡ÍѸìindex1 on ·×»»µ¡ÍѸì using btree (ÍѸì);
-QUERY: create index ·×»»µ¡ÍѸìindex2 on ·×»»µ¡ÍѸì using hash (ʬÎॳ¡¼¥É);
-QUERY: insert into ·×»»µ¡ÍѸì values('¥³¥ó¥Ô¥å¡¼¥¿¥Ç¥£¥¹¥×¥ì¥¤','µ¡A01¾å');
-QUERY: insert into ·×»»µ¡ÍѸì values('¥³¥ó¥Ô¥å¡¼¥¿¥°¥é¥Õ¥£¥Ã¥¯¥¹','ʬB10Ãæ');
-QUERY: insert into ·×»»µ¡ÍѸì values('¥³¥ó¥Ô¥å¡¼¥¿¥×¥í¥°¥é¥Þ¡¼','¿ÍZ01²¼');
-QUERY: vacuum ·×»»µ¡ÍѸì;
-QUERY: select * from ·×»»µ¡ÍѸì;
-ÍÑ¸ì                      |ʬÎॳ¡¼¥É|È÷¹Í1a¤À¤è
---------------------------+----------+----------
-¥³¥ó¥Ô¥å¡¼¥¿¥Ç¥£¥¹¥×¥ì¥¤  |µ¡A01¾å   |          
-¥³¥ó¥Ô¥å¡¼¥¿¥°¥é¥Õ¥£¥Ã¥¯¥¹|ʬB10Ãæ   |          
-¥³¥ó¥Ô¥å¡¼¥¿¥×¥í¥°¥é¥Þ¡¼  |¿ÍZ01²¼   |          
+create table ·×»»µ¡ÍѸì (ÍѸì text, ʬÎॳ¡¼¥É varchar, È÷¹Í1A¤À¤è char(16));
+create index ·×»»µ¡ÍѸìindex1 on ·×»»µ¡ÍѸì using btree (ÍѸì);
+create index ·×»»µ¡ÍѸìindex2 on ·×»»µ¡ÍѸì using hash (ʬÎॳ¡¼¥É);
+insert into ·×»»µ¡ÍѸì values('¥³¥ó¥Ô¥å¡¼¥¿¥Ç¥£¥¹¥×¥ì¥¤','µ¡A01¾å');
+insert into ·×»»µ¡ÍѸì values('¥³¥ó¥Ô¥å¡¼¥¿¥°¥é¥Õ¥£¥Ã¥¯¥¹','ʬB10Ãæ');
+insert into ·×»»µ¡ÍѸì values('¥³¥ó¥Ô¥å¡¼¥¿¥×¥í¥°¥é¥Þ¡¼','¿ÍZ01²¼');
+vacuum ·×»»µ¡ÍѸì;
+select * from ·×»»µ¡ÍѸì;
+            ÍÑ¸ì            | ʬÎॳ¡¼¥É | È÷¹Í1a¤À¤è 
+----------------------------+------------+------------
+ ¥³¥ó¥Ô¥å¡¼¥¿¥Ç¥£¥¹¥×¥ì¥¤   | µ¡A01¾å    | 
+ ¥³¥ó¥Ô¥å¡¼¥¿¥°¥é¥Õ¥£¥Ã¥¯¥¹ | ʬB10Ãæ    | 
+ ¥³¥ó¥Ô¥å¡¼¥¿¥×¥í¥°¥é¥Þ¡¼   | ¿ÍZ01²¼    | 
 (3 rows)
 
-QUERY: select * from ·×»»µ¡ÍѸì where ʬÎॳ¡¼¥É = '¿ÍZ01²¼';
-ÍÑ¸ì                    |ʬÎॳ¡¼¥É|È÷¹Í1a¤À¤è
-------------------------+----------+----------
-¥³¥ó¥Ô¥å¡¼¥¿¥×¥í¥°¥é¥Þ¡¼|¿ÍZ01²¼   |          
+select * from ·×»»µ¡ÍѸì where ʬÎॳ¡¼¥É = '¿ÍZ01²¼';
+           ÍÑ¸ì           | ʬÎॳ¡¼¥É | È÷¹Í1a¤À¤è 
+--------------------------+------------+------------
+ ¥³¥ó¥Ô¥å¡¼¥¿¥×¥í¥°¥é¥Þ¡¼ | ¿ÍZ01²¼    | 
 (1 row)
 
-QUERY: select * from ·×»»µ¡ÍѸì where ʬÎॳ¡¼¥É ~* '¿Íz01²¼';
-ÍÑ¸ì                    |ʬÎॳ¡¼¥É|È÷¹Í1a¤À¤è
-------------------------+----------+----------
-¥³¥ó¥Ô¥å¡¼¥¿¥×¥í¥°¥é¥Þ¡¼|¿ÍZ01²¼   |          
+select * from ·×»»µ¡ÍѸì where ʬÎॳ¡¼¥É ~* '¿Íz01²¼';
+           ÍÑ¸ì           | ʬÎॳ¡¼¥É | È÷¹Í1a¤À¤è 
+--------------------------+------------+------------
+ ¥³¥ó¥Ô¥å¡¼¥¿¥×¥í¥°¥é¥Þ¡¼ | ¿ÍZ01²¼    | 
 (1 row)
 
-QUERY: select * from ·×»»µ¡ÍѸì where ʬÎॳ¡¼¥É like '_Z01_';
-ÍÑ¸ì                    |ʬÎॳ¡¼¥É|È÷¹Í1a¤À¤è
-------------------------+----------+----------
-¥³¥ó¥Ô¥å¡¼¥¿¥×¥í¥°¥é¥Þ¡¼|¿ÍZ01²¼   |          
+select * from ·×»»µ¡ÍѸì where ʬÎॳ¡¼¥É like '_Z01_';
+           ÍÑ¸ì           | ʬÎॳ¡¼¥É | È÷¹Í1a¤À¤è 
+--------------------------+------------+------------
+ ¥³¥ó¥Ô¥å¡¼¥¿¥×¥í¥°¥é¥Þ¡¼ | ¿ÍZ01²¼    | 
 (1 row)
 
-QUERY: select * from ·×»»µ¡ÍѸì where ʬÎॳ¡¼¥É like '_Z%';
-ÍÑ¸ì                    |ʬÎॳ¡¼¥É|È÷¹Í1a¤À¤è
-------------------------+----------+----------
-¥³¥ó¥Ô¥å¡¼¥¿¥×¥í¥°¥é¥Þ¡¼|¿ÍZ01²¼   |          
+select * from ·×»»µ¡ÍѸì where ʬÎॳ¡¼¥É like '_Z%';
+           ÍÑ¸ì           | ʬÎॳ¡¼¥É | È÷¹Í1a¤À¤è 
+--------------------------+------------+------------
+ ¥³¥ó¥Ô¥å¡¼¥¿¥×¥í¥°¥é¥Þ¡¼ | ¿ÍZ01²¼    | 
 (1 row)
 
-QUERY: select * from ·×»»µ¡ÍѸì where ÍѸì ~ '¥³¥ó¥Ô¥å¡¼¥¿[¥Ç¥°]';
-ÍÑ¸ì                      |ʬÎॳ¡¼¥É|È÷¹Í1a¤À¤è
---------------------------+----------+----------
-¥³¥ó¥Ô¥å¡¼¥¿¥Ç¥£¥¹¥×¥ì¥¤  |µ¡A01¾å   |          
-¥³¥ó¥Ô¥å¡¼¥¿¥°¥é¥Õ¥£¥Ã¥¯¥¹|ʬB10Ãæ   |          
+select * from ·×»»µ¡ÍѸì where ÍѸì ~ '¥³¥ó¥Ô¥å¡¼¥¿[¥Ç¥°]';
+            ÍÑ¸ì            | ʬÎॳ¡¼¥É | È÷¹Í1a¤À¤è 
+----------------------------+------------+------------
+ ¥³¥ó¥Ô¥å¡¼¥¿¥Ç¥£¥¹¥×¥ì¥¤   | µ¡A01¾å    | 
+ ¥³¥ó¥Ô¥å¡¼¥¿¥°¥é¥Õ¥£¥Ã¥¯¥¹ | ʬB10Ãæ    | 
 (2 rows)
 
-QUERY: select * from ·×»»µ¡ÍѸì where ÍѸì ~* '¥³¥ó¥Ô¥å¡¼¥¿[¥Ç¥°]';
-ÍÑ¸ì                      |ʬÎॳ¡¼¥É|È÷¹Í1a¤À¤è
---------------------------+----------+----------
-¥³¥ó¥Ô¥å¡¼¥¿¥Ç¥£¥¹¥×¥ì¥¤  |µ¡A01¾å   |          
-¥³¥ó¥Ô¥å¡¼¥¿¥°¥é¥Õ¥£¥Ã¥¯¥¹|ʬB10Ãæ   |          
+select * from ·×»»µ¡ÍѸì where ÍѸì ~* '¥³¥ó¥Ô¥å¡¼¥¿[¥Ç¥°]';
+            ÍÑ¸ì            | ʬÎॳ¡¼¥É | È÷¹Í1a¤À¤è 
+----------------------------+------------+------------
+ ¥³¥ó¥Ô¥å¡¼¥¿¥Ç¥£¥¹¥×¥ì¥¤   | µ¡A01¾å    | 
+ ¥³¥ó¥Ô¥å¡¼¥¿¥°¥é¥Õ¥£¥Ã¥¯¥¹ | ʬB10Ãæ    | 
 (2 rows)
 
-QUERY: select *,character_length(ÍѸì) from ·×»»µ¡ÍѸì;
-ÍÑ¸ì                      |ʬÎॳ¡¼¥É|È÷¹Í1a¤À¤è|length
---------------------------+----------+----------+------
-¥³¥ó¥Ô¥å¡¼¥¿¥Ç¥£¥¹¥×¥ì¥¤  |µ¡A01¾å   |          |    12
-¥³¥ó¥Ô¥å¡¼¥¿¥°¥é¥Õ¥£¥Ã¥¯¥¹|ʬB10Ãæ   |          |    13
-¥³¥ó¥Ô¥å¡¼¥¿¥×¥í¥°¥é¥Þ¡¼  |¿ÍZ01²¼   |          |    12
+select *,character_length(ÍѸì) from ·×»»µ¡ÍѸì;
+            ÍÑ¸ì            | ʬÎॳ¡¼¥É | È÷¹Í1a¤À¤è | length 
+----------------------------+------------+------------+--------
+ ¥³¥ó¥Ô¥å¡¼¥¿¥Ç¥£¥¹¥×¥ì¥¤   | µ¡A01¾å    |            |     12
+ ¥³¥ó¥Ô¥å¡¼¥¿¥°¥é¥Õ¥£¥Ã¥¯¥¹ | ʬB10Ãæ    |            |     13
+ ¥³¥ó¥Ô¥å¡¼¥¿¥×¥í¥°¥é¥Þ¡¼   | ¿ÍZ01²¼    |            |     12
 (3 rows)
 
-QUERY: select *,octet_length(ÍѸì) from ·×»»µ¡ÍѸì;
-ÍÑ¸ì                      |ʬÎॳ¡¼¥É|È÷¹Í1a¤À¤è|octet_length
---------------------------+----------+----------+------------
-¥³¥ó¥Ô¥å¡¼¥¿¥Ç¥£¥¹¥×¥ì¥¤  |µ¡A01¾å   |          |          24
-¥³¥ó¥Ô¥å¡¼¥¿¥°¥é¥Õ¥£¥Ã¥¯¥¹|ʬB10Ãæ   |          |          26
-¥³¥ó¥Ô¥å¡¼¥¿¥×¥í¥°¥é¥Þ¡¼  |¿ÍZ01²¼   |          |          24
+select *,octet_length(ÍѸì) from ·×»»µ¡ÍѸì;
+            ÍÑ¸ì            | ʬÎॳ¡¼¥É | È÷¹Í1a¤À¤è | octet_length 
+----------------------------+------------+------------+--------------
+ ¥³¥ó¥Ô¥å¡¼¥¿¥Ç¥£¥¹¥×¥ì¥¤   | µ¡A01¾å    |            |           24
+ ¥³¥ó¥Ô¥å¡¼¥¿¥°¥é¥Õ¥£¥Ã¥¯¥¹ | ʬB10Ãæ    |            |           26
+ ¥³¥ó¥Ô¥å¡¼¥¿¥×¥í¥°¥é¥Þ¡¼   | ¿ÍZ01²¼    |            |           24
 (3 rows)
 
-QUERY: select *,position('¥Ç' in ÍѸì) from ·×»»µ¡ÍѸì;
-ÍÑ¸ì                      |ʬÎॳ¡¼¥É|È÷¹Í1a¤À¤è|strpos
---------------------------+----------+----------+------
-¥³¥ó¥Ô¥å¡¼¥¿¥Ç¥£¥¹¥×¥ì¥¤  |µ¡A01¾å   |          |     7
-¥³¥ó¥Ô¥å¡¼¥¿¥°¥é¥Õ¥£¥Ã¥¯¥¹|ʬB10Ãæ   |          |     0
-¥³¥ó¥Ô¥å¡¼¥¿¥×¥í¥°¥é¥Þ¡¼  |¿ÍZ01²¼   |          |     0
+select *,position('¥Ç' in ÍѸì) from ·×»»µ¡ÍѸì;
+            ÍÑ¸ì            | ʬÎॳ¡¼¥É | È÷¹Í1a¤À¤è | strpos 
+----------------------------+------------+------------+--------
+ ¥³¥ó¥Ô¥å¡¼¥¿¥Ç¥£¥¹¥×¥ì¥¤   | µ¡A01¾å    |            |      7
+ ¥³¥ó¥Ô¥å¡¼¥¿¥°¥é¥Õ¥£¥Ã¥¯¥¹ | ʬB10Ãæ    |            |      0
+ ¥³¥ó¥Ô¥å¡¼¥¿¥×¥í¥°¥é¥Þ¡¼   | ¿ÍZ01²¼    |            |      0
 (3 rows)
 
-QUERY: select *,substring(ÍѸì from 10 for 4) from ·×»»µ¡ÍѸì;
-ÍÑ¸ì                      |ʬÎॳ¡¼¥É|È÷¹Í1a¤À¤è|substr  
---------------------------+----------+----------+--------
-¥³¥ó¥Ô¥å¡¼¥¿¥Ç¥£¥¹¥×¥ì¥¤  |µ¡A01¾å   |          |¥×¥ì¥¤  
-¥³¥ó¥Ô¥å¡¼¥¿¥°¥é¥Õ¥£¥Ã¥¯¥¹|ʬB10Ãæ   |          |¥£¥Ã¥¯¥¹
-¥³¥ó¥Ô¥å¡¼¥¿¥×¥í¥°¥é¥Þ¡¼  |¿ÍZ01²¼   |          |¥é¥Þ¡¼  
+select *,substring(ÍѸì from 10 for 4) from ·×»»µ¡ÍѸì;
+            ÍÑ¸ì            | ʬÎॳ¡¼¥É | È÷¹Í1a¤À¤è |  substr  
+----------------------------+------------+------------+----------
+ ¥³¥ó¥Ô¥å¡¼¥¿¥Ç¥£¥¹¥×¥ì¥¤   | µ¡A01¾å    |            | ¥×¥ì¥¤
+ ¥³¥ó¥Ô¥å¡¼¥¿¥°¥é¥Õ¥£¥Ã¥¯¥¹ | ʬB10Ãæ    |            | ¥£¥Ã¥¯¥¹
+ ¥³¥ó¥Ô¥å¡¼¥¿¥×¥í¥°¥é¥Þ¡¼   | ¿ÍZ01²¼    |            | ¥é¥Þ¡¼
 (3 rows)