From 0e1043b7605f67c4f38779cbe8260ae73b8c9767 Mon Sep 17 00:00:00 2001
From: Tatsuo Ishii <ishii@postgresql.org>
Date: Thu, 16 Mar 2000 11:55:43 +0000
Subject: [PATCH] Fixes for char_length() change.
---
src/test/regress/expected/euc_cn.out | 10 +-
src/test/regress/expected/euc_kr.out | 10 +-
src/test/regress/expected/euc_tw.out | 10 +-
src/test/regress/expected/mule_internal.out | 498 ++++++++++----------
src/test/regress/expected/sql_ascii.out | 10 +-
5 files changed, 269 insertions(+), 269 deletions(-)
diff --git a/src/test/regress/expected/euc_cn.out b/src/test/regress/expected/euc_cn.out
index 37790f83b85..7fdb13cfe5d 100644
--- 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 4c91395ab1f..368525b220f 100644
--- 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 c35ee9509d7..cf855809ab7 100644
--- 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 09f5489ee5f..bfcffc8490a 100644
--- a/src/test/regress/expected/mule_internal.out
+++ b/src/test/regress/expected/mule_internal.out
@@ -1,333 +1,333 @@
-QUERY: drop table 挿讙换挼脱捀�;
+drop table 挿讙换挼脱捀�;
ERROR: Relation '挿讙换挼脱捀�' does not exist
-QUERY: create table 挿讙换挼脱捀� (捦褣胳 text, 捠瑨梧挜硳〖挜� varchar, 捜鲯雇1A挙罀よ char(16));
-QUERY: create index 挿讙换挼脱捀靑ndex1 on 挿讙换挼脱捀� using btree (捦褣胳);
-QUERY: create index 挿讙换挼脱捀靑ndex2 on 挿讙换挼脱捀� using hash (捠瑨梧挜硳〖挜�);
-QUERY: insert into 挿讙换挼脱捀� values('挜硳ン挜話ュ挕紥タ挜菕ィ挜箳プ挜鞉イ','挼01捑�');
-QUERY: insert into 挿讙换挼脱捀� values('挜硳ン挜話ュ挕紥タ挜皰ラ挜諕ィ挜脪ク挜�','捠珺10捗�');
-QUERY: insert into 挿讙换挼脱捀� values('挜硳ン挜話ュ挕紥タ挜讙ロ挜皰ラ挜迴〖','捒蚙01挷�');
-QUERY: vacuum 挿讙换挼脱捀�;
-QUERY: select * from 挿讙换挼脱捀�;
-捦褣胳 |捠瑨梧挜硳〖挜蓔捜鲯雇1a挙罀よ
----------------------------------------+---------------+--------------
-挜硳ン挜話ュ挕紥タ挜菕ィ挜箳プ挜鞉イ |挼01捑� |
-挜硳ン挜話ュ挕紥タ挜皰ラ挜諕ィ挜脪ク挜箌捠珺10捗� |
-挜硳ン挜話ュ挕紥タ挜讙ロ挜皰ラ挜迴〖 |捒蚙01挷� |
+create table 挿讙换挼脱捀� (捦褣胳 text, 捠瑨梧挜硳〖挜� varchar, 捜鲯雇1A挙罀よ char(16));
+create index 挿讙换挼脱捀靑ndex1 on 挿讙换挼脱捀� using btree (捦褣胳);
+create index 挿讙换挼脱捀靑ndex2 on 挿讙换挼脱捀� using hash (捠瑨梧挜硳〖挜�);
+insert into 挿讙换挼脱捀� values('挜硳ン挜話ュ挕紥タ挜菕ィ挜箳プ挜鞉イ','挼01捑�');
+insert into 挿讙换挼脱捀� values('挜硳ン挜話ュ挕紥タ挜皰ラ挜諕ィ挜脪ク挜�','捠珺10捗�');
+insert into 挿讙换挼脱捀� values('挜硳ン挜話ュ挕紥タ挜讙ロ挜皰ラ挜迴〖','捒蚙01挷�');
+vacuum 挿讙换挼脱捀�;
+select * from 挿讙换挼脱捀�;
+ 捦褣胳 | 捠瑨梧挜硳〖挜� | 捜鲯雇1a挙罀よ
+-----------------------------------------+-----------------+----------------
+ 挜硳ン挜話ュ挕紥タ挜菕ィ挜箳プ挜鞉イ | 挼01捑� |
+ 挜硳ン挜話ュ挕紥タ挜皰ラ挜諕ィ挜脪ク挜� | 捠珺10捗� |
+ 挜硳ン挜話ュ挕紥タ挜讙ロ挜皰ラ挜迴〖 | 捒蚙01挷� |
(3 rows)
-QUERY: select * from 挿讙换挼脱捀� where 捠瑨梧挜硳〖挜� = '捒蚙01挷�';
-捦褣胳 |捠瑨梧挜硳〖挜蓔捜鲯雇1a挙罀よ
-------------------------------------+---------------+--------------
-挜硳ン挜話ュ挕紥タ挜讙ロ挜皰ラ挜迴〖|捒蚙01挷� |
+select * from 挿讙换挼脱捀� where 捠瑨梧挜硳〖挜� = '捒蚙01挷�';
+ 捦褣胳 | 捠瑨梧挜硳〖挜� | 捜鲯雇1a挙罀よ
+--------------------------------------+-----------------+----------------
+ 挜硳ン挜話ュ挕紥タ挜讙ロ挜皰ラ挜迴〖 | 捒蚙01挷� |
(1 row)
-QUERY: select * from 挿讙换挼脱捀� where 捠瑨梧挜硳〖挜� ~* '捒蛕01挷�';
-捦褣胳 |捠瑨梧挜硳〖挜蓔捜鲯雇1a挙罀よ
-------------------------------------+---------------+--------------
-挜硳ン挜話ュ挕紥タ挜讙ロ挜皰ラ挜迴〖|捒蚙01挷� |
+select * from 挿讙换挼脱捀� where 捠瑨梧挜硳〖挜� ~* '捒蛕01挷�';
+ 捦褣胳 | 捠瑨梧挜硳〖挜� | 捜鲯雇1a挙罀よ
+--------------------------------------+-----------------+----------------
+ 挜硳ン挜話ュ挕紥タ挜讙ロ挜皰ラ挜迴〖 | 捒蚙01挷� |
(1 row)
-QUERY: select * from 挿讙换挼脱捀� where 捠瑨梧挜硳〖挜� like '_Z01_';
-捦褣胳 |捠瑨梧挜硳〖挜蓔捜鲯雇1a挙罀よ
-------------------------------------+---------------+--------------
-挜硳ン挜話ュ挕紥タ挜讙ロ挜皰ラ挜迴〖|捒蚙01挷� |
+select * from 挿讙换挼脱捀� where 捠瑨梧挜硳〖挜� like '_Z01_';
+ 捦褣胳 | 捠瑨梧挜硳〖挜� | 捜鲯雇1a挙罀よ
+--------------------------------------+-----------------+----------------
+ 挜硳ン挜話ュ挕紥タ挜讙ロ挜皰ラ挜迴〖 | 捒蚙01挷� |
(1 row)
-QUERY: select * from 挿讙换挼脱捀� where 捠瑨梧挜硳〖挜� like '_Z%';
-捦褣胳 |捠瑨梧挜硳〖挜蓔捜鲯雇1a挙罀よ
-------------------------------------+---------------+--------------
-挜硳ン挜話ュ挕紥タ挜讙ロ挜皰ラ挜迴〖|捒蚙01挷� |
+select * from 挿讙换挼脱捀� where 捠瑨梧挜硳〖挜� like '_Z%';
+ 捦褣胳 | 捠瑨梧挜硳〖挜� | 捜鲯雇1a挙罀よ
+--------------------------------------+-----------------+----------------
+ 挜硳ン挜話ュ挕紥タ挜讙ロ挜皰ラ挜迴〖 | 捒蚙01挷� |
(1 row)
-QUERY: select * from 挿讙换挼脱捀� where 捦褣胳 ~ '挜硳ン挜話ュ挕紥タ[挜菕グ]';
-捦褣胳 |捠瑨梧挜硳〖挜蓔捜鲯雇1a挙罀よ
----------------------------------------+---------------+--------------
-挜硳ン挜話ュ挕紥タ挜菕ィ挜箳プ挜鞉イ |挼01捑� |
-挜硳ン挜話ュ挕紥タ挜皰ラ挜諕ィ挜脪ク挜箌捠珺10捗� |
+select * from 挿讙换挼脱捀� where 捦褣胳 ~ '挜硳ン挜話ュ挕紥タ[挜菕グ]';
+ 捦褣胳 | 捠瑨梧挜硳〖挜� | 捜鲯雇1a挙罀よ
+-----------------------------------------+-----------------+----------------
+ 挜硳ン挜話ュ挕紥タ挜菕ィ挜箳プ挜鞉イ | 挼01捑� |
+ 挜硳ン挜話ュ挕紥タ挜皰ラ挜諕ィ挜脪ク挜� | 捠珺10捗� |
(2 rows)
-QUERY: select * from 挿讙换挼脱捀� where 捦褣胳 ~* '挜硳ン挜話ュ挕紥タ[挜菕グ]';
-捦褣胳 |捠瑨梧挜硳〖挜蓔捜鲯雇1a挙罀よ
----------------------------------------+---------------+--------------
-挜硳ン挜話ュ挕紥タ挜菕ィ挜箳プ挜鞉イ |挼01捑� |
-挜硳ン挜話ュ挕紥タ挜皰ラ挜諕ィ挜脪ク挜箌捠珺10捗� |
+select * from 挿讙换挼脱捀� where 捦褣胳 ~* '挜硳ン挜話ュ挕紥タ[挜菕グ]';
+ 捦褣胳 | 捠瑨梧挜硳〖挜� | 捜鲯雇1a挙罀よ
+-----------------------------------------+-----------------+----------------
+ 挜硳ン挜話ュ挕紥タ挜菕ィ挜箳プ挜鞉イ | 挼01捑� |
+ 挜硳ン挜話ュ挕紥タ挜皰ラ挜諕ィ挜脪ク挜� | 捠珺10捗� |
(2 rows)
-QUERY: select *,character_length(捦褣胳) from 挿讙换挼脱捀�;
-捦褣胳 |捠瑨梧挜硳〖挜蓔捜鲯雇1a挙罀よ|length
----------------------------------------+---------------+--------------+------
-挜硳ン挜話ュ挕紥タ挜菕ィ挜箳プ挜鞉イ |挼01捑� | | 12
-挜硳ン挜話ュ挕紥タ挜皰ラ挜諕ィ挜脪ク挜箌捠珺10捗� | | 13
-挜硳ン挜話ュ挕紥タ挜讙ロ挜皰ラ挜迴〖 |捒蚙01挷� | | 12
+select *,character_length(捦褣胳) from 挿讙换挼脱捀�;
+ 捦褣胳 | 捠瑨梧挜硳〖挜� | 捜鲯雇1a挙罀よ | char_length
+-----------------------------------------+-----------------+----------------+-------------
+ 挜硳ン挜話ュ挕紥タ挜菕ィ挜箳プ挜鞉イ | 挼01捑� | | 12
+ 挜硳ン挜話ュ挕紥タ挜皰ラ挜諕ィ挜脪ク挜� | 捠珺10捗� | | 13
+ 挜硳ン挜話ュ挕紥タ挜讙ロ挜皰ラ挜迴〖 | 捒蚙01挷� | | 12
(3 rows)
-QUERY: select *,octet_length(捦褣胳) from 挿讙换挼脱捀�;
-捦褣胳 |捠瑨梧挜硳〖挜蓔捜鲯雇1a挙罀よ|octet_length
----------------------------------------+---------------+--------------+------------
-挜硳ン挜話ュ挕紥タ挜菕ィ挜箳プ挜鞉イ |挼01捑� | | 36
-挜硳ン挜話ュ挕紥タ挜皰ラ挜諕ィ挜脪ク挜箌捠珺10捗� | | 39
-挜硳ン挜話ュ挕紥タ挜讙ロ挜皰ラ挜迴〖 |捒蚙01挷� | | 36
+select *,octet_length(捦褣胳) from 挿讙换挼脱捀�;
+ 捦褣胳 | 捠瑨梧挜硳〖挜� | 捜鲯雇1a挙罀よ | octet_length
+-----------------------------------------+-----------------+----------------+--------------
+ 挜硳ン挜話ュ挕紥タ挜菕ィ挜箳プ挜鞉イ | 挼01捑� | | 36
+ 挜硳ン挜話ュ挕紥タ挜皰ラ挜諕ィ挜脪ク挜� | 捠珺10捗� | | 39
+ 挜硳ン挜話ュ挕紥タ挜讙ロ挜皰ラ挜迴〖 | 捒蚙01挷� | | 36
(3 rows)
-QUERY: select *,position('挜�' in 捦褣胳) from 挿讙换挼脱捀�;
-捦褣胳 |捠瑨梧挜硳〖挜蓔捜鲯雇1a挙罀よ|strpos
----------------------------------------+---------------+--------------+------
-挜硳ン挜話ュ挕紥タ挜菕ィ挜箳プ挜鞉イ |挼01捑� | | 7
-挜硳ン挜話ュ挕紥タ挜皰ラ挜諕ィ挜脪ク挜箌捠珺10捗� | | 0
-挜硳ン挜話ュ挕紥タ挜讙ロ挜皰ラ挜迴〖 |捒蚙01挷� | | 0
+select *,position('挜�' in 捦褣胳) from 挿讙换挼脱捀�;
+ 捦褣胳 | 捠瑨梧挜硳〖挜� | 捜鲯雇1a挙罀よ | strpos
+-----------------------------------------+-----------------+----------------+--------
+ 挜硳ン挜話ュ挕紥タ挜菕ィ挜箳プ挜鞉イ | 挼01捑� | | 7
+ 挜硳ン挜話ュ挕紥タ挜皰ラ挜諕ィ挜脪ク挜� | 捠珺10捗� | | 0
+ 挜硳ン挜話ュ挕紥タ挜讙ロ挜皰ラ挜迴〖 | 捒蚙01挷� | | 0
(3 rows)
-QUERY: select *,substring(捦褣胳 from 10 for 4) from 挿讙换挼脱捀�;
-捦褣胳 |捠瑨梧挜硳〖挜蓔捜鲯雇1a挙罀よ|substr
----------------------------------------+---------------+--------------+------------
-挜硳ン挜話ュ挕紥タ挜菕ィ挜箳プ挜鞉イ |挼01捑� | |挜讙レ挜�
-挜硳ン挜話ュ挕紥タ挜皰ラ挜諕ィ挜脪ク挜箌捠珺10捗� | |挜ッ挜瘨ス
-挜硳ン挜話ュ挕紥タ挜讙ロ挜皰ラ挜迴〖 |捒蚙01挷� | |挜閽マ挕�
+select *,substring(捦褣胳 from 10 for 4) from 挿讙换挼脱捀�;
+ 捦褣胳 | 捠瑨梧挜硳〖挜� | 捜鲯雇1a挙罀よ | substr
+-----------------------------------------+-----------------+----------------+--------------
+ 挜硳ン挜話ュ挕紥タ挜菕ィ挜箳プ挜鞉イ | 挼01捑� | | 挜讙レ挜�
+ 挜硳ン挜話ュ挕紥タ挜皰ラ挜諕ィ挜脪ク挜� | 捠珺10捗� | | 挜ッ挜瘨ス
+ 挜硳ン挜話ュ挕紥タ挜讙ロ挜皰ラ挜迴〖 | 捒蚙01挷� | | 挜閽マ挕�
(3 rows)
-QUERY: drop table 懠茟算懟鷳术懹�;
+drop table 懠茟算懟鷳术懹�;
ERROR: Relation '懠茟算懟鷳术懹�' does not exist
-QUERY: create table 懠茟算懟鷳术懹�(懯鯌语 text, 懛謶类懞� varchar, 懕笐注1A char(16));
-QUERY: create index 懠茟算懟鷳术懹飅ndex1 on 懠茟算懟鷳术懹� using btree(懯鯌语);
-QUERY: create index 懠茟算懟鷳术懹飅ndex2 on 懠茟算懟鷳术懹� using btree(懛謶类懞�);
-QUERY: insert into 懠茟算懟鷳术懹� values('懙鐟脑懴詰示懫�','懟鶤01懮�');
-QUERY: insert into 懠茟算懟鷳术懹� values('懙鐟脑懲紤形','懛諦01懼�');
-QUERY: insert into 懠茟算懟鷳术懹� values('懙鐟脑懗虘序懺�','懭薢01懴�');
-QUERY: vacuum 懠茟算懟鷳术懹�;
-QUERY: select * from 懠茟算懟鷳术懹�;
-懯鯌语 |懛謶类懞舼懕笐注1a
----------------+---------+--------
-懙鐟脑懴詰示懫羭懟鶤01懮蟶
-懙鐟脑懲紤形 |懛諦01懼衸
-懙鐟脑懗虘序懺眧懭薢01懴聕
+create table 懠茟算懟鷳术懹�(懯鯌语 text, 懛謶类懞� varchar, 懕笐注1A char(16));
+create index 懠茟算懟鷳术懹飅ndex1 on 懠茟算懟鷳术懹� using btree(懯鯌语);
+create index 懠茟算懟鷳术懹飅ndex2 on 懠茟算懟鷳术懹� using btree(懛謶类懞�);
+insert into 懠茟算懟鷳术懹� values('懙鐟脑懴詰示懫�','懟鶤01懮�');
+insert into 懠茟算懟鷳术懹� values('懙鐟脑懲紤形','懛諦01懼�');
+insert into 懠茟算懟鷳术懹� values('懙鐟脑懗虘序懺�','懭薢01懴�');
+vacuum 懠茟算懟鷳术懹�;
+select * from 懠茟算懟鷳术懹�;
+ 懯鯌语 | 懛謶类懞� | 懕笐注1a
+-----------------+-----------+----------
+ 懙鐟脑懴詰示懫� | 懟鶤01懮� |
+ 懙鐟脑懲紤形 | 懛諦01懼� |
+ 懙鐟脑懗虘序懺� | 懭薢01懴� |
(3 rows)
-QUERY: select * from 懠茟算懟鷳术懹� where 懛謶类懞� = '懭薢01懴�';
-懯鯌语 |懛謶类懞舼懕笐注1a
----------------+---------+--------
-懙鐟脑懗虘序懺眧懭薢01懴聕
+select * from 懠茟算懟鷳术懹� where 懛謶类懞� = '懭薢01懴�';
+ 懯鯌语 | 懛謶类懞� | 懕笐注1a
+-----------------+-----------+----------
+ 懙鐟脑懗虘序懺� | 懭薢01懴� |
(1 row)
-QUERY: select * from 懠茟算懟鷳术懹� where 懛謶类懞� ~* '懭藌01懴�';
-懯鯌语 |懛謶类懞舼懕笐注1a
----------------+---------+--------
-懙鐟脑懗虘序懺眧懭薢01懴聕
+select * from 懠茟算懟鷳术懹� where 懛謶类懞� ~* '懭藌01懴�';
+ 懯鯌语 | 懛謶类懞� | 懕笐注1a
+-----------------+-----------+----------
+ 懙鐟脑懗虘序懺� | 懭薢01懴� |
(1 row)
-QUERY: select * from 懠茟算懟鷳术懹� where 懛謶类懞� like '_Z01_';
-懯鯌语 |懛謶类懞舼懕笐注1a
----------------+---------+--------
-懙鐟脑懗虘序懺眧懭薢01懴聕
+select * from 懠茟算懟鷳术懹� where 懛謶类懞� like '_Z01_';
+ 懯鯌语 | 懛謶类懞� | 懕笐注1a
+-----------------+-----------+----------
+ 懙鐟脑懗虘序懺� | 懭薢01懴� |
(1 row)
-QUERY: select * from 懠茟算懟鷳术懹� where 懛謶类懞� like '_Z%';
-懯鯌语 |懛謶类懞舼懕笐注1a
----------------+---------+--------
-懙鐟脑懗虘序懺眧懭薢01懴聕
+select * from 懠茟算懟鷳术懹� where 懛謶类懞� like '_Z%';
+ 懯鯌语 | 懛謶类懞� | 懕笐注1a
+-----------------+-----------+----------
+ 懙鐟脑懗虘序懺� | 懭薢01懴� |
(1 row)
-QUERY: select * from 懠茟算懟鷳术懹� where 懯鯌语 ~ '懙鐟脑[懴詰图]';
-懯鯌语 |懛謶类懞舼懕笐注1a
----------------+---------+--------
-懙鐟脑懴詰示懫羭懟鶤01懮蟶
-懙鐟脑懲紤形 |懛諦01懼衸
+select * from 懠茟算懟鷳术懹� where 懯鯌语 ~ '懙鐟脑[懴詰图]';
+ 懯鯌语 | 懛謶类懞� | 懕笐注1a
+-----------------+-----------+----------
+ 懙鐟脑懴詰示懫� | 懟鶤01懮� |
+ 懙鐟脑懲紤形 | 懛諦01懼� |
(2 rows)
-QUERY: select * from 懠茟算懟鷳术懹� where 懯鯌语 ~* '懙鐟脑[懴詰图]';
-懯鯌语 |懛謶类懞舼懕笐注1a
----------------+---------+--------
-懙鐟脑懴詰示懫羭懟鶤01懮蟶
-懙鐟脑懲紤形 |懛諦01懼衸
+select * from 懠茟算懟鷳术懹� where 懯鯌语 ~* '懙鐟脑[懴詰图]';
+ 懯鯌语 | 懛謶类懞� | 懕笐注1a
+-----------------+-----------+----------
+ 懙鐟脑懴詰示懫� | 懟鶤01懮� |
+ 懙鐟脑懲紤形 | 懛諦01懼� |
(2 rows)
-QUERY: select *,character_length(懯鯌语) from 懠茟算懟鷳术懹�;
-懯鯌语 |懛謶类懞舼懕笐注1a|length
----------------+---------+--------+------
-懙鐟脑懴詰示懫羭懟鶤01懮蟶 | 5
-懙鐟脑懲紤形 |懛諦01懼衸 | 4
-懙鐟脑懗虘序懺眧懭薢01懴聕 | 5
+select *,character_length(懯鯌语) from 懠茟算懟鷳术懹�;
+ 懯鯌语 | 懛謶类懞� | 懕笐注1a | char_length
+-----------------+-----------+----------+-------------
+ 懙鐟脑懴詰示懫� | 懟鶤01懮� | | 5
+ 懙鐟脑懲紤形 | 懛諦01懼� | | 4
+ 懙鐟脑懗虘序懺� | 懭薢01懴� | | 5
(3 rows)
-QUERY: select *,octet_length(懯鯌语) from 懠茟算懟鷳术懹�;
-懯鯌语 |懛謶类懞舼懕笐注1a|octet_length
----------------+---------+--------+------------
-懙鐟脑懴詰示懫羭懟鶤01懮蟶 | 15
-懙鐟脑懲紤形 |懛諦01懼衸 | 12
-懙鐟脑懗虘序懺眧懭薢01懴聕 | 15
+select *,octet_length(懯鯌语) from 懠茟算懟鷳术懹�;
+ 懯鯌语 | 懛謶类懞� | 懕笐注1a | octet_length
+-----------------+-----------+----------+--------------
+ 懙鐟脑懴詰示懫� | 懟鶤01懮� | | 15
+ 懙鐟脑懲紤形 | 懛諦01懼� | | 12
+ 懙鐟脑懗虘序懺� | 懭薢01懴� | | 15
(3 rows)
-QUERY: select *,position('懴�' in 懯鯌语) from 懠茟算懟鷳术懹�;
-懯鯌语 |懛謶类懞舼懕笐注1a|strpos
----------------+---------+--------+------
-懙鐟脑懴詰示懫羭懟鶤01懮蟶 | 3
-懙鐟脑懲紤形 |懛諦01懼衸 | 0
-懙鐟脑懗虘序懺眧懭薢01懴聕 | 0
+select *,position('懴�' in 懯鯌语) from 懠茟算懟鷳术懹�;
+ 懯鯌语 | 懛謶类懞� | 懕笐注1a | strpos
+-----------------+-----------+----------+--------
+ 懙鐟脑懴詰示懫� | 懟鶤01懮� | | 3
+ 懙鐟脑懲紤形 | 懛諦01懼� | | 0
+ 懙鐟脑懗虘序懺� | 懭薢01懴� | | 0
(3 rows)
-QUERY: select *,substring(懯鯌语 from 3 for 4) from 懠茟算懟鷳术懹�;
-懯鯌语 |懛謶类懞舼懕笐注1a|substr
----------------+---------+--------+---------
-懙鐟脑懴詰示懫羭懟鶤01懮蟶 |懴詰示懫�
-懙鐟脑懲紤形 |懛諦01懼衸 |懲紤形
-懙鐟脑懗虘序懺眧懭薢01懴聕 |懗虘序懺�
+select *,substring(懯鯌语 from 3 for 4) from 懠茟算懟鷳术懹�;
+ 懯鯌语 | 懛謶类懞� | 懕笐注1a | substr
+-----------------+-----------+----------+-----------
+ 懙鐟脑懴詰示懫� | 懟鶤01懮� | | 懴詰示懫�
+ 懙鐟脑懲紤形 | 懛諦01懼� | | 懲紤形
+ 懙鐟脑懗虘序懺� | 懭薢01懴� | | 懗虘序懺�
(3 rows)
-QUERY: drop table 撏獡擤撗侩摼�;
+drop table 撏獡擤撗侩摼�;
ERROR: Relation '撏獡擤撗侩摼�' does not exist
-QUERY: create table 撏獡擤撗侩摼� (摽霌绢 text, 撦聯拙撃趽靛 varchar, 摵駬绊1A摱髶备 char(16));
-QUERY: create index 撏獡擤撗侩摼頸ndex1 on 撏獡擤撗侩摼� using btree (摽霌绢);
-QUERY: create index 撏獡擤撗侩摼頸ndex2 on 撏獡擤撗侩摼� using hash (撦聯拙撃趽靛);
-QUERY: insert into 撏獡擤撗侩摼� values('撃膿腔撆蛽叼摻簱敲摲箵捞', '撗01撨�');
-QUERY: insert into 撏獡擤撗侩摼� values('撃膿腔撆蛽弊摲侨摻�', '撦翨10擇�');
-QUERY: insert into 撏獡擤撗侩摼� values('撃膿腔撆蛽橇摲螕弊摲赣', '撿裐01擓�');
-QUERY: vacuum 撏獡擤撗侩摼�;
-QUERY: select * from 撏獡擤撗侩摼�;
-摽霌绢 |撦聯拙撃趽靛|摵駬绊1a摱髶备
-------------------------+------------+--------------
-撃膿腔撆蛽叼摻簱敲摲箵捞|撗01撨� |
-撃膿腔撆蛽弊摲侨摻� |撦翨10擇� |
-撃膿腔撆蛽橇摲螕弊摲赣|撿裐01擓� |
+create table 撏獡擤撗侩摼� (摽霌绢 text, 撦聯拙撃趽靛 varchar, 摵駬绊1A摱髶备 char(16));
+create index 撏獡擤撗侩摼頸ndex1 on 撏獡擤撗侩摼� using btree (摽霌绢);
+create index 撏獡擤撗侩摼頸ndex2 on 撏獡擤撗侩摼� using hash (撦聯拙撃趽靛);
+insert into 撏獡擤撗侩摼� values('撃膿腔撆蛽叼摻簱敲摲箵捞', '撗01撨�');
+insert into 撏獡擤撗侩摼� values('撃膿腔撆蛽弊摲侨摻�', '撦翨10擇�');
+insert into 撏獡擤撗侩摼� values('撃膿腔撆蛽橇摲螕弊摲赣', '撿裐01擓�');
+vacuum 撏獡擤撗侩摼�;
+select * from 撏獡擤撗侩摼�;
+ 摽霌绢 | 撦聯拙撃趽靛 | 摵駬绊1a摱髶备
+--------------------------+--------------+----------------
+ 撃膿腔撆蛽叼摻簱敲摲箵捞 | 撗01撨� |
+ 撃膿腔撆蛽弊摲侨摻� | 撦翨10擇� |
+ 撃膿腔撆蛽橇摲螕弊摲赣 | 撿裐01擓� |
(3 rows)
-QUERY: select * from 撏獡擤撗侩摼� where 撦聯拙撃趽靛 = '撿裐01擓�';
-摽霌绢 |撦聯拙撃趽靛|摵駬绊1a摱髶备
-------------------------+------------+--------------
-撃膿腔撆蛽橇摲螕弊摲赣|撿裐01擓� |
+select * from 撏獡擤撗侩摼� where 撦聯拙撃趽靛 = '撿裐01擓�';
+ 摽霌绢 | 撦聯拙撃趽靛 | 摵駬绊1a摱髶备
+--------------------------+--------------+----------------
+ 撃膿腔撆蛽橇摲螕弊摲赣 | 撿裐01擓� |
(1 row)
-QUERY: select * from 撏獡擤撗侩摼� where 撦聯拙撃趽靛 ~* '撿褄01擓�';
-摽霌绢 |撦聯拙撃趽靛|摵駬绊1a摱髶备
-------------------------+------------+--------------
-撃膿腔撆蛽橇摲螕弊摲赣|撿裐01擓� |
+select * from 撏獡擤撗侩摼� where 撦聯拙撃趽靛 ~* '撿褄01擓�';
+ 摽霌绢 | 撦聯拙撃趽靛 | 摵駬绊1a摱髶备
+--------------------------+--------------+----------------
+ 撃膿腔撆蛽橇摲螕弊摲赣 | 撿裐01擓� |
(1 row)
-QUERY: select * from 撏獡擤撗侩摼� where 撦聯拙撃趽靛 like '_Z01_';
-摽霌绢 |撦聯拙撃趽靛|摵駬绊1a摱髶备
-------------------------+------------+--------------
-撃膿腔撆蛽橇摲螕弊摲赣|撿裐01擓� |
+select * from 撏獡擤撗侩摼� where 撦聯拙撃趽靛 like '_Z01_';
+ 摽霌绢 | 撦聯拙撃趽靛 | 摵駬绊1a摱髶备
+--------------------------+--------------+----------------
+ 撃膿腔撆蛽橇摲螕弊摲赣 | 撿裐01擓� |
(1 row)
-QUERY: select * from 撏獡擤撗侩摼� where 撦聯拙撃趽靛 like '_Z%';
-摽霌绢 |撦聯拙撃趽靛|摵駬绊1a摱髶备
-------------------------+------------+--------------
-撃膿腔撆蛽橇摲螕弊摲赣|撿裐01擓� |
+select * from 撏獡擤撗侩摼� where 撦聯拙撃趽靛 like '_Z%';
+ 摽霌绢 | 撦聯拙撃趽靛 | 摵駬绊1a摱髶备
+--------------------------+--------------+----------------
+ 撃膿腔撆蛽橇摲螕弊摲赣 | 撿裐01擓� |
(1 row)
-QUERY: select * from 撏獡擤撗侩摼� where 摽霌绢 ~ '撃膿腔撆蚚摰饟弊]';
-摽霌绢 |撦聯拙撃趽靛|摵駬绊1a摱髶备
-------------------------+------------+--------------
-撃膿腔撆蛽叼摻簱敲摲箵捞|撗01撨� |
-撃膿腔撆蛽弊摲侨摻� |撦翨10擇� |
+select * from 撏獡擤撗侩摼� where 摽霌绢 ~ '撃膿腔撆蚚摰饟弊]';
+ 摽霌绢 | 撦聯拙撃趽靛 | 摵駬绊1a摱髶备
+--------------------------+--------------+----------------
+ 撃膿腔撆蛽叼摻簱敲摲箵捞 | 撗01撨� |
+ 撃膿腔撆蛽弊摲侨摻� | 撦翨10擇� |
(2 rows)
-QUERY: select * from 撏獡擤撗侩摼� where 摽霌绢 ~* '撃膿腔撆蚚摰饟弊]';
-摽霌绢 |撦聯拙撃趽靛|摵駬绊1a摱髶备
-------------------------+------------+--------------
-撃膿腔撆蛽叼摻簱敲摲箵捞|撗01撨� |
-撃膿腔撆蛽弊摲侨摻� |撦翨10擇� |
+select * from 撏獡擤撗侩摼� where 摽霌绢 ~* '撃膿腔撆蚚摰饟弊]';
+ 摽霌绢 | 撦聯拙撃趽靛 | 摵駬绊1a摱髶备
+--------------------------+--------------+----------------
+ 撃膿腔撆蛽叼摻簱敲摲箵捞 | 撗01撨� |
+ 撃膿腔撆蛽弊摲侨摻� | 撦翨10擇� |
(2 rows)
-QUERY: select *,character_length(摽霌绢) from 撏獡擤撗侩摼�;
-摽霌绢 |撦聯拙撃趽靛|摵駬绊1a摱髶备|length
-------------------------+------------+--------------+------
-撃膿腔撆蛽叼摻簱敲摲箵捞|撗01撨� | | 8
-撃膿腔撆蛽弊摲侨摻� |撦翨10擇� | | 7
-撃膿腔撆蛽橇摲螕弊摲赣|撿裐01擓� | | 8
+select *,character_length(摽霌绢) from 撏獡擤撗侩摼�;
+ 摽霌绢 | 撦聯拙撃趽靛 | 摵駬绊1a摱髶备 | char_length
+--------------------------+--------------+----------------+-------------
+ 撃膿腔撆蛽叼摻簱敲摲箵捞 | 撗01撨� | | 8
+ 撃膿腔撆蛽弊摲侨摻� | 撦翨10擇� | | 7
+ 撃膿腔撆蛽橇摲螕弊摲赣 | 撿裐01擓� | | 8
(3 rows)
-QUERY: select *,octet_length(摽霌绢) from 撏獡擤撗侩摼�;
-摽霌绢 |撦聯拙撃趽靛|摵駬绊1a摱髶备|octet_length
-------------------------+------------+--------------+------------
-撃膿腔撆蛽叼摻簱敲摲箵捞|撗01撨� | | 24
-撃膿腔撆蛽弊摲侨摻� |撦翨10擇� | | 21
-撃膿腔撆蛽橇摲螕弊摲赣|撿裐01擓� | | 24
+select *,octet_length(摽霌绢) from 撏獡擤撗侩摼�;
+ 摽霌绢 | 撦聯拙撃趽靛 | 摵駬绊1a摱髶备 | octet_length
+--------------------------+--------------+----------------+--------------
+ 撃膿腔撆蛽叼摻簱敲摲箵捞 | 撗01撨� | | 24
+ 撃膿腔撆蛽弊摲侨摻� | 撦翨10擇� | | 21
+ 撃膿腔撆蛽橇摲螕弊摲赣 | 撿裐01擓� | | 24
(3 rows)
-QUERY: select *,position('摰�' in 摽霌绢) from 撏獡擤撗侩摼�;
-摽霌绢 |撦聯拙撃趽靛|摵駬绊1a摱髶备|strpos
-------------------------+------------+--------------+------
-撃膿腔撆蛽叼摻簱敲摲箵捞|撗01撨� | | 4
-撃膿腔撆蛽弊摲侨摻� |撦翨10擇� | | 0
-撃膿腔撆蛽橇摲螕弊摲赣|撿裐01擓� | | 0
+select *,position('摰�' in 摽霌绢) from 撏獡擤撗侩摼�;
+ 摽霌绢 | 撦聯拙撃趽靛 | 摵駬绊1a摱髶备 | strpos
+--------------------------+--------------+----------------+--------
+ 撃膿腔撆蛽叼摻簱敲摲箵捞 | 撗01撨� | | 4
+ 撃膿腔撆蛽弊摲侨摻� | 撦翨10擇� | | 0
+ 撃膿腔撆蛽橇摲螕弊摲赣 | 撿裐01擓� | | 0
(3 rows)
-QUERY: select *,substring(摽霌绢 from 3 for 4) from 撏獡擤撗侩摼�;
-摽霌绢 |撦聯拙撃趽靛|摵駬绊1a摱髶备|substr
-------------------------+------------+--------------+------------
-撃膿腔撆蛽叼摻簱敲摲箵捞|撗01撨� | |撆蛽叼摻簱敲
-撃膿腔撆蛽弊摲侨摻� |撦翨10擇� | |撆蛽弊摲侨
-撃膿腔撆蛽橇摲螕弊摲赣|撿裐01擓� | |撆蛽橇摲螕弊
+select *,substring(摽霌绢 from 3 for 4) from 撏獡擤撗侩摼�;
+ 摽霌绢 | 撦聯拙撃趽靛 | 摵駬绊1a摱髶备 | substr
+--------------------------+--------------+----------------+--------------
+ 撃膿腔撆蛽叼摻簱敲摲箵捞 | 撗01撨� | | 撆蛽叼摻簱敲
+ 撃膿腔撆蛽弊摲侨摻� | 撦翨10擇� | | 撆蛽弊摲侨
+ 撃膿腔撆蛽橇摲螕弊摲赣 | 撿裐01擓� | | 撆蛽橇摲螕弊
(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伹AIS');
-QUERY: insert into test values('ESPA佈OL');
-QUERY: insert into test values('佂SLENSKA');
-QUERY: insert into test values('ENGLISH FRAN伹AIS ESPA佈OL 佂SLENSKA');
-QUERY: vacuum test;
-QUERY: select * from test;
-t
-------------------------------------
-ENGLISH
-FRAN伹AIS
-ESPA佈OL
-佂SLENSKA
-ENGLISH FRAN伹AIS ESPA佈OL 佂SLENSKA
+create table test (t text);
+insert into test values('ENGLISH');
+insert into test values('FRAN伹AIS');
+insert into test values('ESPA佈OL');
+insert into test values('佂SLENSKA');
+insert into test values('ENGLISH FRAN伹AIS ESPA佈OL 佂SLENSKA');
+vacuum test;
+select * from test;
+ t
+--------------------------------------
+ ENGLISH
+ FRAN伹AIS
+ ESPA佈OL
+ 佂SLENSKA
+ ENGLISH FRAN伹AIS ESPA佈OL 佂SLENSKA
(5 rows)
-QUERY: select * from test where t = 'ESPA佈OL';
-t
---------
-ESPA佈OL
+select * from test where t = 'ESPA佈OL';
+ t
+----------
+ ESPA佈OL
(1 row)
-QUERY: select * from test where t ~* 'espa佈ol';
-t
-------------------------------------
-ESPA佈OL
-ENGLISH FRAN伹AIS ESPA佈OL 佂SLENSKA
+select * from test where t ~* 'espa佈ol';
+ t
+--------------------------------------
+ ESPA佈OL
+ ENGLISH FRAN伹AIS ESPA佈OL 佂SLENSKA
(2 rows)
-QUERY: select *,character_length(t) from test;
-t |length
-------------------------------------+------
-ENGLISH | 7
-FRAN伹AIS | 8
-ESPA佈OL | 7
-佂SLENSKA | 8
-ENGLISH FRAN伹AIS ESPA佈OL 佂SLENSKA| 33
+select *,character_length(t) from test;
+ t | char_length
+--------------------------------------+-------------
+ ENGLISH | 7
+ FRAN伹AIS | 8
+ ESPA佈OL | 7
+ 佂SLENSKA | 8
+ ENGLISH FRAN伹AIS ESPA佈OL 佂SLENSKA | 33
(5 rows)
-QUERY: select *,octet_length(t) from test;
-t |octet_length
-------------------------------------+------------
-ENGLISH | 7
-FRAN伹AIS | 9
-ESPA佈OL | 8
-佂SLENSKA | 9
-ENGLISH FRAN伹AIS ESPA佈OL 佂SLENSKA| 36
+select *,octet_length(t) from test;
+ t | octet_length
+--------------------------------------+--------------
+ ENGLISH | 7
+ FRAN伹AIS | 9
+ ESPA佈OL | 8
+ 佂SLENSKA | 9
+ ENGLISH FRAN伹AIS ESPA佈OL 佂SLENSKA | 36
(5 rows)
-QUERY: select *,position('L' in t) from test;
-t |strpos
-------------------------------------+------
-ENGLISH | 4
-FRAN伹AIS | 0
-ESPA佈OL | 7
-佂SLENSKA | 3
-ENGLISH FRAN伹AIS ESPA佈OL 佂SLENSKA| 4
+select *,position('L' in t) from test;
+ t | strpos
+--------------------------------------+--------
+ ENGLISH | 4
+ FRAN伹AIS | 0
+ ESPA佈OL | 7
+ 佂SLENSKA | 3
+ ENGLISH FRAN伹AIS ESPA佈OL 佂SLENSKA | 4
(5 rows)
-QUERY: select *,substring(t from 3 for 4) from test;
-t |substr
-------------------------------------+------
-ENGLISH |GLIS
-FRAN伹AIS |AN伹A
-ESPA佈OL |PA佈O
-佂SLENSKA |LENS
-ENGLISH FRAN伹AIS ESPA佈OL 佂SLENSKA|GLIS
+select *,substring(t from 3 for 4) from test;
+ t | substr
+--------------------------------------+--------
+ ENGLISH | GLIS
+ FRAN伹AIS | AN伹A
+ ESPA佈OL | PA佈O
+ 佂SLENSKA | LENS
+ ENGLISH FRAN伹AIS ESPA佈OL 佂SLENSKA | GLIS
(5 rows)
diff --git a/src/test/regress/expected/sql_ascii.out b/src/test/regress/expected/sql_ascii.out
index 5e92cc1fad4..5b7c03575fd 100644
--- 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;
--
GitLab