Fixes for char_length() change.

diff --git a/src/test/regress/expected/euc_cn.out b/src/test/regress/expected/euc_cn.out
index 37790f83b854321edaf00a9f79eb4cc0e78e34fc..7fdb13cfe5d1ff53a913618f4604b739dd5e675f 100644 (file)
--- a/src/test/regress/expected/euc_cn.out
+++ b/src/test/regress/expected/euc_cn.out
@@ -54,11 +54,11 @@ select * from 
 (2 rows)
 
 select *,character_length(ÊõÓï) from ¼ÆËã»úÊõÓï;
-    ÊõÓï    | ·ÖÀàºÅ  | ±¸×¢1a | length 
-------------+---------+--------+--------
- µçÄÔÏÔʾÆÁ | »úA01ÉÏ |        |      5
- µçÄÔͼÐÎ   | ·ÖB01ÖÐ |        |      4
- µçÄÔ³ÌÐòÔ± | ÈËZ01Ï |        |      5
+    ÊõÓï    | ·ÖÀàºÅ  | ±¸×¢1a | char_length 
+------------+---------+--------+-------------
+ µçÄÔÏÔʾÆÁ | »úA01ÉÏ |        |           5
+ µçÄÔͼÐÎ   | ·ÖB01ÖÐ |        |           4
+ µçÄÔ³ÌÐòÔ± | ÈËZ01Ï |        |           5
 (3 rows)
 
 select *,octet_length(ÊõÓï) from ¼ÆËã»úÊõÓï;

diff --git a/src/test/regress/expected/euc_kr.out b/src/test/regress/expected/euc_kr.out
index 4c91395ab1f041017abf363a63b66669e775d2ca..368525b220f7ac59c081ff1b6bc4bd5b3c72e6d8 100644 (file)
--- a/src/test/regress/expected/euc_kr.out
+++ b/src/test/regress/expected/euc_kr.out
@@ -54,11 +54,11 @@ select * from ͪߩѦ
 (2 rows)
 
 select *,character_length(¿ë¾î) from ͪߩѦ¿ë¾î;
-       ¿ë¾î       | ÝÂ×¾ÄÚµå | ºñ°í1a¶ó±¸ | length 
-------------------+----------+------------+--------
- ÄÄÇ»Å͵ð½ºÇ÷¹ÀÌ | ѦA01ß¾  |            |      8
- ÄÄÇ»Åͱ׷¡ÇȽº   | ÝÂB10ñé  |            |      7
- ÄÄÇ»ÅÍÇÁ·Î±×·¡¸Ó | ìÑZ01ù»  |            |      8
+       ¿ë¾î       | ÝÂ×¾ÄÚµå | ºñ°í1a¶ó±¸ | char_length 
+------------------+----------+------------+-------------
+ ÄÄÇ»Å͵ð½ºÇ÷¹ÀÌ | ѦA01ß¾  |            |           8
+ ÄÄÇ»Åͱ׷¡ÇȽº   | ÝÂB10ñé  |            |           7
+ ÄÄÇ»ÅÍÇÁ·Î±×·¡¸Ó | ìÑZ01ù»  |            |           8
 (3 rows)
 
 select *,octet_length(¿ë¾î) from ͪߩѦ¿ë¾î;

diff --git a/src/test/regress/expected/euc_tw.out b/src/test/regress/expected/euc_tw.out
index c35ee9509d7b0c31f124dbe1c6c0104282dce711..cf855809ab708bda28cf38c430ea2f657ecd6791 100644 (file)
--- a/src/test/regress/expected/euc_tw.out
+++ b/src/test/regress/expected/euc_tw.out
@@ -52,11 +52,11 @@ select * from 
 (1 row)
 
 select *, character_length(ÈçäÆɱ) from ìÞÙ¸æñÕè;
- ÈçäÆɱ |     ÄüƳÍñó¤     |  ÇâÉß   | length 
---------+------------------+---------+--------
- çÙæªäÆ | ç®ç®ÒïÊÀ         | Æ¡A01Äî |      3
- êûÝßäÆ | ØÂäãÈ´ÓîÄüƳ     | ÄãB10Äã |      3
- ó§ã£äÆ | Ó¡ÌÀϴǹȴÓîÄüƳ | ØíZ01Ħ |      3
+ ÈçäÆɱ |     ÄüƳÍñó¤     |  ÇâÉß   | char_length 
+--------+------------------+---------+-------------
+ çÙæªäÆ | ç®ç®ÒïÊÀ         | Æ¡A01Äî |           3
+ êûÝßäÆ | ØÂäãÈ´ÓîÄüƳ     | ÄãB10Äã |           3
+ ó§ã£äÆ | Ó¡ÌÀϴǹȴÓîÄüƳ | ØíZ01Ħ |           3
 (3 rows)
 
 select *, octet_length(ÈçäÆɱ) from ìÞÙ¸æñÕè;

diff --git a/src/test/regress/expected/mule_internal.out b/src/test/regress/expected/mule_internal.out
index 09f5489ee5fa01f04abc60fc2e305cbcfba6feac..bfcffc8490a7879d341831aa11ed4431375880d4 100644 (file)
--- a/src/test/regress/expected/mule_internal.out
+++ b/src/test/regress/expected/mule_internal.out
@@ -1,333 +1,333 @@
-QUERY: drop table \92·×\92»»\92µ¡\92ÍÑ\92¸ì;
+drop table \92·×\92»»\92µ¡\92ÍÑ\92¸ì;
 ERROR:  Relation '\92·×\92»»\92µ¡\92ÍÑ\92¸ì' does not exist
-QUERY: create table \92·×\92»»\92µ¡\92ÍÑ\92¸ì (\92ÍÑ\92¸ì text, \92ʬ\92Îà\92¥³\92¡¼\92¥É varchar, \92È÷\92¹Í1A\92¤À\92¤è char(16));
-QUERY: create index \92·×\92»»\92µ¡\92ÍÑ\92¸ìindex1 on \92·×\92»»\92µ¡\92ÍÑ\92¸ì using btree (\92ÍÑ\92¸ì);
-QUERY: create index \92·×\92»»\92µ¡\92ÍÑ\92¸ìindex2 on \92·×\92»»\92µ¡\92ÍÑ\92¸ì using hash (\92ʬ\92Îà\92¥³\92¡¼\92¥É);
-QUERY: insert into \92·×\92»»\92µ¡\92ÍÑ\92¸ì values('\92¥³\92¥ó\92¥Ô\92¥å\92¡¼\92¥¿\92¥Ç\92¥£\92¥¹\92¥×\92¥ì\92¥¤','\92µ¡A01\92¾å');
-QUERY: insert into \92·×\92»»\92µ¡\92ÍÑ\92¸ì values('\92¥³\92¥ó\92¥Ô\92¥å\92¡¼\92¥¿\92¥°\92¥é\92¥Õ\92¥£\92¥Ã\92¥¯\92¥¹','\92ʬB10\92Ãæ');
-QUERY: insert into \92·×\92»»\92µ¡\92ÍÑ\92¸ì values('\92¥³\92¥ó\92¥Ô\92¥å\92¡¼\92¥¿\92¥×\92¥í\92¥°\92¥é\92¥Þ\92¡¼','\92¿ÍZ01\92²¼');
-QUERY: vacuum \92·×\92»»\92µ¡\92ÍÑ\92¸ì;
-QUERY: select * from \92·×\92»»\92µ¡\92ÍÑ\92¸ì;
-\92ÍÑ\92¸ì                                 |\92ʬ\92Îà\92¥³\92¡¼\92¥É|\92È÷\92¹Í1a\92¤À\92¤è
----------------------------------------+---------------+--------------
-\92¥³\92¥ó\92¥Ô\92¥å\92¡¼\92¥¿\92¥Ç\92¥£\92¥¹\92¥×\92¥ì\92¥¤   |\92µ¡A01\92¾å      |              
-\92¥³\92¥ó\92¥Ô\92¥å\92¡¼\92¥¿\92¥°\92¥é\92¥Õ\92¥£\92¥Ã\92¥¯\92¥¹|\92ʬB10\92Ãæ      |              
-\92¥³\92¥ó\92¥Ô\92¥å\92¡¼\92¥¿\92¥×\92¥í\92¥°\92¥é\92¥Þ\92¡¼   |\92¿ÍZ01\92²¼      |              
+create table \92·×\92»»\92µ¡\92ÍÑ\92¸ì (\92ÍÑ\92¸ì text, \92ʬ\92Îà\92¥³\92¡¼\92¥É varchar, \92È÷\92¹Í1A\92¤À\92¤è char(16));
+create index \92·×\92»»\92µ¡\92ÍÑ\92¸ìindex1 on \92·×\92»»\92µ¡\92ÍÑ\92¸ì using btree (\92ÍÑ\92¸ì);
+create index \92·×\92»»\92µ¡\92ÍÑ\92¸ìindex2 on \92·×\92»»\92µ¡\92ÍÑ\92¸ì using hash (\92ʬ\92Îà\92¥³\92¡¼\92¥É);
+insert into \92·×\92»»\92µ¡\92ÍÑ\92¸ì values('\92¥³\92¥ó\92¥Ô\92¥å\92¡¼\92¥¿\92¥Ç\92¥£\92¥¹\92¥×\92¥ì\92¥¤','\92µ¡A01\92¾å');
+insert into \92·×\92»»\92µ¡\92ÍÑ\92¸ì values('\92¥³\92¥ó\92¥Ô\92¥å\92¡¼\92¥¿\92¥°\92¥é\92¥Õ\92¥£\92¥Ã\92¥¯\92¥¹','\92ʬB10\92Ãæ');
+insert into \92·×\92»»\92µ¡\92ÍÑ\92¸ì values('\92¥³\92¥ó\92¥Ô\92¥å\92¡¼\92¥¿\92¥×\92¥í\92¥°\92¥é\92¥Þ\92¡¼','\92¿ÍZ01\92²¼');
+vacuum \92·×\92»»\92µ¡\92ÍÑ\92¸ì;
+select * from \92·×\92»»\92µ¡\92ÍÑ\92¸ì;
+                 \92ÍÑ\92¸ì                  | \92ʬ\92Îà\92¥³\92¡¼\92¥É | \92È÷\92¹Í1a\92¤À\92¤è 
+-----------------------------------------+-----------------+----------------
+ \92¥³\92¥ó\92¥Ô\92¥å\92¡¼\92¥¿\92¥Ç\92¥£\92¥¹\92¥×\92¥ì\92¥¤    | \92µ¡A01\92¾å       | 
+ \92¥³\92¥ó\92¥Ô\92¥å\92¡¼\92¥¿\92¥°\92¥é\92¥Õ\92¥£\92¥Ã\92¥¯\92¥¹ | \92ʬB10\92Ãæ       | 
+ \92¥³\92¥ó\92¥Ô\92¥å\92¡¼\92¥¿\92¥×\92¥í\92¥°\92¥é\92¥Þ\92¡¼    | \92¿ÍZ01\92²¼       | 
 (3 rows)
 
-QUERY: select * from \92·×\92»»\92µ¡\92ÍÑ\92¸ì where \92ʬ\92Îà\92¥³\92¡¼\92¥É = '\92¿ÍZ01\92²¼';
-\92ÍÑ\92¸ì                              |\92ʬ\92Îà\92¥³\92¡¼\92¥É|\92È÷\92¹Í1a\92¤À\92¤è
-------------------------------------+---------------+--------------
-\92¥³\92¥ó\92¥Ô\92¥å\92¡¼\92¥¿\92¥×\92¥í\92¥°\92¥é\92¥Þ\92¡¼|\92¿ÍZ01\92²¼      |              
+select * from \92·×\92»»\92µ¡\92ÍÑ\92¸ì where \92ʬ\92Îà\92¥³\92¡¼\92¥É = '\92¿ÍZ01\92²¼';
+                \92ÍÑ\92¸ì                | \92ʬ\92Îà\92¥³\92¡¼\92¥É | \92È÷\92¹Í1a\92¤À\92¤è 
+--------------------------------------+-----------------+----------------
+ \92¥³\92¥ó\92¥Ô\92¥å\92¡¼\92¥¿\92¥×\92¥í\92¥°\92¥é\92¥Þ\92¡¼ | \92¿ÍZ01\92²¼       | 
 (1 row)
 
-QUERY: select * from \92·×\92»»\92µ¡\92ÍÑ\92¸ì where \92ʬ\92Îà\92¥³\92¡¼\92¥É ~* '\92¿Íz01\92²¼';
-\92ÍÑ\92¸ì                              |\92ʬ\92Îà\92¥³\92¡¼\92¥É|\92È÷\92¹Í1a\92¤À\92¤è
-------------------------------------+---------------+--------------
-\92¥³\92¥ó\92¥Ô\92¥å\92¡¼\92¥¿\92¥×\92¥í\92¥°\92¥é\92¥Þ\92¡¼|\92¿ÍZ01\92²¼      |              
+select * from \92·×\92»»\92µ¡\92ÍÑ\92¸ì where \92ʬ\92Îà\92¥³\92¡¼\92¥É ~* '\92¿Íz01\92²¼';
+                \92ÍÑ\92¸ì                | \92ʬ\92Îà\92¥³\92¡¼\92¥É | \92È÷\92¹Í1a\92¤À\92¤è 
+--------------------------------------+-----------------+----------------
+ \92¥³\92¥ó\92¥Ô\92¥å\92¡¼\92¥¿\92¥×\92¥í\92¥°\92¥é\92¥Þ\92¡¼ | \92¿ÍZ01\92²¼       | 
 (1 row)
 
-QUERY: select * from \92·×\92»»\92µ¡\92ÍÑ\92¸ì where \92ʬ\92Îà\92¥³\92¡¼\92¥É like '_Z01_';
-\92ÍÑ\92¸ì                              |\92ʬ\92Îà\92¥³\92¡¼\92¥É|\92È÷\92¹Í1a\92¤À\92¤è
-------------------------------------+---------------+--------------
-\92¥³\92¥ó\92¥Ô\92¥å\92¡¼\92¥¿\92¥×\92¥í\92¥°\92¥é\92¥Þ\92¡¼|\92¿ÍZ01\92²¼      |              
+select * from \92·×\92»»\92µ¡\92ÍÑ\92¸ì where \92ʬ\92Îà\92¥³\92¡¼\92¥É like '_Z01_';
+                \92ÍÑ\92¸ì                | \92ʬ\92Îà\92¥³\92¡¼\92¥É | \92È÷\92¹Í1a\92¤À\92¤è 
+--------------------------------------+-----------------+----------------
+ \92¥³\92¥ó\92¥Ô\92¥å\92¡¼\92¥¿\92¥×\92¥í\92¥°\92¥é\92¥Þ\92¡¼ | \92¿ÍZ01\92²¼       | 
 (1 row)
 
-QUERY: select * from \92·×\92»»\92µ¡\92ÍÑ\92¸ì where \92ʬ\92Îà\92¥³\92¡¼\92¥É like '_Z%';
-\92ÍÑ\92¸ì                              |\92ʬ\92Îà\92¥³\92¡¼\92¥É|\92È÷\92¹Í1a\92¤À\92¤è
-------------------------------------+---------------+--------------
-\92¥³\92¥ó\92¥Ô\92¥å\92¡¼\92¥¿\92¥×\92¥í\92¥°\92¥é\92¥Þ\92¡¼|\92¿ÍZ01\92²¼      |              
+select * from \92·×\92»»\92µ¡\92ÍÑ\92¸ì where \92ʬ\92Îà\92¥³\92¡¼\92¥É like '_Z%';
+                \92ÍÑ\92¸ì                | \92ʬ\92Îà\92¥³\92¡¼\92¥É | \92È÷\92¹Í1a\92¤À\92¤è 
+--------------------------------------+-----------------+----------------
+ \92¥³\92¥ó\92¥Ô\92¥å\92¡¼\92¥¿\92¥×\92¥í\92¥°\92¥é\92¥Þ\92¡¼ | \92¿ÍZ01\92²¼       | 
 (1 row)
 
-QUERY: select * from \92·×\92»»\92µ¡\92ÍÑ\92¸ì where \92ÍÑ\92¸ì ~ '\92¥³\92¥ó\92¥Ô\92¥å\92¡¼\92¥¿[\92¥Ç\92¥°]';
-\92ÍÑ\92¸ì                                 |\92ʬ\92Îà\92¥³\92¡¼\92¥É|\92È÷\92¹Í1a\92¤À\92¤è
----------------------------------------+---------------+--------------
-\92¥³\92¥ó\92¥Ô\92¥å\92¡¼\92¥¿\92¥Ç\92¥£\92¥¹\92¥×\92¥ì\92¥¤   |\92µ¡A01\92¾å      |              
-\92¥³\92¥ó\92¥Ô\92¥å\92¡¼\92¥¿\92¥°\92¥é\92¥Õ\92¥£\92¥Ã\92¥¯\92¥¹|\92ʬB10\92Ãæ      |              
+select * from \92·×\92»»\92µ¡\92ÍÑ\92¸ì where \92ÍÑ\92¸ì ~ '\92¥³\92¥ó\92¥Ô\92¥å\92¡¼\92¥¿[\92¥Ç\92¥°]';
+                 \92ÍÑ\92¸ì                  | \92ʬ\92Îà\92¥³\92¡¼\92¥É | \92È÷\92¹Í1a\92¤À\92¤è 
+-----------------------------------------+-----------------+----------------
+ \92¥³\92¥ó\92¥Ô\92¥å\92¡¼\92¥¿\92¥Ç\92¥£\92¥¹\92¥×\92¥ì\92¥¤    | \92µ¡A01\92¾å       | 
+ \92¥³\92¥ó\92¥Ô\92¥å\92¡¼\92¥¿\92¥°\92¥é\92¥Õ\92¥£\92¥Ã\92¥¯\92¥¹ | \92ʬB10\92Ãæ       | 
 (2 rows)
 
-QUERY: select * from \92·×\92»»\92µ¡\92ÍÑ\92¸ì where \92ÍÑ\92¸ì ~* '\92¥³\92¥ó\92¥Ô\92¥å\92¡¼\92¥¿[\92¥Ç\92¥°]';
-\92ÍÑ\92¸ì                                 |\92ʬ\92Îà\92¥³\92¡¼\92¥É|\92È÷\92¹Í1a\92¤À\92¤è
----------------------------------------+---------------+--------------
-\92¥³\92¥ó\92¥Ô\92¥å\92¡¼\92¥¿\92¥Ç\92¥£\92¥¹\92¥×\92¥ì\92¥¤   |\92µ¡A01\92¾å      |              
-\92¥³\92¥ó\92¥Ô\92¥å\92¡¼\92¥¿\92¥°\92¥é\92¥Õ\92¥£\92¥Ã\92¥¯\92¥¹|\92ʬB10\92Ãæ      |              
+select * from \92·×\92»»\92µ¡\92ÍÑ\92¸ì where \92ÍÑ\92¸ì ~* '\92¥³\92¥ó\92¥Ô\92¥å\92¡¼\92¥¿[\92¥Ç\92¥°]';
+                 \92ÍÑ\92¸ì                  | \92ʬ\92Îà\92¥³\92¡¼\92¥É | \92È÷\92¹Í1a\92¤À\92¤è 
+-----------------------------------------+-----------------+----------------
+ \92¥³\92¥ó\92¥Ô\92¥å\92¡¼\92¥¿\92¥Ç\92¥£\92¥¹\92¥×\92¥ì\92¥¤    | \92µ¡A01\92¾å       | 
+ \92¥³\92¥ó\92¥Ô\92¥å\92¡¼\92¥¿\92¥°\92¥é\92¥Õ\92¥£\92¥Ã\92¥¯\92¥¹ | \92ʬB10\92Ãæ       | 
 (2 rows)
 
-QUERY: select *,character_length(\92ÍÑ\92¸ì) from \92·×\92»»\92µ¡\92ÍÑ\92¸ì;
-\92ÍÑ\92¸ì                                 |\92ʬ\92Îà\92¥³\92¡¼\92¥É|\92È÷\92¹Í1a\92¤À\92¤è|length
----------------------------------------+---------------+--------------+------
-\92¥³\92¥ó\92¥Ô\92¥å\92¡¼\92¥¿\92¥Ç\92¥£\92¥¹\92¥×\92¥ì\92¥¤   |\92µ¡A01\92¾å      |              |    12
-\92¥³\92¥ó\92¥Ô\92¥å\92¡¼\92¥¿\92¥°\92¥é\92¥Õ\92¥£\92¥Ã\92¥¯\92¥¹|\92ʬB10\92Ãæ      |              |    13
-\92¥³\92¥ó\92¥Ô\92¥å\92¡¼\92¥¿\92¥×\92¥í\92¥°\92¥é\92¥Þ\92¡¼   |\92¿ÍZ01\92²¼      |              |    12
+select *,character_length(\92ÍÑ\92¸ì) from \92·×\92»»\92µ¡\92ÍÑ\92¸ì;
+                 \92ÍÑ\92¸ì                  | \92ʬ\92Îà\92¥³\92¡¼\92¥É | \92È÷\92¹Í1a\92¤À\92¤è | char_length 
+-----------------------------------------+-----------------+----------------+-------------
+ \92¥³\92¥ó\92¥Ô\92¥å\92¡¼\92¥¿\92¥Ç\92¥£\92¥¹\92¥×\92¥ì\92¥¤    | \92µ¡A01\92¾å       |                |          12
+ \92¥³\92¥ó\92¥Ô\92¥å\92¡¼\92¥¿\92¥°\92¥é\92¥Õ\92¥£\92¥Ã\92¥¯\92¥¹ | \92ʬB10\92Ãæ       |                |          13
+ \92¥³\92¥ó\92¥Ô\92¥å\92¡¼\92¥¿\92¥×\92¥í\92¥°\92¥é\92¥Þ\92¡¼    | \92¿ÍZ01\92²¼       |                |          12
 (3 rows)
 
-QUERY: select *,octet_length(\92ÍÑ\92¸ì) from \92·×\92»»\92µ¡\92ÍÑ\92¸ì;
-\92ÍÑ\92¸ì                                 |\92ʬ\92Îà\92¥³\92¡¼\92¥É|\92È÷\92¹Í1a\92¤À\92¤è|octet_length
----------------------------------------+---------------+--------------+------------
-\92¥³\92¥ó\92¥Ô\92¥å\92¡¼\92¥¿\92¥Ç\92¥£\92¥¹\92¥×\92¥ì\92¥¤   |\92µ¡A01\92¾å      |              |          36
-\92¥³\92¥ó\92¥Ô\92¥å\92¡¼\92¥¿\92¥°\92¥é\92¥Õ\92¥£\92¥Ã\92¥¯\92¥¹|\92ʬB10\92Ãæ      |              |          39
-\92¥³\92¥ó\92¥Ô\92¥å\92¡¼\92¥¿\92¥×\92¥í\92¥°\92¥é\92¥Þ\92¡¼   |\92¿ÍZ01\92²¼      |              |          36
+select *,octet_length(\92ÍÑ\92¸ì) from \92·×\92»»\92µ¡\92ÍÑ\92¸ì;
+                 \92ÍÑ\92¸ì                  | \92ʬ\92Îà\92¥³\92¡¼\92¥É | \92È÷\92¹Í1a\92¤À\92¤è | octet_length 
+-----------------------------------------+-----------------+----------------+--------------
+ \92¥³\92¥ó\92¥Ô\92¥å\92¡¼\92¥¿\92¥Ç\92¥£\92¥¹\92¥×\92¥ì\92¥¤    | \92µ¡A01\92¾å       |                |           36
+ \92¥³\92¥ó\92¥Ô\92¥å\92¡¼\92¥¿\92¥°\92¥é\92¥Õ\92¥£\92¥Ã\92¥¯\92¥¹ | \92ʬB10\92Ãæ       |                |           39
+ \92¥³\92¥ó\92¥Ô\92¥å\92¡¼\92¥¿\92¥×\92¥í\92¥°\92¥é\92¥Þ\92¡¼    | \92¿ÍZ01\92²¼       |                |           36
 (3 rows)
 
-QUERY: select *,position('\92¥Ç' in \92ÍÑ\92¸ì) from \92·×\92»»\92µ¡\92ÍÑ\92¸ì;
-\92ÍÑ\92¸ì                                 |\92ʬ\92Îà\92¥³\92¡¼\92¥É|\92È÷\92¹Í1a\92¤À\92¤è|strpos
----------------------------------------+---------------+--------------+------
-\92¥³\92¥ó\92¥Ô\92¥å\92¡¼\92¥¿\92¥Ç\92¥£\92¥¹\92¥×\92¥ì\92¥¤   |\92µ¡A01\92¾å      |              |     7
-\92¥³\92¥ó\92¥Ô\92¥å\92¡¼\92¥¿\92¥°\92¥é\92¥Õ\92¥£\92¥Ã\92¥¯\92¥¹|\92ʬB10\92Ãæ      |              |     0
-\92¥³\92¥ó\92¥Ô\92¥å\92¡¼\92¥¿\92¥×\92¥í\92¥°\92¥é\92¥Þ\92¡¼   |\92¿ÍZ01\92²¼      |              |     0
+select *,position('\92¥Ç' in \92ÍÑ\92¸ì) from \92·×\92»»\92µ¡\92ÍÑ\92¸ì;
+                 \92ÍÑ\92¸ì                  | \92ʬ\92Îà\92¥³\92¡¼\92¥É | \92È÷\92¹Í1a\92¤À\92¤è | strpos 
+-----------------------------------------+-----------------+----------------+--------
+ \92¥³\92¥ó\92¥Ô\92¥å\92¡¼\92¥¿\92¥Ç\92¥£\92¥¹\92¥×\92¥ì\92¥¤    | \92µ¡A01\92¾å       |                |      7
+ \92¥³\92¥ó\92¥Ô\92¥å\92¡¼\92¥¿\92¥°\92¥é\92¥Õ\92¥£\92¥Ã\92¥¯\92¥¹ | \92ʬB10\92Ãæ       |                |      0
+ \92¥³\92¥ó\92¥Ô\92¥å\92¡¼\92¥¿\92¥×\92¥í\92¥°\92¥é\92¥Þ\92¡¼    | \92¿ÍZ01\92²¼       |                |      0
 (3 rows)
 
-QUERY: select *,substring(\92ÍÑ\92¸ì from 10 for 4) from \92·×\92»»\92µ¡\92ÍÑ\92¸ì;
-\92ÍÑ\92¸ì                                 |\92ʬ\92Îà\92¥³\92¡¼\92¥É|\92È÷\92¹Í1a\92¤À\92¤è|substr      
----------------------------------------+---------------+--------------+------------
-\92¥³\92¥ó\92¥Ô\92¥å\92¡¼\92¥¿\92¥Ç\92¥£\92¥¹\92¥×\92¥ì\92¥¤   |\92µ¡A01\92¾å      |              |\92¥×\92¥ì\92¥¤   
-\92¥³\92¥ó\92¥Ô\92¥å\92¡¼\92¥¿\92¥°\92¥é\92¥Õ\92¥£\92¥Ã\92¥¯\92¥¹|\92ʬB10\92Ãæ      |              |\92¥£\92¥Ã\92¥¯\92¥¹
-\92¥³\92¥ó\92¥Ô\92¥å\92¡¼\92¥¿\92¥×\92¥í\92¥°\92¥é\92¥Þ\92¡¼   |\92¿ÍZ01\92²¼      |              |\92¥é\92¥Þ\92¡¼   
+select *,substring(\92ÍÑ\92¸ì from 10 for 4) from \92·×\92»»\92µ¡\92ÍÑ\92¸ì;
+                 \92ÍÑ\92¸ì                  | \92ʬ\92Îà\92¥³\92¡¼\92¥É | \92È÷\92¹Í1a\92¤À\92¤è |    substr    
+-----------------------------------------+-----------------+----------------+--------------
+ \92¥³\92¥ó\92¥Ô\92¥å\92¡¼\92¥¿\92¥Ç\92¥£\92¥¹\92¥×\92¥ì\92¥¤    | \92µ¡A01\92¾å       |                | \92¥×\92¥ì\92¥¤
+ \92¥³\92¥ó\92¥Ô\92¥å\92¡¼\92¥¿\92¥°\92¥é\92¥Õ\92¥£\92¥Ã\92¥¯\92¥¹ | \92ʬB10\92Ãæ       |                | \92¥£\92¥Ã\92¥¯\92¥¹
+ \92¥³\92¥ó\92¥Ô\92¥å\92¡¼\92¥¿\92¥×\92¥í\92¥°\92¥é\92¥Þ\92¡¼    | \92¿ÍZ01\92²¼       |                | \92¥é\92¥Þ\92¡¼
 (3 rows)
 
-QUERY: drop table \91¼Æ\91Ëã\91»ú\91Êõ\91Óï;
+drop table \91¼Æ\91Ëã\91»ú\91Êõ\91Óï;
 ERROR:  Relation '\91¼Æ\91Ëã\91»ú\91Êõ\91Óï' does not exist
-QUERY: create table \91¼Æ\91Ëã\91»ú\91Êõ\91Óï(\91Êõ\91Óï text, \91·Ö\91Àà\91ºÅ varchar, \91±¸\91×¢1A char(16));
-QUERY: create index \91¼Æ\91Ëã\91»ú\91Êõ\91Óïindex1 on \91¼Æ\91Ëã\91»ú\91Êõ\91Óï using btree(\91Êõ\91Óï);
-QUERY: create index \91¼Æ\91Ëã\91»ú\91Êõ\91Óïindex2 on \91¼Æ\91Ëã\91»ú\91Êõ\91Óï using btree(\91·Ö\91Àà\91ºÅ);
-QUERY: insert into \91¼Æ\91Ëã\91»ú\91Êõ\91Óï values('\91µç\91ÄÔ\91ÏÔ\91ʾ\91ÆÁ','\91»úA01\91ÉÏ');
-QUERY: insert into \91¼Æ\91Ëã\91»ú\91Êõ\91Óï values('\91µç\91ÄÔ\91ͼ\91ÐÎ','\91·ÖB01\91ÖÐ');
-QUERY: insert into \91¼Æ\91Ëã\91»ú\91Êõ\91Óï values('\91µç\91ÄÔ\91³Ì\91Ðò\91Ô±','\91ÈËZ01\91ÏÂ');
-QUERY: vacuum \91¼Æ\91Ëã\91»ú\91Êõ\91Óï;
-QUERY: select * from \91¼Æ\91Ëã\91»ú\91Êõ\91Óï;
-\91Êõ\91Óï         |\91·Ö\91Àà\91ºÅ|\91±¸\91×¢1a
----------------+---------+--------
-\91µç\91ÄÔ\91ÏÔ\91ʾ\91ÆÁ|\91»úA01\91ÉÏ|        
-\91µç\91ÄÔ\91ͼ\91ÐÎ   |\91·ÖB01\91ÖÐ|        
-\91µç\91ÄÔ\91³Ì\91Ðò\91Ô±|\91ÈËZ01\91ÏÂ|        
+create table \91¼Æ\91Ëã\91»ú\91Êõ\91Óï(\91Êõ\91Óï text, \91·Ö\91Àà\91ºÅ varchar, \91±¸\91×¢1A char(16));
+create index \91¼Æ\91Ëã\91»ú\91Êõ\91Óïindex1 on \91¼Æ\91Ëã\91»ú\91Êõ\91Óï using btree(\91Êõ\91Óï);
+create index \91¼Æ\91Ëã\91»ú\91Êõ\91Óïindex2 on \91¼Æ\91Ëã\91»ú\91Êõ\91Óï using btree(\91·Ö\91Àà\91ºÅ);
+insert into \91¼Æ\91Ëã\91»ú\91Êõ\91Óï values('\91µç\91ÄÔ\91ÏÔ\91ʾ\91ÆÁ','\91»úA01\91ÉÏ');
+insert into \91¼Æ\91Ëã\91»ú\91Êõ\91Óï values('\91µç\91ÄÔ\91ͼ\91ÐÎ','\91·ÖB01\91ÖÐ');
+insert into \91¼Æ\91Ëã\91»ú\91Êõ\91Óï values('\91µç\91ÄÔ\91³Ì\91Ðò\91Ô±','\91ÈËZ01\91ÏÂ');
+vacuum \91¼Æ\91Ëã\91»ú\91Êõ\91Óï;
+select * from \91¼Æ\91Ëã\91»ú\91Êõ\91Óï;
+     \91Êõ\91Óï      | \91·Ö\91Àà\91ºÅ | \91±¸\91×¢1a 
+-----------------+-----------+----------
+ \91µç\91ÄÔ\91ÏÔ\91ʾ\91ÆÁ | \91»úA01\91ÉÏ | 
+ \91µç\91ÄÔ\91ͼ\91ÐÎ    | \91·ÖB01\91ÖÐ | 
+ \91µç\91ÄÔ\91³Ì\91Ðò\91Ô± | \91ÈËZ01\91Ï | 
 (3 rows)
 
-QUERY: select * from \91¼Æ\91Ëã\91»ú\91Êõ\91Óï where \91·Ö\91Àà\91ºÅ = '\91ÈËZ01\91ÏÂ';
-\91Êõ\91Óï         |\91·Ö\91Àà\91ºÅ|\91±¸\91×¢1a
----------------+---------+--------
-\91µç\91ÄÔ\91³Ì\91Ðò\91Ô±|\91ÈËZ01\91ÏÂ|        
+select * from \91¼Æ\91Ëã\91»ú\91Êõ\91Óï where \91·Ö\91Àà\91ºÅ = '\91ÈËZ01\91ÏÂ';
+     \91Êõ\91Óï      | \91·Ö\91Àà\91ºÅ | \91±¸\91×¢1a 
+-----------------+-----------+----------
+ \91µç\91ÄÔ\91³Ì\91Ðò\91Ô± | \91ÈËZ01\91Ï | 
 (1 row)
 
-QUERY: select * from \91¼Æ\91Ëã\91»ú\91Êõ\91Óï where \91·Ö\91Àà\91ºÅ ~* '\91ÈËz01\91ÏÂ';
-\91Êõ\91Óï         |\91·Ö\91Àà\91ºÅ|\91±¸\91×¢1a
----------------+---------+--------
-\91µç\91ÄÔ\91³Ì\91Ðò\91Ô±|\91ÈËZ01\91ÏÂ|        
+select * from \91¼Æ\91Ëã\91»ú\91Êõ\91Óï where \91·Ö\91Àà\91ºÅ ~* '\91ÈËz01\91ÏÂ';
+     \91Êõ\91Óï      | \91·Ö\91Àà\91ºÅ | \91±¸\91×¢1a 
+-----------------+-----------+----------
+ \91µç\91ÄÔ\91³Ì\91Ðò\91Ô± | \91ÈËZ01\91Ï | 
 (1 row)
 
-QUERY: select * from \91¼Æ\91Ëã\91»ú\91Êõ\91Óï where \91·Ö\91Àà\91ºÅ like '_Z01_';
-\91Êõ\91Óï         |\91·Ö\91Àà\91ºÅ|\91±¸\91×¢1a
----------------+---------+--------
-\91µç\91ÄÔ\91³Ì\91Ðò\91Ô±|\91ÈËZ01\91ÏÂ|        
+select * from \91¼Æ\91Ëã\91»ú\91Êõ\91Óï where \91·Ö\91Àà\91ºÅ like '_Z01_';
+     \91Êõ\91Óï      | \91·Ö\91Àà\91ºÅ | \91±¸\91×¢1a 
+-----------------+-----------+----------
+ \91µç\91ÄÔ\91³Ì\91Ðò\91Ô± | \91ÈËZ01\91Ï | 
 (1 row)
 
-QUERY: select * from \91¼Æ\91Ëã\91»ú\91Êõ\91Óï where \91·Ö\91Àà\91ºÅ like '_Z%';
-\91Êõ\91Óï         |\91·Ö\91Àà\91ºÅ|\91±¸\91×¢1a
----------------+---------+--------
-\91µç\91ÄÔ\91³Ì\91Ðò\91Ô±|\91ÈËZ01\91ÏÂ|        
+select * from \91¼Æ\91Ëã\91»ú\91Êõ\91Óï where \91·Ö\91Àà\91ºÅ like '_Z%';
+     \91Êõ\91Óï      | \91·Ö\91Àà\91ºÅ | \91±¸\91×¢1a 
+-----------------+-----------+----------
+ \91µç\91ÄÔ\91³Ì\91Ðò\91Ô± | \91ÈËZ01\91Ï | 
 (1 row)
 
-QUERY: select * from \91¼Æ\91Ëã\91»ú\91Êõ\91Óï where \91Êõ\91Óï ~ '\91µç\91ÄÔ[\91ÏÔ\91ͼ]';
-\91Êõ\91Óï         |\91·Ö\91Àà\91ºÅ|\91±¸\91×¢1a
----------------+---------+--------
-\91µç\91ÄÔ\91ÏÔ\91ʾ\91ÆÁ|\91»úA01\91ÉÏ|        
-\91µç\91ÄÔ\91ͼ\91ÐÎ   |\91·ÖB01\91ÖÐ|        
+select * from \91¼Æ\91Ëã\91»ú\91Êõ\91Óï where \91Êõ\91Óï ~ '\91µç\91ÄÔ[\91ÏÔ\91ͼ]';
+     \91Êõ\91Óï      | \91·Ö\91Àà\91ºÅ | \91±¸\91×¢1a 
+-----------------+-----------+----------
+ \91µç\91ÄÔ\91ÏÔ\91ʾ\91ÆÁ | \91»úA01\91ÉÏ | 
+ \91µç\91ÄÔ\91ͼ\91ÐÎ    | \91·ÖB01\91ÖÐ | 
 (2 rows)
 
-QUERY: select * from \91¼Æ\91Ëã\91»ú\91Êõ\91Óï where \91Êõ\91Óï ~* '\91µç\91ÄÔ[\91ÏÔ\91ͼ]';
-\91Êõ\91Óï         |\91·Ö\91Àà\91ºÅ|\91±¸\91×¢1a
----------------+---------+--------
-\91µç\91ÄÔ\91ÏÔ\91ʾ\91ÆÁ|\91»úA01\91ÉÏ|        
-\91µç\91ÄÔ\91ͼ\91ÐÎ   |\91·ÖB01\91ÖÐ|        
+select * from \91¼Æ\91Ëã\91»ú\91Êõ\91Óï where \91Êõ\91Óï ~* '\91µç\91ÄÔ[\91ÏÔ\91ͼ]';
+     \91Êõ\91Óï      | \91·Ö\91Àà\91ºÅ | \91±¸\91×¢1a 
+-----------------+-----------+----------
+ \91µç\91ÄÔ\91ÏÔ\91ʾ\91ÆÁ | \91»úA01\91ÉÏ | 
+ \91µç\91ÄÔ\91ͼ\91ÐÎ    | \91·ÖB01\91ÖÐ | 
 (2 rows)
 
-QUERY: select *,character_length(\91Êõ\91Óï) from \91¼Æ\91Ëã\91»ú\91Êõ\91Óï;
-\91Êõ\91Óï         |\91·Ö\91Àà\91ºÅ|\91±¸\91×¢1a|length
----------------+---------+--------+------
-\91µç\91ÄÔ\91ÏÔ\91ʾ\91ÆÁ|\91»úA01\91ÉÏ|        |     5
-\91µç\91ÄÔ\91ͼ\91ÐÎ   |\91·ÖB01\91ÖÐ|        |     4
-\91µç\91ÄÔ\91³Ì\91Ðò\91Ô±|\91ÈËZ01\91ÏÂ|        |     5
+select *,character_length(\91Êõ\91Óï) from \91¼Æ\91Ëã\91»ú\91Êõ\91Óï;
+     \91Êõ\91Óï      | \91·Ö\91Àà\91ºÅ | \91±¸\91×¢1a | char_length 
+-----------------+-----------+----------+-------------
+ \91µç\91ÄÔ\91ÏÔ\91ʾ\91ÆÁ | \91»úA01\91ÉÏ |          |           5
+ \91µç\91ÄÔ\91ͼ\91ÐÎ    | \91·ÖB01\91ÖÐ |          |           4
+ \91µç\91ÄÔ\91³Ì\91Ðò\91Ô± | \91ÈËZ01\91Ï |          |           5
 (3 rows)
 
-QUERY: select *,octet_length(\91Êõ\91Óï) from \91¼Æ\91Ëã\91»ú\91Êõ\91Óï;
-\91Êõ\91Óï         |\91·Ö\91Àà\91ºÅ|\91±¸\91×¢1a|octet_length
----------------+---------+--------+------------
-\91µç\91ÄÔ\91ÏÔ\91ʾ\91ÆÁ|\91»úA01\91ÉÏ|        |          15
-\91µç\91ÄÔ\91ͼ\91ÐÎ   |\91·ÖB01\91ÖÐ|        |          12
-\91µç\91ÄÔ\91³Ì\91Ðò\91Ô±|\91ÈËZ01\91ÏÂ|        |          15
+select *,octet_length(\91Êõ\91Óï) from \91¼Æ\91Ëã\91»ú\91Êõ\91Óï;
+     \91Êõ\91Óï      | \91·Ö\91Àà\91ºÅ | \91±¸\91×¢1a | octet_length 
+-----------------+-----------+----------+--------------
+ \91µç\91ÄÔ\91ÏÔ\91ʾ\91ÆÁ | \91»úA01\91ÉÏ |          |           15
+ \91µç\91ÄÔ\91ͼ\91ÐÎ    | \91·ÖB01\91ÖÐ |          |           12
+ \91µç\91ÄÔ\91³Ì\91Ðò\91Ô± | \91ÈËZ01\91Ï |          |           15
 (3 rows)
 
-QUERY: select *,position('\91ÏÔ' in \91Êõ\91Óï) from \91¼Æ\91Ëã\91»ú\91Êõ\91Óï;
-\91Êõ\91Óï         |\91·Ö\91Àà\91ºÅ|\91±¸\91×¢1a|strpos
----------------+---------+--------+------
-\91µç\91ÄÔ\91ÏÔ\91ʾ\91ÆÁ|\91»úA01\91ÉÏ|        |     3
-\91µç\91ÄÔ\91ͼ\91ÐÎ   |\91·ÖB01\91ÖÐ|        |     0
-\91µç\91ÄÔ\91³Ì\91Ðò\91Ô±|\91ÈËZ01\91ÏÂ|        |     0
+select *,position('\91ÏÔ' in \91Êõ\91Óï) from \91¼Æ\91Ëã\91»ú\91Êõ\91Óï;
+     \91Êõ\91Óï      | \91·Ö\91Àà\91ºÅ | \91±¸\91×¢1a | strpos 
+-----------------+-----------+----------+--------
+ \91µç\91ÄÔ\91ÏÔ\91ʾ\91ÆÁ | \91»úA01\91ÉÏ |          |      3
+ \91µç\91ÄÔ\91ͼ\91ÐÎ    | \91·ÖB01\91ÖÐ |          |      0
+ \91µç\91ÄÔ\91³Ì\91Ðò\91Ô± | \91ÈËZ01\91Ï |          |      0
 (3 rows)
 
-QUERY: select *,substring(\91Êõ\91Óï from 3 for 4) from \91¼Æ\91Ëã\91»ú\91Êõ\91Óï;
-\91Êõ\91Óï         |\91·Ö\91Àà\91ºÅ|\91±¸\91×¢1a|substr   
----------------+---------+--------+---------
-\91µç\91ÄÔ\91ÏÔ\91ʾ\91ÆÁ|\91»úA01\91ÉÏ|        |\91ÏÔ\91ʾ\91ÆÁ
-\91µç\91ÄÔ\91ͼ\91ÐÎ   |\91·ÖB01\91ÖÐ|        |\91ͼ\91ÐÎ   
-\91µç\91ÄÔ\91³Ì\91Ðò\91Ô±|\91ÈËZ01\91ÏÂ|        |\91³Ì\91Ðò\91Ô±
+select *,substring(\91Êõ\91Óï from 3 for 4) from \91¼Æ\91Ëã\91»ú\91Êõ\91Óï;
+     \91Êõ\91Óï      | \91·Ö\91Àà\91ºÅ | \91±¸\91×¢1a |  substr   
+-----------------+-----------+----------+-----------
+ \91µç\91ÄÔ\91ÏÔ\91ʾ\91ÆÁ | \91»úA01\91ÉÏ |          | \91ÏÔ\91ʾ\91ÆÁ
+ \91µç\91ÄÔ\91ͼ\91ÐÎ    | \91·ÖB01\91ÖÐ |          | \91ͼ\91ÐÎ
+ \91µç\91ÄÔ\91³Ì\91Ðò\91Ô± | \91ÈËZ01\91Ï |          | \91³Ì\91Ðò\91Ô±
 (3 rows)
 
-QUERY: drop table \93ͪ\93ß©\93Ѧ\93¿ë\93¾î;
+drop table \93ͪ\93ß©\93Ѧ\93¿ë\93¾î;
 ERROR:  Relation '\93ͪ\93ß©\93Ѧ\93¿ë\93¾î' does not exist
-QUERY: create table \93ͪ\93ß©\93Ѧ\93¿ë\93¾î (\93¿ë\93¾î text, \93ÝÂ\93×¾\93ÄÚ\93µå varchar, \93ºñ\93°í1A\93¶ó\93±¸ char(16));
-QUERY: create index \93ͪ\93ß©\93Ѧ\93¿ë\93¾îindex1 on \93ͪ\93ß©\93Ѧ\93¿ë\93¾î using btree (\93¿ë\93¾î);
-QUERY: create index \93ͪ\93ß©\93Ѧ\93¿ë\93¾îindex2 on \93ͪ\93ß©\93Ѧ\93¿ë\93¾î using hash (\93ÝÂ\93×¾\93ÄÚ\93µå);
-QUERY: insert into \93ͪ\93ß©\93Ѧ\93¿ë\93¾î values('\93ÄÄ\93Ç»\93ÅÍ\93µð\93½º\93ÇÃ\93·¹\93ÀÌ', '\93ѦA01\93ß¾');
-QUERY: insert into \93ͪ\93ß©\93Ѧ\93¿ë\93¾î values('\93ÄÄ\93Ç»\93ÅÍ\93±×\93·¡\93ÇÈ\93½º', '\93ÝÂB10\93ñé');
-QUERY: insert into \93ͪ\93ß©\93Ѧ\93¿ë\93¾î values('\93ÄÄ\93Ç»\93ÅÍ\93ÇÁ\93·Î\93±×\93·¡\93¸Ó', '\93ìÑZ01\93ù»');
-QUERY: vacuum \93ͪ\93ß©\93Ѧ\93¿ë\93¾î;
-QUERY: select * from \93ͪ\93ß©\93Ѧ\93¿ë\93¾î;
-\93¿ë\93¾î                  |\93ÝÂ\93×¾\93ÄÚ\93µå|\93ºñ\93°í1a\93¶ó\93±¸
-------------------------+------------+--------------
-\93ÄÄ\93Ç»\93ÅÍ\93µð\93½º\93ÇÃ\93·¹\93ÀÌ|\93ѦA01\93ß¾   |              
-\93ÄÄ\93Ç»\93ÅÍ\93±×\93·¡\93ÇÈ\93½º   |\93ÝÂB10\93ñé   |              
-\93ÄÄ\93Ç»\93ÅÍ\93ÇÁ\93·Î\93±×\93·¡\93¸Ó|\93ìÑZ01\93ù»   |              
+create table \93ͪ\93ß©\93Ѧ\93¿ë\93¾î (\93¿ë\93¾î text, \93ÝÂ\93×¾\93ÄÚ\93µå varchar, \93ºñ\93°í1A\93¶ó\93±¸ char(16));
+create index \93ͪ\93ß©\93Ѧ\93¿ë\93¾îindex1 on \93ͪ\93ß©\93Ѧ\93¿ë\93¾î using btree (\93¿ë\93¾î);
+create index \93ͪ\93ß©\93Ѧ\93¿ë\93¾îindex2 on \93ͪ\93ß©\93Ѧ\93¿ë\93¾î using hash (\93ÝÂ\93×¾\93ÄÚ\93µå);
+insert into \93ͪ\93ß©\93Ѧ\93¿ë\93¾î values('\93ÄÄ\93Ç»\93ÅÍ\93µð\93½º\93ÇÃ\93·¹\93ÀÌ', '\93ѦA01\93ß¾');
+insert into \93ͪ\93ß©\93Ѧ\93¿ë\93¾î values('\93ÄÄ\93Ç»\93ÅÍ\93±×\93·¡\93ÇÈ\93½º', '\93ÝÂB10\93ñé');
+insert into \93ͪ\93ß©\93Ѧ\93¿ë\93¾î values('\93ÄÄ\93Ç»\93ÅÍ\93ÇÁ\93·Î\93±×\93·¡\93¸Ó', '\93ìÑZ01\93ù»');
+vacuum \93ͪ\93ß©\93Ѧ\93¿ë\93¾î;
+select * from \93ͪ\93ß©\93Ѧ\93¿ë\93¾î;
+          \93¿ë\93¾î          | \93ÝÂ\93×¾\93ÄÚ\93µå | \93ºñ\93°í1a\93¶ó\93±¸ 
+--------------------------+--------------+----------------
+ \93ÄÄ\93Ç»\93ÅÍ\93µð\93½º\93ÇÃ\93·¹\93ÀÌ | \93ѦA01\93ß¾    | 
+ \93ÄÄ\93Ç»\93ÅÍ\93±×\93·¡\93ÇÈ\93½º    | \93ÝÂB10\93ñé    | 
+ \93ÄÄ\93Ç»\93ÅÍ\93ÇÁ\93·Î\93±×\93·¡\93¸Ó | \93ìÑZ01\93ù»    | 
 (3 rows)
 
-QUERY: select * from \93ͪ\93ß©\93Ѧ\93¿ë\93¾î where \93ÝÂ\93×¾\93ÄÚ\93µå = '\93ìÑZ01\93ù»';
-\93¿ë\93¾î                  |\93ÝÂ\93×¾\93ÄÚ\93µå|\93ºñ\93°í1a\93¶ó\93±¸
-------------------------+------------+--------------
-\93ÄÄ\93Ç»\93ÅÍ\93ÇÁ\93·Î\93±×\93·¡\93¸Ó|\93ìÑZ01\93ù»   |              
+select * from \93ͪ\93ß©\93Ѧ\93¿ë\93¾î where \93ÝÂ\93×¾\93ÄÚ\93µå = '\93ìÑZ01\93ù»';
+          \93¿ë\93¾î          | \93ÝÂ\93×¾\93ÄÚ\93µå | \93ºñ\93°í1a\93¶ó\93±¸ 
+--------------------------+--------------+----------------
+ \93ÄÄ\93Ç»\93ÅÍ\93ÇÁ\93·Î\93±×\93·¡\93¸Ó | \93ìÑZ01\93ù»    | 
 (1 row)
 
-QUERY: select * from \93ͪ\93ß©\93Ѧ\93¿ë\93¾î where \93ÝÂ\93×¾\93ÄÚ\93µå ~* '\93ìÑz01\93ù»';
-\93¿ë\93¾î                  |\93ÝÂ\93×¾\93ÄÚ\93µå|\93ºñ\93°í1a\93¶ó\93±¸
-------------------------+------------+--------------
-\93ÄÄ\93Ç»\93ÅÍ\93ÇÁ\93·Î\93±×\93·¡\93¸Ó|\93ìÑZ01\93ù»   |              
+select * from \93ͪ\93ß©\93Ѧ\93¿ë\93¾î where \93ÝÂ\93×¾\93ÄÚ\93µå ~* '\93ìÑz01\93ù»';
+          \93¿ë\93¾î          | \93ÝÂ\93×¾\93ÄÚ\93µå | \93ºñ\93°í1a\93¶ó\93±¸ 
+--------------------------+--------------+----------------
+ \93ÄÄ\93Ç»\93ÅÍ\93ÇÁ\93·Î\93±×\93·¡\93¸Ó | \93ìÑZ01\93ù»    | 
 (1 row)
 
-QUERY: select * from \93ͪ\93ß©\93Ѧ\93¿ë\93¾î where \93ÝÂ\93×¾\93ÄÚ\93µå like '_Z01_';
-\93¿ë\93¾î                  |\93ÝÂ\93×¾\93ÄÚ\93µå|\93ºñ\93°í1a\93¶ó\93±¸
-------------------------+------------+--------------
-\93ÄÄ\93Ç»\93ÅÍ\93ÇÁ\93·Î\93±×\93·¡\93¸Ó|\93ìÑZ01\93ù»   |              
+select * from \93ͪ\93ß©\93Ѧ\93¿ë\93¾î where \93ÝÂ\93×¾\93ÄÚ\93µå like '_Z01_';
+          \93¿ë\93¾î          | \93ÝÂ\93×¾\93ÄÚ\93µå | \93ºñ\93°í1a\93¶ó\93±¸ 
+--------------------------+--------------+----------------
+ \93ÄÄ\93Ç»\93ÅÍ\93ÇÁ\93·Î\93±×\93·¡\93¸Ó | \93ìÑZ01\93ù»    | 
 (1 row)
 
-QUERY: select * from \93ͪ\93ß©\93Ѧ\93¿ë\93¾î where \93ÝÂ\93×¾\93ÄÚ\93µå like '_Z%';
-\93¿ë\93¾î                  |\93ÝÂ\93×¾\93ÄÚ\93µå|\93ºñ\93°í1a\93¶ó\93±¸
-------------------------+------------+--------------
-\93ÄÄ\93Ç»\93ÅÍ\93ÇÁ\93·Î\93±×\93·¡\93¸Ó|\93ìÑZ01\93ù»   |              
+select * from \93ͪ\93ß©\93Ѧ\93¿ë\93¾î where \93ÝÂ\93×¾\93ÄÚ\93µå like '_Z%';
+          \93¿ë\93¾î          | \93ÝÂ\93×¾\93ÄÚ\93µå | \93ºñ\93°í1a\93¶ó\93±¸ 
+--------------------------+--------------+----------------
+ \93ÄÄ\93Ç»\93ÅÍ\93ÇÁ\93·Î\93±×\93·¡\93¸Ó | \93ìÑZ01\93ù»    | 
 (1 row)
 
-QUERY: select * from \93ͪ\93ß©\93Ѧ\93¿ë\93¾î where \93¿ë\93¾î ~ '\93ÄÄ\93Ç»\93ÅÍ[\93µð\93±×]';
-\93¿ë\93¾î                  |\93ÝÂ\93×¾\93ÄÚ\93µå|\93ºñ\93°í1a\93¶ó\93±¸
-------------------------+------------+--------------
-\93ÄÄ\93Ç»\93ÅÍ\93µð\93½º\93ÇÃ\93·¹\93ÀÌ|\93ѦA01\93ß¾   |              
-\93ÄÄ\93Ç»\93ÅÍ\93±×\93·¡\93ÇÈ\93½º   |\93ÝÂB10\93ñé   |              
+select * from \93ͪ\93ß©\93Ѧ\93¿ë\93¾î where \93¿ë\93¾î ~ '\93ÄÄ\93Ç»\93ÅÍ[\93µð\93±×]';
+          \93¿ë\93¾î          | \93ÝÂ\93×¾\93ÄÚ\93µå | \93ºñ\93°í1a\93¶ó\93±¸ 
+--------------------------+--------------+----------------
+ \93ÄÄ\93Ç»\93ÅÍ\93µð\93½º\93ÇÃ\93·¹\93ÀÌ | \93ѦA01\93ß¾    | 
+ \93ÄÄ\93Ç»\93ÅÍ\93±×\93·¡\93ÇÈ\93½º    | \93ÝÂB10\93ñé    | 
 (2 rows)
 
-QUERY: select * from \93ͪ\93ß©\93Ѧ\93¿ë\93¾î where \93¿ë\93¾î ~* '\93ÄÄ\93Ç»\93ÅÍ[\93µð\93±×]';
-\93¿ë\93¾î                  |\93ÝÂ\93×¾\93ÄÚ\93µå|\93ºñ\93°í1a\93¶ó\93±¸
-------------------------+------------+--------------
-\93ÄÄ\93Ç»\93ÅÍ\93µð\93½º\93ÇÃ\93·¹\93ÀÌ|\93ѦA01\93ß¾   |              
-\93ÄÄ\93Ç»\93ÅÍ\93±×\93·¡\93ÇÈ\93½º   |\93ÝÂB10\93ñé   |              
+select * from \93ͪ\93ß©\93Ѧ\93¿ë\93¾î where \93¿ë\93¾î ~* '\93ÄÄ\93Ç»\93ÅÍ[\93µð\93±×]';
+          \93¿ë\93¾î          | \93ÝÂ\93×¾\93ÄÚ\93µå | \93ºñ\93°í1a\93¶ó\93±¸ 
+--------------------------+--------------+----------------
+ \93ÄÄ\93Ç»\93ÅÍ\93µð\93½º\93ÇÃ\93·¹\93ÀÌ | \93ѦA01\93ß¾    | 
+ \93ÄÄ\93Ç»\93ÅÍ\93±×\93·¡\93ÇÈ\93½º    | \93ÝÂB10\93ñé    | 
 (2 rows)
 
-QUERY: select *,character_length(\93¿ë\93¾î) from \93ͪ\93ß©\93Ѧ\93¿ë\93¾î;
-\93¿ë\93¾î                  |\93ÝÂ\93×¾\93ÄÚ\93µå|\93ºñ\93°í1a\93¶ó\93±¸|length
-------------------------+------------+--------------+------
-\93ÄÄ\93Ç»\93ÅÍ\93µð\93½º\93ÇÃ\93·¹\93ÀÌ|\93ѦA01\93ß¾   |              |     8
-\93ÄÄ\93Ç»\93ÅÍ\93±×\93·¡\93ÇÈ\93½º   |\93ÝÂB10\93ñé   |              |     7
-\93ÄÄ\93Ç»\93ÅÍ\93ÇÁ\93·Î\93±×\93·¡\93¸Ó|\93ìÑZ01\93ù»   |              |     8
+select *,character_length(\93¿ë\93¾î) from \93ͪ\93ß©\93Ѧ\93¿ë\93¾î;
+          \93¿ë\93¾î          | \93ÝÂ\93×¾\93ÄÚ\93µå | \93ºñ\93°í1a\93¶ó\93±¸ | char_length 
+--------------------------+--------------+----------------+-------------
+ \93ÄÄ\93Ç»\93ÅÍ\93µð\93½º\93ÇÃ\93·¹\93ÀÌ | \93ѦA01\93ß¾    |                |           8
+ \93ÄÄ\93Ç»\93ÅÍ\93±×\93·¡\93ÇÈ\93½º    | \93ÝÂB10\93ñé    |                |           7
+ \93ÄÄ\93Ç»\93ÅÍ\93ÇÁ\93·Î\93±×\93·¡\93¸Ó | \93ìÑZ01\93ù»    |                |           8
 (3 rows)
 
-QUERY: select *,octet_length(\93¿ë\93¾î) from \93ͪ\93ß©\93Ѧ\93¿ë\93¾î;
-\93¿ë\93¾î                  |\93ÝÂ\93×¾\93ÄÚ\93µå|\93ºñ\93°í1a\93¶ó\93±¸|octet_length
-------------------------+------------+--------------+------------
-\93ÄÄ\93Ç»\93ÅÍ\93µð\93½º\93ÇÃ\93·¹\93ÀÌ|\93ѦA01\93ß¾   |              |          24
-\93ÄÄ\93Ç»\93ÅÍ\93±×\93·¡\93ÇÈ\93½º   |\93ÝÂB10\93ñé   |              |          21
-\93ÄÄ\93Ç»\93ÅÍ\93ÇÁ\93·Î\93±×\93·¡\93¸Ó|\93ìÑZ01\93ù»   |              |          24
+select *,octet_length(\93¿ë\93¾î) from \93ͪ\93ß©\93Ѧ\93¿ë\93¾î;
+          \93¿ë\93¾î          | \93ÝÂ\93×¾\93ÄÚ\93µå | \93ºñ\93°í1a\93¶ó\93±¸ | octet_length 
+--------------------------+--------------+----------------+--------------
+ \93ÄÄ\93Ç»\93ÅÍ\93µð\93½º\93ÇÃ\93·¹\93ÀÌ | \93ѦA01\93ß¾    |                |           24
+ \93ÄÄ\93Ç»\93ÅÍ\93±×\93·¡\93ÇÈ\93½º    | \93ÝÂB10\93ñé    |                |           21
+ \93ÄÄ\93Ç»\93ÅÍ\93ÇÁ\93·Î\93±×\93·¡\93¸Ó | \93ìÑZ01\93ù»    |                |           24
 (3 rows)
 
-QUERY: select *,position('\93µð' in \93¿ë\93¾î) from \93ͪ\93ß©\93Ѧ\93¿ë\93¾î;
-\93¿ë\93¾î                  |\93ÝÂ\93×¾\93ÄÚ\93µå|\93ºñ\93°í1a\93¶ó\93±¸|strpos
-------------------------+------------+--------------+------
-\93ÄÄ\93Ç»\93ÅÍ\93µð\93½º\93ÇÃ\93·¹\93ÀÌ|\93ѦA01\93ß¾   |              |     4
-\93ÄÄ\93Ç»\93ÅÍ\93±×\93·¡\93ÇÈ\93½º   |\93ÝÂB10\93ñé   |              |     0
-\93ÄÄ\93Ç»\93ÅÍ\93ÇÁ\93·Î\93±×\93·¡\93¸Ó|\93ìÑZ01\93ù»   |              |     0
+select *,position('\93µð' in \93¿ë\93¾î) from \93ͪ\93ß©\93Ѧ\93¿ë\93¾î;
+          \93¿ë\93¾î          | \93ÝÂ\93×¾\93ÄÚ\93µå | \93ºñ\93°í1a\93¶ó\93±¸ | strpos 
+--------------------------+--------------+----------------+--------
+ \93ÄÄ\93Ç»\93ÅÍ\93µð\93½º\93ÇÃ\93·¹\93ÀÌ | \93ѦA01\93ß¾    |                |      4
+ \93ÄÄ\93Ç»\93ÅÍ\93±×\93·¡\93ÇÈ\93½º    | \93ÝÂB10\93ñé    |                |      0
+ \93ÄÄ\93Ç»\93ÅÍ\93ÇÁ\93·Î\93±×\93·¡\93¸Ó | \93ìÑZ01\93ù»    |                |      0
 (3 rows)
 
-QUERY: select *,substring(\93¿ë\93¾î from 3 for 4) from \93ͪ\93ß©\93Ѧ\93¿ë\93¾î;
-\93¿ë\93¾î                  |\93ÝÂ\93×¾\93ÄÚ\93µå|\93ºñ\93°í1a\93¶ó\93±¸|substr      
-------------------------+------------+--------------+------------
-\93ÄÄ\93Ç»\93ÅÍ\93µð\93½º\93ÇÃ\93·¹\93ÀÌ|\93ѦA01\93ß¾   |              |\93ÅÍ\93µð\93½º\93ÇÃ
-\93ÄÄ\93Ç»\93ÅÍ\93±×\93·¡\93ÇÈ\93½º   |\93ÝÂB10\93ñé   |              |\93ÅÍ\93±×\93·¡\93ÇÈ
-\93ÄÄ\93Ç»\93ÅÍ\93ÇÁ\93·Î\93±×\93·¡\93¸Ó|\93ìÑZ01\93ù»   |              |\93ÅÍ\93ÇÁ\93·Î\93±×
+select *,substring(\93¿ë\93¾î from 3 for 4) from \93ͪ\93ß©\93Ѧ\93¿ë\93¾î;
+          \93¿ë\93¾î          | \93ÝÂ\93×¾\93ÄÚ\93µå | \93ºñ\93°í1a\93¶ó\93±¸ |    substr    
+--------------------------+--------------+----------------+--------------
+ \93ÄÄ\93Ç»\93ÅÍ\93µð\93½º\93ÇÃ\93·¹\93ÀÌ | \93ѦA01\93ß¾    |                | \93ÅÍ\93µð\93½º\93ÇÃ
+ \93ÄÄ\93Ç»\93ÅÍ\93±×\93·¡\93ÇÈ\93½º    | \93ÝÂB10\93ñé    |                | \93ÅÍ\93±×\93·¡\93ÇÈ
+ \93ÄÄ\93Ç»\93ÅÍ\93ÇÁ\93·Î\93±×\93·¡\93¸Ó | \93ìÑZ01\93ù»    |                | \93ÅÍ\93ÇÁ\93·Î\93±×
 (3 rows)
 
-QUERY: drop table test;
+drop table test;
 ERROR:  Relation 'test' does not exist
-QUERY: create table test (t text);
-QUERY: insert into test values('ENGLISH');
-QUERY: insert into test values('FRAN\81ÇAIS');
-QUERY: insert into test values('ESPA\81ÑOL');
-QUERY: insert into test values('\81ÍSLENSKA');
-QUERY: insert into test values('ENGLISH FRAN\81ÇAIS ESPA\81ÑOL \81ÍSLENSKA');
-QUERY: vacuum test;
-QUERY: select * from test;
-t                                   
-------------------------------------
-ENGLISH                             
-FRAN\81ÇAIS                           
-ESPA\81ÑOL                            
-\81ÍSLENSKA                           
-ENGLISH FRAN\81ÇAIS ESPA\81ÑOL \81ÍSLENSKA
+create table test (t text);
+insert into test values('ENGLISH');
+insert into test values('FRAN\81ÇAIS');
+insert into test values('ESPA\81ÑOL');
+insert into test values('\81ÍSLENSKA');
+insert into test values('ENGLISH FRAN\81ÇAIS ESPA\81ÑOL \81ÍSLENSKA');
+vacuum test;
+select * from test;
+                  t                   
+--------------------------------------
+ ENGLISH
+ FRAN\81ÇAIS
+ ESPA\81ÑOL
+ \81ÍSLENSKA
+ ENGLISH FRAN\81ÇAIS ESPA\81ÑOL \81ÍSLENSKA
 (5 rows)
 
-QUERY: select * from test where t = 'ESPA\81ÑOL';
-t       
---------
-ESPA\81ÑOL
+select * from test where t = 'ESPA\81ÑOL';
+    t     
+----------
+ ESPA\81ÑOL
 (1 row)
 
-QUERY: select * from test where t ~* 'espa\81Ñol';
-t                                   
-------------------------------------
-ESPA\81ÑOL                            
-ENGLISH FRAN\81ÇAIS ESPA\81ÑOL \81ÍSLENSKA
+select * from test where t ~* 'espa\81Ñol';
+                  t                   
+--------------------------------------
+ ESPA\81ÑOL
+ ENGLISH FRAN\81ÇAIS ESPA\81ÑOL \81ÍSLENSKA
 (2 rows)
 
-QUERY: select *,character_length(t) from test;
-t                                   |length
-------------------------------------+------
-ENGLISH                             |     7
-FRAN\81ÇAIS                           |     8
-ESPA\81ÑOL                            |     7
-\81ÍSLENSKA                           |     8
-ENGLISH FRAN\81ÇAIS ESPA\81ÑOL \81ÍSLENSKA|    33
+select *,character_length(t) from test;
+                  t                   | char_length 
+--------------------------------------+-------------
+ ENGLISH                              |           7
+ FRAN\81ÇAIS                            |           8
+ ESPA\81ÑOL                             |           7
+ \81ÍSLENSKA                            |           8
+ ENGLISH FRAN\81ÇAIS ESPA\81ÑOL \81ÍSLENSKA |          33
 (5 rows)
 
-QUERY: select *,octet_length(t) from test;
-t                                   |octet_length
-------------------------------------+------------
-ENGLISH                             |           7
-FRAN\81ÇAIS                           |           9
-ESPA\81ÑOL                            |           8
-\81ÍSLENSKA                           |           9
-ENGLISH FRAN\81ÇAIS ESPA\81ÑOL \81ÍSLENSKA|          36
+select *,octet_length(t) from test;
+                  t                   | octet_length 
+--------------------------------------+--------------
+ ENGLISH                              |            7
+ FRAN\81ÇAIS                            |            9
+ ESPA\81ÑOL                             |            8
+ \81ÍSLENSKA                            |            9
+ ENGLISH FRAN\81ÇAIS ESPA\81ÑOL \81ÍSLENSKA |           36
 (5 rows)
 
-QUERY: select *,position('L' in t) from test;
-t                                   |strpos
-------------------------------------+------
-ENGLISH                             |     4
-FRAN\81ÇAIS                           |     0
-ESPA\81ÑOL                            |     7
-\81ÍSLENSKA                           |     3
-ENGLISH FRAN\81ÇAIS ESPA\81ÑOL \81ÍSLENSKA|     4
+select *,position('L' in t) from test;
+                  t                   | strpos 
+--------------------------------------+--------
+ ENGLISH                              |      4
+ FRAN\81ÇAIS                            |      0
+ ESPA\81ÑOL                             |      7
+ \81ÍSLENSKA                            |      3
+ ENGLISH FRAN\81ÇAIS ESPA\81ÑOL \81ÍSLENSKA |      4
 (5 rows)
 
-QUERY: select *,substring(t from 3 for 4) from test;
-t                                   |substr
-------------------------------------+------
-ENGLISH                             |GLIS  
-FRAN\81ÇAIS                           |AN\81ÇA 
-ESPA\81ÑOL                            |PA\81ÑO 
-\81ÍSLENSKA                           |LENS  
-ENGLISH FRAN\81ÇAIS ESPA\81ÑOL \81ÍSLENSKA|GLIS  
+select *,substring(t from 3 for 4) from test;
+                  t                   | substr 
+--------------------------------------+--------
+ ENGLISH                              | GLIS
+ FRAN\81ÇAIS                            | AN\81ÇA
+ ESPA\81ÑOL                             | PA\81ÑO
+ \81ÍSLENSKA                            | LENS
+ ENGLISH FRAN\81ÇAIS ESPA\81ÑOL \81ÍSLENSKA | GLIS
 (5 rows)
 

diff --git a/src/test/regress/expected/sql_ascii.out b/src/test/regress/expected/sql_ascii.out
index 5e92cc1fad40eaf29416d8f828190b86425fc7ca..5b7c03575fdf92e9f5f3568d4685b7bce13cccf9 100644 (file)
--- a/src/test/regress/expected/sql_ascii.out
+++ b/src/test/regress/expected/sql_ascii.out
@@ -54,11 +54,11 @@ select * from computer_terms where term ~* 'computer [DG]';
 (2 rows)
 
 select *,character_length(term) from computer_terms;
-        term         | category |     comments     | length 
----------------------+----------+------------------+--------
- computer display    | X-A01-Y  | a comment 1      |     16
- computer graphics   | T-B01-Y  | a comment 2      |     17
- computer programmer | S-Z01-Y  | a comment 3      |     19
+        term         | category |     comments     | char_length 
+---------------------+----------+------------------+-------------
+ computer display    | X-A01-Y  | a comment 1      |          16
+ computer graphics   | T-B01-Y  | a comment 2      |          17
+ computer programmer | S-Z01-Y  | a comment 3      |          19
 (3 rows)
 
 select *,octet_length(term) from computer_terms;