postgres.git / summary / log / commit / refs

commit    805e0c45899d08dbc8593341010004772dcd1ee8
Author:   Tatsuo Ishii <ishii@postgresql.org>
Date:     Thu Mar 16 11:53:16 2000 +0000
First released in: 7.0

    Fixes for char_length() changes.


src/test/mb/expected/big5.out | 48 ++++----- src/test/mb/expected/euc_cn.out | 48 ++++----- src/test/mb/expected/euc_jp.out | 48 ++++----- src/test/mb/expected/euc_kr.out | 48 ++++----- src/test/mb/expected/euc_tw.out | 48 ++++----- src/test/mb/expected/mule_internal.out | 188 ++++++++++++++++----------------- src/test/mb/expected/sjis.out | 50 ++++----- src/test/mb/expected/unicode.out | 48 ++++----- 8 files changed, 263 insertions(+), 263 deletions(-) diff --git a/src/test/mb/expected/big5.out b/src/test/mb/expected/big5.out index 702579eebaa..14ae2be29a4 100644 --- a/src/test/mb/expected/big5.out +++ b/src/test/mb/expected/big5.out @@ -1,12 +1,12 @@ -drop table 廠商資料 -create table 廠商資料 (行業別 text, 公司抬頭 varchar, 地址 varchar(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 廠商資料 +drop table 廠商資料; +create table 廠商資料 (行業別 text, 公司抬頭 varchar, 地址 varchar(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 廠商資料; 行業別 | 公司抬頭 | 地址 --------+------------------+--------- 電腦業 | 達達科技 | 北A01仁 @@ -14,51 +14,51 @@ select * from 餐飲業 | 美味股份有限公司 | 高Z01九 (3 rows) -select * from 廠商資料 where 地址 = '高Z01九' +select * from 廠商資料 where 地址 = '高Z01九'; 行業別 | 公司抬頭 | 地址 --------+------------------+--------- 餐飲業 | 美味股份有限公司 | 高Z01九 (1 row) -select * from 廠商資料 where 地址 ~* '高z01九' +select * from 廠商資料 where 地址 ~* '高z01九'; 行業別 | 公司抬頭 | 地址 --------+------------------+--------- 餐飲業 | 美味股份有限公司 | 高Z01九 (1 row) -select * from 廠商資料 where 地址 like '_Z01_' +select * from 廠商資料 where 地址 like '_Z01_'; 行業別 | 公司抬頭 | 地址 --------+------------------+--------- 餐飲業 | 美味股份有限公司 | 高Z01九 (1 row) -select * from 廠商資料 where 地址 like '_Z%' +select * from 廠商資料 where 地址 like '_Z%'; 行業別 | 公司抬頭 | 地址 --------+------------------+--------- 餐飲業 | 美味股份有限公司 | 高Z01九 (1 row) -select * from 廠商資料 where 公司抬頭 ~ '達達科[寄記技]' +select * from 廠商資料 where 公司抬頭 ~ '達達科[寄記技]'; 行業別 | 公司抬頭 | 地址 --------+----------+--------- 電腦業 | 達達科技 | 北A01仁 (1 row) -select * from 廠商資料 where 公司抬頭 ~* '達達科[寄記技]' +select * from 廠商資料 where 公司抬頭 ~* '達達科[寄記技]'; 行業別 | 公司抬頭 | 地址 --------+----------+--------- 電腦業 | 達達科技 | 北A01仁 (1 row) -select *, character_length(行業別) from 廠商資料 - 行業別 | 公司抬頭 | 地址 | length ---------+------------------+---------+-------- - 電腦業 | 達達科技 | 北A01仁 | 3 - 製造業 | 財源有限公司 | 中B10中 | 3 - 餐飲業 | 美味股份有限公司 | 高Z01九 | 3 +select *, character_length(行業別) from 廠商資料; + 行業別 | 公司抬頭 | 地址 | char_length +--------+------------------+---------+------------- + 電腦業 | 達達科技 | 北A01仁 | 3 + 製造業 | 財源有限公司 | 中B10中 | 3 + 餐飲業 | 美味股份有限公司 | 高Z01九 | 3 (3 rows) -select *, octet_length(行業別) from 廠商資料 +select *, octet_length(行業別) from 廠商資料; 行業別 | 公司抬頭 | 地址 | octet_length --------+------------------+---------+-------------- 電腦業 | 達達科技 | 北A01仁 | 6 @@ -66,7 +66,7 @@ select *, octet_length( 餐飲業 | 美味股份有限公司 | 高Z01九 | 6 (3 rows) -select *, position('有限' in 公司抬頭) from 廠商資料 +select *, position('有限' in 公司抬頭) from 廠商資料; 行業別 | 公司抬頭 | 地址 | strpos --------+------------------+---------+-------- 電腦業 | 達達科技 | 北A01仁 | 0 @@ -74,7 +74,7 @@ select *, position(' 餐飲業 | 美味股份有限公司 | 高Z01九 | 5 (3 rows) -select *, substring(公司抬頭 from 3 for 6 ) from 廠商資料 +select *, substring(公司抬頭 from 3 for 6 ) from 廠商資料; 行業別 | 公司抬頭 | 地址 | substr --------+------------------+---------+-------------- 電腦業 | 達達科技 | 北A01仁 | 科技 diff --git a/src/test/mb/expected/euc_cn.out b/src/test/mb/expected/euc_cn.out index 93ff30c25af..7fdb13cfe5d 100644 --- a/src/test/mb/expected/euc_cn.out +++ b/src/test/mb/expected/euc_cn.out @@ -1,13 +1,13 @@ -drop table 數呾儂扲逄 +drop table 數呾儂扲逄; ERROR: Relation '數呾儂扲逄' does not exist -create table 數呾儂扲逄(扲逄 text, 煦濬瘍 varchar, 掘蛁1A char(16)) -create index 數呾儂扲逄index1 on 數呾儂扲逄 using btree(扲逄) -create index 數呾儂扲逄index2 on 數呾儂扲逄 using btree(煦濬瘍) -insert into 數呾儂扲逄 values('萇齟珆尨そ','儂A01奻') -insert into 數呾儂扲逄 values('萇齟芞倛','煦B01笢') -insert into 數呾儂扲逄 values('萇齟最唗埜','�汳01狟') -vacuum 數呾儂扲逄 -select * from 數呾儂扲逄 +create table 數呾儂扲逄(扲逄 text, 煦濬瘍 varchar, 掘蛁1A char(16)); +create index 數呾儂扲逄index1 on 數呾儂扲逄 using btree(扲逄); +create index 數呾儂扲逄index2 on 數呾儂扲逄 using btree(煦濬瘍); +insert into 數呾儂扲逄 values('萇齟珆尨そ','儂A01奻'); +insert into 數呾儂扲逄 values('萇齟芞倛','煦B01笢'); +insert into 數呾儂扲逄 values('萇齟最唗埜','�汳01狟'); +vacuum 數呾儂扲逄; +select * from 數呾儂扲逄; 扲逄 | 煦濬瘍 | 掘蛁1a ------------+---------+-------- 萇齟珆尨そ | 儂A01奻 | @@ -15,53 +15,53 @@ select * from 萇齟最唗埜 | �汳01狟 | (3 rows) -select * from 數呾儂扲逄 where 煦濬瘍 = '�汳01狟' +select * from 數呾儂扲逄 where 煦濬瘍 = '�汳01狟'; 扲逄 | 煦濬瘍 | 掘蛁1a ------------+---------+-------- 萇齟最唗埜 | �汳01狟 | (1 row) -select * from 數呾儂扲逄 where 煦濬瘍 ~* '�芏01狟' +select * from 數呾儂扲逄 where 煦濬瘍 ~* '�芏01狟'; 扲逄 | 煦濬瘍 | 掘蛁1a ------------+---------+-------- 萇齟最唗埜 | �汳01狟 | (1 row) -select * from 數呾儂扲逄 where 煦濬瘍 like '_Z01_' +select * from 數呾儂扲逄 where 煦濬瘍 like '_Z01_'; 扲逄 | 煦濬瘍 | 掘蛁1a ------------+---------+-------- 萇齟最唗埜 | �汳01狟 | (1 row) -select * from 數呾儂扲逄 where 煦濬瘍 like '_Z%' +select * from 數呾儂扲逄 where 煦濬瘍 like '_Z%'; 扲逄 | 煦濬瘍 | 掘蛁1a ------------+---------+-------- 萇齟最唗埜 | �汳01狟 | (1 row) -select * from 數呾儂扲逄 where 扲逄 ~ '萇齟[珆芞]' +select * from 數呾儂扲逄 where 扲逄 ~ '萇齟[珆芞]'; 扲逄 | 煦濬瘍 | 掘蛁1a ------------+---------+-------- 萇齟珆尨そ | 儂A01奻 | 萇齟芞倛 | 煦B01笢 | (2 rows) -select * from 數呾儂扲逄 where 扲逄 ~* '萇齟[珆芞]' +select * from 數呾儂扲逄 where 扲逄 ~* '萇齟[珆芞]'; 扲逄 | 煦濬瘍 | 掘蛁1a ------------+---------+-------- 萇齟珆尨そ | 儂A01奻 | 萇齟芞倛 | 煦B01笢 | (2 rows) -select *,character_length(扲逄) from 數呾儂扲逄 - 扲逄 | 煦濬瘍 | 掘蛁1a | length -------------+---------+--------+-------- - 萇齟珆尨そ | 儂A01奻 | | 5 - 萇齟芞倛 | 煦B01笢 | | 4 - 萇齟最唗埜 | �汳01狟 | | 5 +select *,character_length(扲逄) from 數呾儂扲逄; + 扲逄 | 煦濬瘍 | 掘蛁1a | char_length +------------+---------+--------+------------- + 萇齟珆尨そ | 儂A01奻 | | 5 + 萇齟芞倛 | 煦B01笢 | | 4 + 萇齟最唗埜 | �汳01狟 | | 5 (3 rows) -select *,octet_length(扲逄) from 數呾儂扲逄 +select *,octet_length(扲逄) from 數呾儂扲逄; 扲逄 | 煦濬瘍 | 掘蛁1a | octet_length ------------+---------+--------+-------------- 萇齟珆尨そ | 儂A01奻 | | 10 @@ -69,7 +69,7 @@ select *,octet_length( 萇齟最唗埜 | �汳01狟 | | 10 (3 rows) -select *,position('珆' in 扲逄) from 數呾儂扲逄 +select *,position('珆' in 扲逄) from 數呾儂扲逄; 扲逄 | 煦濬瘍 | 掘蛁1a | strpos ------------+---------+--------+-------- 萇齟珆尨そ | 儂A01奻 | | 3 @@ -77,7 +77,7 @@ select *,position(' 萇齟最唗埜 | �汳01狟 | | 0 (3 rows) -select *,substring(扲逄 from 3 for 4) from 數呾儂扲逄 +select *,substring(扲逄 from 3 for 4) from 數呾儂扲逄; 扲逄 | 煦濬瘍 | 掘蛁1a | substr ------------+---------+--------+-------- 萇齟珆尨そ | 儂A01奻 | | 珆尨そ diff --git a/src/test/mb/expected/euc_jp.out b/src/test/mb/expected/euc_jp.out index 838b0a8363c..190f631fe04 100644 --- a/src/test/mb/expected/euc_jp.out +++ b/src/test/mb/expected/euc_jp.out @@ -1,13 +1,13 @@ -drop table 煌遙窗迕賄 +drop table 煌遙窗迕賄; ERROR: Relation '煌遙窗迕賄' does not exist -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 煌遙窗迕賄 +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曉 | @@ -15,53 +15,53 @@ select * from 戊件疋亙□正皿伕弘仿穴□ | 諦Z01票 | (3 rows) -select * from 煌遙窗迕賄 where 坌挀戊□玉 = '諦Z01票' +select * from 煌遙窗迕賄 where 坌挀戊□玉 = '諦Z01票'; 迕賄 | 坌挀戊□玉 | �鷞�1a分方 --------------------------+------------+------------ 戊件疋亙□正皿伕弘仿穴□ | 諦Z01票 | (1 row) -select * from 煌遙窗迕賄 where 坌挀戊□玉 ~* '諦z01票' +select * from 煌遙窗迕賄 where 坌挀戊□玉 ~* '諦z01票'; 迕賄 | 坌挀戊□玉 | �鷞�1a分方 --------------------------+------------+------------ 戊件疋亙□正皿伕弘仿穴□ | 諦Z01票 | (1 row) -select * from 煌遙窗迕賄 where 坌挀戊□玉 like '_Z01_' +select * from 煌遙窗迕賄 where 坌挀戊□玉 like '_Z01_'; 迕賄 | 坌挀戊□玉 | �鷞�1a分方 --------------------------+------------+------------ 戊件疋亙□正皿伕弘仿穴□ | 諦Z01票 | (1 row) -select * from 煌遙窗迕賄 where 坌挀戊□玉 like '_Z%' +select * from 煌遙窗迕賄 where 坌挀戊□玉 like '_Z%'; 迕賄 | 坌挀戊□玉 | �鷞�1a分方 --------------------------+------------+------------ 戊件疋亙□正皿伕弘仿穴□ | 諦Z01票 | (1 row) -select * from 煌遙窗迕賄 where 迕賄 ~ '戊件疋亙□正[犯弘]' +select * from 煌遙窗迕賄 where 迕賄 ~ '戊件疋亙□正[犯弘]'; 迕賄 | 坌挀戊□玉 | �鷞�1a分方 ----------------------------+------------+------------ 戊件疋亙□正犯奴旦皿伊奶 | 窗A01曉 | 戊件疋亙□正弘仿白奴永弁旦 | 坌B10醱 | (2 rows) -select * from 煌遙窗迕賄 where 迕賄 ~* '戊件疋亙□正[犯弘]' +select * from 煌遙窗迕賄 where 迕賄 ~* '戊件疋亙□正[犯弘]'; 迕賄 | 坌挀戊□玉 | �鷞�1a分方 ----------------------------+------------+------------ 戊件疋亙□正犯奴旦皿伊奶 | 窗A01曉 | 戊件疋亙□正弘仿白奴永弁旦 | 坌B10醱 | (2 rows) -select *,character_length(迕賄) from 煌遙窗迕賄 - 迕賄 | 坌挀戊□玉 | �鷞�1a分方 | length -----------------------------+------------+------------+-------- - 戊件疋亙□正犯奴旦皿伊奶 | 窗A01曉 | | 12 - 戊件疋亙□正弘仿白奴永弁旦 | 坌B10醱 | | 13 - 戊件疋亙□正皿伕弘仿穴□ | 諦Z01票 | | 12 +select *,character_length(迕賄) from 煌遙窗迕賄; + 迕賄 | 坌挀戊□玉 | �鷞�1a分方 | char_length +----------------------------+------------+------------+------------- + 戊件疋亙□正犯奴旦皿伊奶 | 窗A01曉 | | 12 + 戊件疋亙□正弘仿白奴永弁旦 | 坌B10醱 | | 13 + 戊件疋亙□正皿伕弘仿穴□ | 諦Z01票 | | 12 (3 rows) -select *,octet_length(迕賄) from 煌遙窗迕賄 +select *,octet_length(迕賄) from 煌遙窗迕賄; 迕賄 | 坌挀戊□玉 | �鷞�1a分方 | octet_length ----------------------------+------------+------------+-------------- 戊件疋亙□正犯奴旦皿伊奶 | 窗A01曉 | | 24 @@ -69,7 +69,7 @@ select *,octet_length( 戊件疋亙□正皿伕弘仿穴□ | 諦Z01票 | | 24 (3 rows) -select *,position('犯' in 迕賄) from 煌遙窗迕賄 +select *,position('犯' in 迕賄) from 煌遙窗迕賄; 迕賄 | 坌挀戊□玉 | �鷞�1a分方 | strpos ----------------------------+------------+------------+-------- 戊件疋亙□正犯奴旦皿伊奶 | 窗A01曉 | | 7 @@ -77,7 +77,7 @@ select *,position(' 戊件疋亙□正皿伕弘仿穴□ | 諦Z01票 | | 0 (3 rows) -select *,substring(迕賄 from 10 for 4) from 煌遙窗迕賄 +select *,substring(迕賄 from 10 for 4) from 煌遙窗迕賄; 迕賄 | 坌挀戊□玉 | �鷞�1a分方 | substr ----------------------------+------------+------------+---------- 戊件疋亙□正犯奴旦皿伊奶 | 窗A01曉 | | 皿伊奶 diff --git a/src/test/mb/expected/euc_kr.out b/src/test/mb/expected/euc_kr.out index 7899344928e..368525b220f 100644 --- a/src/test/mb/expected/euc_kr.out +++ b/src/test/mb/expected/euc_kr.out @@ -1,13 +1,13 @@ -drop table 耵蓱悁辨橫 +drop table 耵蓱悁辨橫; ERROR: Relation '耵蓱悁辨橫' does not exist -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 耵蓱悁辨橫 +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葞 | @@ -15,53 +15,53 @@ select * from 耵蓱悁 闡У攪Щ煎斜楚該 | 嬣Z01欞 | (3 rows) -select * from 耵蓱悁辨橫 where 暐袛囀萄 = '嬣Z01欞' +select * from 耵蓱悁辨橫 where 暐袛囀萄 = '嬣Z01欞'; 辨橫 | 暐袛囀萄 | 綠堅1a塭掘 ------------------+----------+------------ 闡У攪Щ煎斜楚該 | 嬣Z01欞 | (1 row) -select * from 耵蓱悁辨橫 where 暐袛囀萄 ~* '嬣z01欞' +select * from 耵蓱悁辨橫 where 暐袛囀萄 ~* '嬣z01欞'; 辨橫 | 暐袛囀萄 | 綠堅1a塭掘 ------------------+----------+------------ 闡У攪Щ煎斜楚該 | 嬣Z01欞 | (1 row) -select * from 耵蓱悁辨橫 where 暐袛囀萄 like '_Z01_' +select * from 耵蓱悁辨橫 where 暐袛囀萄 like '_Z01_'; 辨橫 | 暐袛囀萄 | 綠堅1a塭掘 ------------------+----------+------------ 闡У攪Щ煎斜楚該 | 嬣Z01欞 | (1 row) -select * from 耵蓱悁辨橫 where 暐袛囀萄 like '_Z%' +select * from 耵蓱悁辨橫 where 暐袛囀萄 like '_Z%'; 辨橫 | 暐袛囀萄 | 綠堅1a塭掘 ------------------+----------+------------ 闡У攪Щ煎斜楚該 | 嬣Z01欞 | (1 row) -select * from 耵蓱悁辨橫 where 辨橫 ~ '闡У攪[蛤斜]' +select * from 耵蓱悁辨橫 where 辨橫 ~ '闡У攪[蛤斜]'; 辨橫 | 暐袛囀萄 | 綠堅1a塭掘 ------------------+----------+------------ 闡У攪蛤蝶Ы溯檜 | 悁A01葞 | 闡У攪斜楚а蝶 | 暐B10齌 | (2 rows) -select * from 耵蓱悁辨橫 where 辨橫 ~* '闡У攪[蛤斜]' +select * from 耵蓱悁辨橫 where 辨橫 ~* '闡У攪[蛤斜]'; 辨橫 | 暐袛囀萄 | 綠堅1a塭掘 ------------------+----------+------------ 闡У攪蛤蝶Ы溯檜 | 悁A01葞 | 闡У攪斜楚а蝶 | 暐B10齌 | (2 rows) -select *,character_length(辨橫) from 耵蓱悁辨橫 - 辨橫 | 暐袛囀萄 | 綠堅1a塭掘 | length -------------------+----------+------------+-------- - 闡У攪蛤蝶Ы溯檜 | 悁A01葞 | | 8 - 闡У攪斜楚а蝶 | 暐B10齌 | | 7 - 闡У攪Щ煎斜楚該 | 嬣Z01欞 | | 8 +select *,character_length(辨橫) from 耵蓱悁辨橫; + 辨橫 | 暐袛囀萄 | 綠堅1a塭掘 | char_length +------------------+----------+------------+------------- + 闡У攪蛤蝶Ы溯檜 | 悁A01葞 | | 8 + 闡У攪斜楚а蝶 | 暐B10齌 | | 7 + 闡У攪Щ煎斜楚該 | 嬣Z01欞 | | 8 (3 rows) -select *,octet_length(辨橫) from 耵蓱悁辨橫 +select *,octet_length(辨橫) from 耵蓱悁辨橫; 辨橫 | 暐袛囀萄 | 綠堅1a塭掘 | octet_length ------------------+----------+------------+-------------- 闡У攪蛤蝶Ы溯檜 | 悁A01葞 | | 16 @@ -69,7 +69,7 @@ select *,octet_length( 闡У攪Щ煎斜楚該 | 嬣Z01欞 | | 16 (3 rows) -select *,position('蛤' in 辨橫) from 耵蓱悁辨橫 +select *,position('蛤' in 辨橫) from 耵蓱悁辨橫; 辨橫 | 暐袛囀萄 | 綠堅1a塭掘 | strpos ------------------+----------+------------+-------- 闡У攪蛤蝶Ы溯檜 | 悁A01葞 | | 4 @@ -77,7 +77,7 @@ select *,position(' 闡У攪Щ煎斜楚該 | 嬣Z01欞 | | 0 (3 rows) -select *,substring(辨橫 from 3 for 4) from 耵蓱悁辨橫 +select *,substring(辨橫 from 3 for 4) from 耵蓱悁辨橫; 辨橫 | 暐袛囀萄 | 綠堅1a塭掘 | substr ------------------+----------+------------+---------- 闡У攪蛤蝶Ы溯檜 | 悁A01葞 | | 攪蛤蝶Ы diff --git a/src/test/mb/expected/euc_tw.out b/src/test/mb/expected/euc_tw.out index 4e1e588295c..cf855809ab7 100644 --- a/src/test/mb/expected/euc_tw.out +++ b/src/test/mb/expected/euc_tw.out @@ -1,13 +1,13 @@ -drop table 徻椓罶涷 +drop table 徻椓罶涷; ERROR: Relation '徻椓罶涷' does not exist -create table 徻椓罶涷 (�諙づ� text, 襬く剉韝 varchar, щ彴 varchar(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 徻椓罶涷 +create table 徻椓罶涷 (�諙づ� text, 襬く剉韝 varchar, щ彴 varchar(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 徻椓罶涷; �諙づ� | 襬く剉韝 | щ彴 --------+------------------+--------- 諔瑼鞄 | 蝞蝞秠岍 | ヾA01癩 @@ -15,51 +15,51 @@ select * from 顜聜鞄 | 荂抸炴Л�植鄸�く | 崼Z01藻 (3 rows) -select * from 徻椓罶涷 where щ彴 = '崼Z01藻' +select * from 徻椓罶涷 where щ彴 = '崼Z01藻'; �諙づ� | 襬く剉韝 | щ彴 --------+------------------+--------- 顜聜鞄 | 荂抸炴Л�植鄸�く | 崼Z01藻 (1 row) -select * from 徻椓罶涷 where щ彴 ~* '崼z01藻' +select * from 徻椓罶涷 where щ彴 ~* '崼z01藻'; �諙づ� | 襬く剉韝 | щ彴 --------+------------------+--------- 顜聜鞄 | 荂抸炴Л�植鄸�く | 崼Z01藻 (1 row) -select * from 徻椓罶涷 where щ彴 like '_Z01_' +select * from 徻椓罶涷 where щ彴 like '_Z01_'; �諙づ� | 襬く剉韝 | щ彴 --------+------------------+--------- 顜聜鞄 | 荂抸炴Л�植鄸�く | 崼Z01藻 (1 row) -select * from 徻椓罶涷 where щ彴 like '_Z%' +select * from 徻椓罶涷 where щ彴 like '_Z%'; �諙づ� | 襬く剉韝 | щ彴 --------+------------------+--------- 顜聜鞄 | 荂抸炴Л�植鄸�く | 崼Z01藻 (1 row) -select * from 徻椓罶涷 where 襬く剉韝 ~ '蝞蝞秠[溈奡岍]' +select * from 徻椓罶涷 where 襬く剉韝 ~ '蝞蝞秠[溈奡岍]'; �諙づ� | 襬く剉韝 | щ彴 --------+----------+--------- 諔瑼鞄 | 蝞蝞秠岍 | ヾA01癩 (1 row) -select * from 徻椓罶涷 where 襬く剉韝 ~* '蝞蝞秠[溈奡岍]' +select * from 徻椓罶涷 where 襬く剉韝 ~* '蝞蝞秠[溈奡岍]'; �諙づ� | 襬く剉韝 | щ彴 --------+----------+--------- 諔瑼鞄 | 蝞蝞秠岍 | ヾA01癩 (1 row) -select *, character_length(�諙づ�) from 徻椓罶涷 - �諙づ� | 襬く剉韝 | щ彴 | length ---------+------------------+---------+-------- - 諔瑼鞄 | 蝞蝞秠岍 | ヾA01癩 | 3 - 蕍楸鞄 | 娷鳲�植鄸�く | 斕B10斕 | 3 - 顜聜鞄 | 荂抸炴Л�植鄸�く | 崼Z01藻 | 3 +select *, character_length(�諙づ�) from 徻椓罶涷; + �諙づ� | 襬く剉韝 | щ彴 | char_length +--------+------------------+---------+------------- + 諔瑼鞄 | 蝞蝞秠岍 | ヾA01癩 | 3 + 蕍楸鞄 | 娷鳲�植鄸�く | 斕B10斕 | 3 + 顜聜鞄 | 荂抸炴Л�植鄸�く | 崼Z01藻 | 3 (3 rows) -select *, octet_length(�諙づ�) from 徻椓罶涷 +select *, octet_length(�諙づ�) from 徻椓罶涷; �諙づ� | 襬く剉韝 | щ彴 | octet_length --------+------------------+---------+-------------- 諔瑼鞄 | 蝞蝞秠岍 | ヾA01癩 | 6 @@ -67,7 +67,7 @@ select *, octet_length( 顜聜鞄 | 荂抸炴Л�植鄸�く | 崼Z01藻 | 6 (3 rows) -select *, position('�植�' in 襬く剉韝) from 徻椓罶涷 +select *, position('�植�' in 襬く剉韝) from 徻椓罶涷; �諙づ� | 襬く剉韝 | щ彴 | strpos --------+------------------+---------+-------- 諔瑼鞄 | 蝞蝞秠岍 | ヾA01癩 | 0 @@ -75,7 +75,7 @@ select *, position('�� 顜聜鞄 | 荂抸炴Л�植鄸�く | 崼Z01藻 | 5 (3 rows) -select *, substring(襬く剉韝 from 3 for 6 ) from 徻椓罶涷 +select *, substring(襬く剉韝 from 3 for 6 ) from 徻椓罶涷; �諙づ� | 襬く剉韝 | щ彴 | substr --------+------------------+---------+-------------- 諔瑼鞄 | 蝞蝞秠岍 | ヾA01癩 | 秠岍 diff --git a/src/test/mb/expected/mule_internal.out b/src/test/mb/expected/mule_internal.out index 6df80473e6e..bfcffc8490a 100644 --- a/src/test/mb/expected/mule_internal.out +++ b/src/test/mb/expected/mule_internal.out @@ -1,13 +1,13 @@ -drop table �煌�遙�窗�迕�賄 +drop table �煌�遙�窗�迕�賄; ERROR: Relation '�煌�遙�窗�迕�賄' does not exist -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 �煌�遙�窗�迕�賄 +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�曉 | @@ -15,53 +15,53 @@ select * from �戊�件�疋�亙�□�正�皿�伕�弘�仿�穴�□ | �諦Z01�票 | (3 rows) -select * from �煌�遙�窗�迕�賄 where �坌�挀�戊�□�玉 = '�諦Z01�票' +select * from �煌�遙�窗�迕�賄 where �坌�挀�戊�□�玉 = '�諦Z01�票'; �迕�賄 | �坌�挀�戊�□�玉 | ����嗶1a�分�方 --------------------------------------+-----------------+---------------- �戊�件�疋�亙�□�正�皿�伕�弘�仿�穴�□ | �諦Z01�票 | (1 row) -select * from �煌�遙�窗�迕�賄 where �坌�挀�戊�□�玉 ~* '�諦z01�票' +select * from �煌�遙�窗�迕�賄 where �坌�挀�戊�□�玉 ~* '�諦z01�票'; �迕�賄 | �坌�挀�戊�□�玉 | ����嗶1a�分�方 --------------------------------------+-----------------+---------------- �戊�件�疋�亙�□�正�皿�伕�弘�仿�穴�□ | �諦Z01�票 | (1 row) -select * from �煌�遙�窗�迕�賄 where �坌�挀�戊�□�玉 like '_Z01_' +select * from �煌�遙�窗�迕�賄 where �坌�挀�戊�□�玉 like '_Z01_'; �迕�賄 | �坌�挀�戊�□�玉 | ����嗶1a�分�方 --------------------------------------+-----------------+---------------- �戊�件�疋�亙�□�正�皿�伕�弘�仿�穴�□ | �諦Z01�票 | (1 row) -select * from �煌�遙�窗�迕�賄 where �坌�挀�戊�□�玉 like '_Z%' +select * from �煌�遙�窗�迕�賄 where �坌�挀�戊�□�玉 like '_Z%'; �迕�賄 | �坌�挀�戊�□�玉 | ����嗶1a�分�方 --------------------------------------+-----------------+---------------- �戊�件�疋�亙�□�正�皿�伕�弘�仿�穴�□ | �諦Z01�票 | (1 row) -select * from �煌�遙�窗�迕�賄 where �迕�賄 ~ '�戊�件�疋�亙�□�正[�犯�弘]' +select * from �煌�遙�窗�迕�賄 where �迕�賄 ~ '�戊�件�疋�亙�□�正[�犯�弘]'; �迕�賄 | �坌�挀�戊�□�玉 | ����嗶1a�分�方 -----------------------------------------+-----------------+---------------- �戊�件�疋�亙�□�正�犯�奴�旦�皿�伊�奶 | �窗A01�曉 | �戊�件�疋�亙�□�正�弘�仿�白�奴�永�弁�旦 | �坌B10�醱 | (2 rows) -select * from �煌�遙�窗�迕�賄 where �迕�賄 ~* '�戊�件�疋�亙�□�正[�犯�弘]' +select * from �煌�遙�窗�迕�賄 where �迕�賄 ~* '�戊�件�疋�亙�□�正[�犯�弘]'; �迕�賄 | �坌�挀�戊�□�玉 | ����嗶1a�分�方 -----------------------------------------+-----------------+---------------- �戊�件�疋�亙�□�正�犯�奴�旦�皿�伊�奶 | �窗A01�曉 | �戊�件�疋�亙�□�正�弘�仿�白�奴�永�弁�旦 | �坌B10�醱 | (2 rows) -select *,character_length(�迕�賄) from �煌�遙�窗�迕�賄 - �迕�賄 | �坌�挀�戊�□�玉 | ����嗶1a�分�方 | length ------------------------------------------+-----------------+----------------+-------- - �戊�件�疋�亙�□�正�犯�奴�旦�皿�伊�奶 | �窗A01�曉 | | 12 - �戊�件�疋�亙�□�正�弘�仿�白�奴�永�弁�旦 | �坌B10�醱 | | 13 - �戊�件�疋�亙�□�正�皿�伕�弘�仿�穴�□ | �諦Z01�票 | | 12 +select *,character_length(�迕�賄) from �煌�遙�窗�迕�賄; + �迕�賄 | �坌�挀�戊�□�玉 | ����嗶1a�分�方 | char_length +-----------------------------------------+-----------------+----------------+------------- + �戊�件�疋�亙�□�正�犯�奴�旦�皿�伊�奶 | �窗A01�曉 | | 12 + �戊�件�疋�亙�□�正�弘�仿�白�奴�永�弁�旦 | �坌B10�醱 | | 13 + �戊�件�疋�亙�□�正�皿�伕�弘�仿�穴�□ | �諦Z01�票 | | 12 (3 rows) -select *,octet_length(�迕�賄) from �煌�遙�窗�迕�賄 +select *,octet_length(�迕�賄) from �煌�遙�窗�迕�賄; �迕�賄 | �坌�挀�戊�□�玉 | ����嗶1a�分�方 | octet_length -----------------------------------------+-----------------+----------------+-------------- �戊�件�疋�亙�□�正�犯�奴�旦�皿�伊�奶 | �窗A01�曉 | | 36 @@ -69,7 +69,7 @@ select *,octet_length( �戊�件�疋�亙�□�正�皿�伕�弘�仿�穴�□ | �諦Z01�票 | | 36 (3 rows) -select *,position('�犯' in �迕�賄) from �煌�遙�窗�迕�賄 +select *,position('�犯' in �迕�賄) from �煌�遙�窗�迕�賄; �迕�賄 | �坌�挀�戊�□�玉 | ����嗶1a�分�方 | strpos -----------------------------------------+-----------------+----------------+-------- �戊�件�疋�亙�□�正�犯�奴�旦�皿�伊�奶 | �窗A01�曉 | | 7 @@ -77,7 +77,7 @@ select *,position(' �戊�件�疋�亙�□�正�皿�伕�弘�仿�穴�□ | �諦Z01�票 | | 0 (3 rows) -select *,substring(�迕�賄 from 10 for 4) from �煌�遙�窗�迕�賄 +select *,substring(�迕�賄 from 10 for 4) from �煌�遙�窗�迕�賄; �迕�賄 | �坌�挀�戊�□�玉 | ����嗶1a�分�方 | substr -----------------------------------------+-----------------+----------------+-------------- �戊�件�疋�亙�□�正�犯�奴�旦�皿�伊�奶 | �窗A01�曉 | | �皿�伊�奶 @@ -85,16 +85,16 @@ select *,substring( �戊�件�疋�亙�□�正�皿�伕�弘�仿�穴�□ | �諦Z01�票 | | �仿�穴�□ (3 rows) -drop table �數�呾�儂�扲�逄 +drop table �數�呾�儂�扲�逄; ERROR: Relation '�數�呾�儂�扲�逄' does not exist -create table �數�呾�儂�扲�逄(�扲�逄 text, �煦�濬�瘍 varchar, �掘�蛁1A char(16)) -create index �數�呾�儂�扲�逄index1 on �數�呾�儂�扲�逄 using btree(�扲�逄) -create index �數�呾�儂�扲�逄index2 on �數�呾�儂�扲�逄 using btree(�煦�濬�瘍) -insert into �數�呾�儂�扲�逄 values('�萇�齟�珆�尨�そ','�儂A01�奻') -insert into �數�呾�儂�扲�逄 values('�萇�齟�芞�倛','�煦B01�笢') -insert into �數�呾�儂�扲�逄 values('�萇�齟�最�唗�埜','��汳01�狟') -vacuum �數�呾�儂�扲�逄 -select * from �數�呾�儂�扲�逄 +create table �數�呾�儂�扲�逄(�扲�逄 text, �煦�濬�瘍 varchar, �掘�蛁1A char(16)); +create index �數�呾�儂�扲�逄index1 on �數�呾�儂�扲�逄 using btree(�扲�逄); +create index �數�呾�儂�扲�逄index2 on �數�呾�儂�扲�逄 using btree(�煦�濬�瘍); +insert into �數�呾�儂�扲�逄 values('�萇�齟�珆�尨�そ','�儂A01�奻'); +insert into �數�呾�儂�扲�逄 values('�萇�齟�芞�倛','�煦B01�笢'); +insert into �數�呾�儂�扲�逄 values('�萇�齟�最�唗�埜','��汳01�狟'); +vacuum �數�呾�儂�扲�逄; +select * from �數�呾�儂�扲�逄; �扲�逄 | �煦�濬�瘍 | �掘�蛁1a -----------------+-----------+---------- �萇�齟�珆�尨�そ | �儂A01�奻 | @@ -102,53 +102,53 @@ select * from �萇�齟�最�唗�埜 | ��汳01�狟 | (3 rows) -select * from �數�呾�儂�扲�逄 where �煦�濬�瘍 = '��汳01�狟' +select * from �數�呾�儂�扲�逄 where �煦�濬�瘍 = '��汳01�狟'; �扲�逄 | �煦�濬�瘍 | �掘�蛁1a -----------------+-----------+---------- �萇�齟�最�唗�埜 | ��汳01�狟 | (1 row) -select * from �數�呾�儂�扲�逄 where �煦�濬�瘍 ~* '��芏01�狟' +select * from �數�呾�儂�扲�逄 where �煦�濬�瘍 ~* '��芏01�狟'; �扲�逄 | �煦�濬�瘍 | �掘�蛁1a -----------------+-----------+---------- �萇�齟�最�唗�埜 | ��汳01�狟 | (1 row) -select * from �數�呾�儂�扲�逄 where �煦�濬�瘍 like '_Z01_' +select * from �數�呾�儂�扲�逄 where �煦�濬�瘍 like '_Z01_'; �扲�逄 | �煦�濬�瘍 | �掘�蛁1a -----------------+-----------+---------- �萇�齟�最�唗�埜 | ��汳01�狟 | (1 row) -select * from �數�呾�儂�扲�逄 where �煦�濬�瘍 like '_Z%' +select * from �數�呾�儂�扲�逄 where �煦�濬�瘍 like '_Z%'; �扲�逄 | �煦�濬�瘍 | �掘�蛁1a -----------------+-----------+---------- �萇�齟�最�唗�埜 | ��汳01�狟 | (1 row) -select * from �數�呾�儂�扲�逄 where �扲�逄 ~ '�萇�齟[�珆�芞]' +select * from �數�呾�儂�扲�逄 where �扲�逄 ~ '�萇�齟[�珆�芞]'; �扲�逄 | �煦�濬�瘍 | �掘�蛁1a -----------------+-----------+---------- �萇�齟�珆�尨�そ | �儂A01�奻 | �萇�齟�芞�倛 | �煦B01�笢 | (2 rows) -select * from �數�呾�儂�扲�逄 where �扲�逄 ~* '�萇�齟[�珆�芞]' +select * from �數�呾�儂�扲�逄 where �扲�逄 ~* '�萇�齟[�珆�芞]'; �扲�逄 | �煦�濬�瘍 | �掘�蛁1a -----------------+-----------+---------- �萇�齟�珆�尨�そ | �儂A01�奻 | �萇�齟�芞�倛 | �煦B01�笢 | (2 rows) -select *,character_length(�扲�逄) from �數�呾�儂�扲�逄 - �扲�逄 | �煦�濬�瘍 | �掘�蛁1a | length ------------------+-----------+----------+-------- - �萇�齟�珆�尨�そ | �儂A01�奻 | | 5 - �萇�齟�芞�倛 | �煦B01�笢 | | 4 - �萇�齟�最�唗�埜 | ��汳01�狟 | | 5 +select *,character_length(�扲�逄) from �數�呾�儂�扲�逄; + �扲�逄 | �煦�濬�瘍 | �掘�蛁1a | char_length +-----------------+-----------+----------+------------- + �萇�齟�珆�尨�そ | �儂A01�奻 | | 5 + �萇�齟�芞�倛 | �煦B01�笢 | | 4 + �萇�齟�最�唗�埜 | ��汳01�狟 | | 5 (3 rows) -select *,octet_length(�扲�逄) from �數�呾�儂�扲�逄 +select *,octet_length(�扲�逄) from �數�呾�儂�扲�逄; �扲�逄 | �煦�濬�瘍 | �掘�蛁1a | octet_length -----------------+-----------+----------+-------------- �萇�齟�珆�尨�そ | �儂A01�奻 | | 15 @@ -156,7 +156,7 @@ select *,octet_length( �萇�齟�最�唗�埜 | ��汳01�狟 | | 15 (3 rows) -select *,position('�珆' in �扲�逄) from �數�呾�儂�扲�逄 +select *,position('�珆' in �扲�逄) from �數�呾�儂�扲�逄; �扲�逄 | �煦�濬�瘍 | �掘�蛁1a | strpos -----------------+-----------+----------+-------- �萇�齟�珆�尨�そ | �儂A01�奻 | | 3 @@ -164,7 +164,7 @@ select *,position(' �萇�齟�最�唗�埜 | ��汳01�狟 | | 0 (3 rows) -select *,substring(�扲�逄 from 3 for 4) from �數�呾�儂�扲�逄 +select *,substring(�扲�逄 from 3 for 4) from �數�呾�儂�扲�逄; �扲�逄 | �煦�濬�瘍 | �掘�蛁1a | substr -----------------+-----------+----------+----------- �萇�齟�珆�尨�そ | �儂A01�奻 | | �珆�尨�そ @@ -172,16 +172,16 @@ select *,substring( �萇�齟�最�唗�埜 | ��汳01�狟 | | �最�唗�埜 (3 rows) -drop table �耵�蓱�悁�辨�橫 +drop table �耵�蓱�悁�辨�橫; ERROR: Relation '�耵�蓱�悁�辨�橫' does not exist -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 �耵�蓱�悁�辨�橫 +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�葞 | @@ -189,53 +189,53 @@ select * from �闡�У�攪�Щ�煎�斜�楚�該 | �嬣Z01�欞 | (3 rows) -select * from �耵�蓱�悁�辨�橫 where �暐�袛�囀�萄 = '�嬣Z01�欞' +select * from �耵�蓱�悁�辨�橫 where �暐�袛�囀�萄 = '�嬣Z01�欞'; �辨�橫 | �暐�袛�囀�萄 | �綠�堅1a�塭�掘 --------------------------+--------------+---------------- �闡�У�攪�Щ�煎�斜�楚�該 | �嬣Z01�欞 | (1 row) -select * from �耵�蓱�悁�辨�橫 where �暐�袛�囀�萄 ~* '�嬣z01�欞' +select * from �耵�蓱�悁�辨�橫 where �暐�袛�囀�萄 ~* '�嬣z01�欞'; �辨�橫 | �暐�袛�囀�萄 | �綠�堅1a�塭�掘 --------------------------+--------------+---------------- �闡�У�攪�Щ�煎�斜�楚�該 | �嬣Z01�欞 | (1 row) -select * from �耵�蓱�悁�辨�橫 where �暐�袛�囀�萄 like '_Z01_' +select * from �耵�蓱�悁�辨�橫 where �暐�袛�囀�萄 like '_Z01_'; �辨�橫 | �暐�袛�囀�萄 | �綠�堅1a�塭�掘 --------------------------+--------------+---------------- �闡�У�攪�Щ�煎�斜�楚�該 | �嬣Z01�欞 | (1 row) -select * from �耵�蓱�悁�辨�橫 where �暐�袛�囀�萄 like '_Z%' +select * from �耵�蓱�悁�辨�橫 where �暐�袛�囀�萄 like '_Z%'; �辨�橫 | �暐�袛�囀�萄 | �綠�堅1a�塭�掘 --------------------------+--------------+---------------- �闡�У�攪�Щ�煎�斜�楚�該 | �嬣Z01�欞 | (1 row) -select * from �耵�蓱�悁�辨�橫 where �辨�橫 ~ '�闡�У�攪[�蛤�斜]' +select * from �耵�蓱�悁�辨�橫 where �辨�橫 ~ '�闡�У�攪[�蛤�斜]'; �辨�橫 | �暐�袛�囀�萄 | �綠�堅1a�塭�掘 --------------------------+--------------+---------------- �闡�У�攪�蛤�蝶�Ы�溯�檜 | �悁A01�葞 | �闡�У�攪�斜�楚�а�蝶 | �暐B10�齌 | (2 rows) -select * from �耵�蓱�悁�辨�橫 where �辨�橫 ~* '�闡�У�攪[�蛤�斜]' +select * from �耵�蓱�悁�辨�橫 where �辨�橫 ~* '�闡�У�攪[�蛤�斜]'; �辨�橫 | �暐�袛�囀�萄 | �綠�堅1a�塭�掘 --------------------------+--------------+---------------- �闡�У�攪�蛤�蝶�Ы�溯�檜 | �悁A01�葞 | �闡�У�攪�斜�楚�а�蝶 | �暐B10�齌 | (2 rows) -select *,character_length(�辨�橫) from �耵�蓱�悁�辨�橫 - �辨�橫 | �暐�袛�囀�萄 | �綠�堅1a�塭�掘 | length ---------------------------+--------------+----------------+-------- - �闡�У�攪�蛤�蝶�Ы�溯�檜 | �悁A01�葞 | | 8 - �闡�У�攪�斜�楚�а�蝶 | �暐B10�齌 | | 7 - �闡�У�攪�Щ�煎�斜�楚�該 | �嬣Z01�欞 | | 8 +select *,character_length(�辨�橫) from �耵�蓱�悁�辨�橫; + �辨�橫 | �暐�袛�囀�萄 | �綠�堅1a�塭�掘 | char_length +--------------------------+--------------+----------------+------------- + �闡�У�攪�蛤�蝶�Ы�溯�檜 | �悁A01�葞 | | 8 + �闡�У�攪�斜�楚�а�蝶 | �暐B10�齌 | | 7 + �闡�У�攪�Щ�煎�斜�楚�該 | �嬣Z01�欞 | | 8 (3 rows) -select *,octet_length(�辨�橫) from �耵�蓱�悁�辨�橫 +select *,octet_length(�辨�橫) from �耵�蓱�悁�辨�橫; �辨�橫 | �暐�袛�囀�萄 | �綠�堅1a�塭�掘 | octet_length --------------------------+--------------+----------------+-------------- �闡�У�攪�蛤�蝶�Ы�溯�檜 | �悁A01�葞 | | 24 @@ -243,7 +243,7 @@ select *,octet_length( �闡�У�攪�Щ�煎�斜�楚�該 | �嬣Z01�欞 | | 24 (3 rows) -select *,position('�蛤' in �辨�橫) from �耵�蓱�悁�辨�橫 +select *,position('�蛤' in �辨�橫) from �耵�蓱�悁�辨�橫; �辨�橫 | �暐�袛�囀�萄 | �綠�堅1a�塭�掘 | strpos --------------------------+--------------+----------------+-------- �闡�У�攪�蛤�蝶�Ы�溯�檜 | �悁A01�葞 | | 4 @@ -251,7 +251,7 @@ select *,position(' �闡�У�攪�Щ�煎�斜�楚�該 | �嬣Z01�欞 | | 0 (3 rows) -select *,substring(�辨�橫 from 3 for 4) from �耵�蓱�悁�辨�橫 +select *,substring(�辨�橫 from 3 for 4) from �耵�蓱�悁�辨�橫; �辨�橫 | �暐�袛�囀�萄 | �綠�堅1a�塭�掘 | substr --------------------------+--------------+----------------+-------------- �闡�У�攪�蛤�蝶�Ы�溯�檜 | �悁A01�葞 | | �攪�蛤�蝶�Ы @@ -259,16 +259,16 @@ select *,substring( �闡�У�攪�Щ�煎�斜�楚�該 | �嬣Z01�欞 | | �攪�Щ�煎�斜 (3 rows) -drop table test +drop table test; ERROR: Relation 'test' does not exist -create table test (t text) -insert into test values('ENGLISH') -insert into test values('FRAN�ォIS') -insert into test values('ESPA�埆L') -insert into test values('�炓LENSKA') -insert into test values('ENGLISH FRAN�ォIS ESPA�埆L �炓LENSKA') -vacuum test -select * from test +create table test (t text); +insert into test values('ENGLISH'); +insert into test values('FRAN�ォIS'); +insert into test values('ESPA�埆L'); +insert into test values('�炓LENSKA'); +insert into test values('ENGLISH FRAN�ォIS ESPA�埆L �炓LENSKA'); +vacuum test; +select * from test; t -------------------------------------- ENGLISH @@ -278,30 +278,30 @@ select * from test ENGLISH FRAN�ォIS ESPA�埆L �炓LENSKA (5 rows) -select * from test where t = 'ESPA�埆L' +select * from test where t = 'ESPA�埆L'; t ---------- ESPA�埆L (1 row) -select * from test where t ~* 'espa�峱l' +select * from test where t ~* 'espa�峱l'; t -------------------------------------- ESPA�埆L ENGLISH FRAN�ォIS ESPA�埆L �炓LENSKA (2 rows) -select *,character_length(t) from test - t | length ---------------------------------------+-------- - ENGLISH | 7 - FRAN�ォIS | 8 - ESPA�埆L | 7 - �炓LENSKA | 8 - ENGLISH FRAN�ォIS ESPA�埆L �炓LENSKA | 33 +select *,character_length(t) from test; + t | char_length +--------------------------------------+------------- + ENGLISH | 7 + FRAN�ォIS | 8 + ESPA�埆L | 7 + �炓LENSKA | 8 + ENGLISH FRAN�ォIS ESPA�埆L �炓LENSKA | 33 (5 rows) -select *,octet_length(t) from test +select *,octet_length(t) from test; t | octet_length --------------------------------------+-------------- ENGLISH | 7 @@ -311,7 +311,7 @@ select *,octet_length(t) from test ENGLISH FRAN�ォIS ESPA�埆L �炓LENSKA | 36 (5 rows) -select *,position('L' in t) from test +select *,position('L' in t) from test; t | strpos --------------------------------------+-------- ENGLISH | 4 @@ -321,7 +321,7 @@ select *,position('L' in t) from test ENGLISH FRAN�ォIS ESPA�埆L �炓LENSKA | 4 (5 rows) -select *,substring(t from 3 for 4) from test +select *,substring(t from 3 for 4) from test; t | substr --------------------------------------+-------- ENGLISH | GLIS diff --git a/src/test/mb/expected/sjis.out b/src/test/mb/expected/sjis.out index 0a63fc6321a..39ae540da4d 100644 --- a/src/test/mb/expected/sjis.out +++ b/src/test/mb/expected/sjis.out @@ -1,12 +1,12 @@ -drop table �v�Z�@�p�� -create table �v�Z�@�p�� (�p�� text, �����R�[�h varchar, ���l1A���� char(16)) -create index �v�Z�@�p�甋ndex1 on �v�Z�@�p�� using btree (�p��) -create index �v�Z�@�p�甋ndex2 on �v�Z�@�p�� using hash (�����R�[�h) -insert into �v�Z�@�p�� values('�R���s���[�^�f�B�X�v���C','�@A01��') -insert into �v�Z�@�p�� values('�R���s���[�^�O���t�B�b�N�X','�朋10��') -insert into �v�Z�@�p�� values('�R���s���[�^�v���O���}�[','�lZ01��') -vacuum �v�Z�@�p�� -select * from �v�Z�@�p�� +drop table �v�Z�@�p��; +create table �v�Z�@�p�� (�p�� text, �����R�[�h varchar, ���l1A���� char(16)); +create index �v�Z�@�p�甋ndex1 on �v�Z�@�p�� using btree (�p��); +create index �v�Z�@�p�甋ndex2 on �v�Z�@�p�� using hash (�����R�[�h); +insert into �v�Z�@�p�� values('�R���s���[�^�f�B�X�v���C','�@A01��'); +insert into �v�Z�@�p�� values('�R���s���[�^�O���t�B�b�N�X','�朋10��'); +insert into �v�Z�@�p�� values('�R���s���[�^�v���O���}�[','�lZ01��'); +vacuum �v�Z�@�p��; +select * from �v�Z�@�p��; �p�� | �����R�[�h | ���l1a���� ----------------------------+------------+------------ �R���s���[�^�f�B�X�v���C | �@A01�� | @@ -14,53 +14,53 @@ select * from �R���s���[�^�v���O���}�[ | �lZ01�� | (3 rows) -select * from �v�Z�@�p�� where �����R�[�h = '�lZ01��' +select * from �v�Z�@�p�� where �����R�[�h = '�lZ01��'; �p�� | �����R�[�h | ���l1a���� --------------------------+------------+------------ �R���s���[�^�v���O���}�[ | �lZ01�� | (1 row) -select * from �v�Z�@�p�� where �����R�[�h ~* '�lz01��' +select * from �v�Z�@�p�� where �����R�[�h ~* '�lz01��'; �p�� | �����R�[�h | ���l1a���� --------------------------+------------+------------ �R���s���[�^�v���O���}�[ | �lZ01�� | (1 row) -select * from �v�Z�@�p�� where �����R�[�h like '_Z01_' +select * from �v�Z�@�p�� where �����R�[�h like '_Z01_'; �p�� | �����R�[�h | ���l1a���� --------------------------+------------+------------ �R���s���[�^�v���O���}�[ | �lZ01�� | (1 row) -select * from �v�Z�@�p�� where �����R�[�h like '_Z%' +select * from �v�Z�@�p�� where �����R�[�h like '_Z%'; �p�� | �����R�[�h | ���l1a���� --------------------------+------------+------------ �R���s���[�^�v���O���}�[ | �lZ01�� | (1 row) -select * from �v�Z�@�p�� where �p�� ~ '�R���s���[�^[�f�O]' +select * from �v�Z�@�p�� where �p�� ~ '�R���s���[�^[�f�O]'; �p�� | �����R�[�h | ���l1a���� ----------------------------+------------+------------ �R���s���[�^�f�B�X�v���C | �@A01�� | �R���s���[�^�O���t�B�b�N�X | �朋10�� | (2 rows) -select * from �v�Z�@�p�� where �p�� ~* '�R���s���[�^[�f�O]' +select * from �v�Z�@�p�� where �p�� ~* '�R���s���[�^[�f�O]'; �p�� | �����R�[�h | ���l1a���� ----------------------------+------------+------------ �R���s���[�^�f�B�X�v���C | �@A01�� | �R���s���[�^�O���t�B�b�N�X | �朋10�� | (2 rows) -select *,character_length(�p��) from �v�Z�@�p�� - �p�� | �����R�[�h | ���l1a���� | length -----------------------------+------------+------------+-------- - �R���s���[�^�f�B�X�v���C | �@A01�� | | 12 - �R���s���[�^�O���t�B�b�N�X | �朋10�� | | 13 - �R���s���[�^�v���O���}�[ | �lZ01�� | | 12 +select *,character_length(�p��) from �v�Z�@�p��; + �p�� | �����R�[�h | ���l1a���� | char_length +----------------------------+------------+------------+------------- + �R���s���[�^�f�B�X�v���C | �@A01�� | | 12 + �R���s���[�^�O���t�B�b�N�X | �朋10�� | | 13 + �R���s���[�^�v���O���}�[ | �lZ01�� | | 12 (3 rows) -select *,octet_length(�p��) from �v�Z�@�p�� +select *,octet_length(�p��) from �v�Z�@�p��; �p�� | �����R�[�h | ���l1a���� | octet_length ----------------------------+------------+------------+-------------- �R���s���[�^�f�B�X�v���C | �@A01�� | | 24 @@ -68,7 +68,7 @@ select *,octet_length( �R���s���[�^�v���O���}�[ | �lZ01�� | | 24 (3 rows) -select *,position('�f' in �p��) from �v�Z�@�p�� +select *,position('�f' in �p��) from �v�Z�@�p��; �p�� | �����R�[�h | ���l1a���� | strpos ----------------------------+------------+------------+-------- �R���s���[�^�f�B�X�v���C | �@A01�� | | 7 @@ -76,7 +76,7 @@ select *,position(' �R���s���[�^�v���O���}�[ | �lZ01�� | | 0 (3 rows) -select *,substring(�p�� from 10 for 4) from �v�Z�@�p�� +select *,substring(�p�� from 10 for 4) from �v�Z�@�p��; �p�� | �����R�[�h | ���l1a���� | substr ----------------------------+------------+------------+---------- �R���s���[�^�f�B�X�v���C | �@A01�� | | �v���C @@ -84,7 +84,7 @@ select *,substring( �R���s���[�^�v���O���}�[ | �lZ01�� | | ���}�[ (3 rows) -copy �v�Z�@�p�� to stdout +copy �v�Z�@�p�� to stdout; �R���s���[�^�f�B�X�v���C �@A01�� \N �R���s���[�^�O���t�B�b�N�X �朋10�� \N �R���s���[�^�v���O���}�[ �lZ01�� \N diff --git a/src/test/mb/expected/unicode.out b/src/test/mb/expected/unicode.out index 45f565ca67a..df7f5f8306f 100644 --- a/src/test/mb/expected/unicode.out +++ b/src/test/mb/expected/unicode.out @@ -1,13 +1,13 @@ -drop table 閮�蝞�璈���刻�� +drop table 閮�蝞�璈���刻��; ERROR: Relation '閮�蝞�璈���刻��' does not exist -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('��喋�喋����乓�潦�踴����准�啜�押�����','鈭暢01銝�') -vacuum 閮�蝞�璈���刻�� -select * from 閮�蝞�璈���刻�� +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('��喋�喋����乓�潦�踴����准�啜�押�����','鈭暢01銝�'); +vacuum 閮�蝞�璈���刻��; +select * from 閮�蝞�璈���刻��; ��刻�� | ���憿���喋�潦�� | ������1a������ -----------------------------------------+-----------------+---------------- ��喋�喋����乓�潦�踴�������嫘����研�� | 璈�A01銝� | @@ -15,53 +15,53 @@ select * from 閮�蝞�璈���刻�� ��喋�喋����乓�潦�踴����准�啜�押����� | 鈭暢01銝� | (3 rows) -select * from 閮�蝞�璈���刻�� where ���憿���喋�潦�� = '鈭暢01銝�' +select * from 閮�蝞�璈���刻�� where ���憿���喋�潦�� = '鈭暢01銝�'; ��刻�� | ���憿���喋�潦�� | ������1a������ --------------------------------------+-----------------+---------------- ��喋�喋����乓�潦�踴����准�啜�押����� | 鈭暢01銝� | (1 row) -select * from 閮�蝞�璈���刻�� where ���憿���喋�潦�� ~* '鈭漠01銝�' +select * from 閮�蝞�璈���刻�� where ���憿���喋�潦�� ~* '鈭漠01銝�'; ��刻�� | ���憿���喋�潦�� | ������1a������ --------------------------------------+-----------------+---------------- ��喋�喋����乓�潦�踴����准�啜�押����� | 鈭暢01銝� | (1 row) -select * from 閮�蝞�璈���刻�� where ���憿���喋�潦�� like '_Z01_' +select * from 閮�蝞�璈���刻�� where ���憿���喋�潦�� like '_Z01_'; ��刻�� | ���憿���喋�潦�� | ������1a������ --------------------------------------+-----------------+---------------- ��喋�喋����乓�潦�踴����准�啜�押����� | 鈭暢01銝� | (1 row) -select * from 閮�蝞�璈���刻�� where ���憿���喋�潦�� like '_Z%' +select * from 閮�蝞�璈���刻�� where ���憿���喋�潦�� like '_Z%'; ��刻�� | ���憿���喋�潦�� | ������1a������ --------------------------------------+-----------------+---------------- ��喋�喋����乓�潦�踴����准�啜�押����� | 鈭暢01銝� | (1 row) -select * from 閮�蝞�璈���刻�� where ��刻�� ~ '��喋�喋����乓�潦�璟�����財' +select * from 閮�蝞�璈���刻�� where ��刻�� ~ '��喋�喋����乓�潦�璟�����財'; ��刻�� | ���憿���喋�潦�� | ������1a������ -----------------------------------------+-----------------+---------------- ��喋�喋����乓�潦�踴�������嫘����研�� | 璈�A01銝� | ��喋�喋����乓�潦�踴�啜�押����������胯�� | ���B10銝� | (2 rows) -select * from 閮�蝞�璈���刻�� where ��刻�� ~* '��喋�喋����乓�潦�璟�����財' +select * from 閮�蝞�璈���刻�� where ��刻�� ~* '��喋�喋����乓�潦�璟�����財'; ��刻�� | ���憿���喋�潦�� | ������1a������ -----------------------------------------+-----------------+---------------- ��喋�喋����乓�潦�踴�������嫘����研�� | 璈�A01銝� | ��喋�喋����乓�潦�踴�啜�押����������胯�� | ���B10銝� | (2 rows) -select *,character_length(��刻��) from 閮�蝞�璈���刻�� - ��刻�� | ���憿���喋�潦�� | ������1a������ | length ------------------------------------------+-----------------+----------------+-------- - ��喋�喋����乓�潦�踴�������嫘����研�� | 璈�A01銝� | | 12 - ��喋�喋����乓�潦�踴�啜�押����������胯�� | ���B10銝� | | 13 - ��喋�喋����乓�潦�踴����准�啜�押����� | 鈭暢01銝� | | 12 +select *,character_length(��刻��) from 閮�蝞�璈���刻��; + ��刻�� | ���憿���喋�潦�� | ������1a������ | char_length +-----------------------------------------+-----------------+----------------+------------- + ��喋�喋����乓�潦�踴�������嫘����研�� | 璈�A01銝� | | 12 + ��喋�喋����乓�潦�踴�啜�押����������胯�� | ���B10銝� | | 13 + ��喋�喋����乓�潦�踴����准�啜�押����� | 鈭暢01銝� | | 12 (3 rows) -select *,octet_length(��刻��) from 閮�蝞�璈���刻�� +select *,octet_length(��刻��) from 閮�蝞�璈���刻��; ��刻�� | ���憿���喋�潦�� | ������1a������ | octet_length -----------------------------------------+-----------------+----------------+-------------- ��喋�喋����乓�潦�踴�������嫘����研�� | 璈�A01銝� | | 36 @@ -69,7 +69,7 @@ select *,octet_length(��刻��) from 閮�蝞�璈���刻�� ��喋�喋����乓�潦�踴����准�啜�押����� | 鈭暢01銝� | | 36 (3 rows) -select *,position('���' in ��刻��) from 閮�蝞�璈���刻�� +select *,position('���' in ��刻��) from 閮�蝞�璈���刻��; ��刻�� | ���憿���喋�潦�� | ������1a������ | strpos -----------------------------------------+-----------------+----------------+-------- ��喋�喋����乓�潦�踴�������嫘����研�� | 璈�A01銝� | | 7 @@ -77,7 +77,7 @@ select *,position('���' in ��刻��) from 閮�蝞�璈���刻�� ��喋�喋����乓�潦�踴����准�啜�押����� | 鈭暢01銝� | | 0 (3 rows) -select *,substring(��刻�� from 10 for 4) from 閮�蝞�璈���刻�� +select *,substring(��刻�� from 10 for 4) from 閮�蝞�璈���刻��; ��刻�� | ���憿���喋�潦�� | ������1a������ | substr -----------------------------------------+-----------------+----------------+-------------- ��喋�喋����乓�潦�踴�������嫘����研�� | 璈�A01銝� | | �����研�� [parent: d14c8aab9957]