Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit544cafb

Browse files
committed
Fix multibyte regress results for EUC_CN, EUC_KR and EUC_TW
1 parentf30d5f9 commit544cafb

File tree

3 files changed

+190
-190
lines changed

3 files changed

+190
-190
lines changed

‎src/test/regress/expected/euc_cn.out

Lines changed: 64 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -1,87 +1,87 @@
1-
QUERY:drop table ���������;
1+
drop table ���������;
22
ERROR: Relation '���������' does not exist
3-
QUERY:create table ���������(���� text, ����� varchar, ��ע1A char(16));
4-
QUERY:create index ���������index1 on ��������� using btree(����);
5-
QUERY:create index ���������index2 on ��������� using btree(�����);
6-
QUERY:insert into ��������� values('������ʾ��','��A01��');
7-
QUERY:insert into ��������� values('����ͼ��','��B01��');
8-
QUERY:insert into ��������� values('���Գ���Ա','��Z01��');
9-
QUERY:vacuum ���������;
10-
QUERY:select * from ���������;
11-
���� |�����|��ע1a
12-
----------+-------+------
13-
������ʾ��|��A01��|
14-
����ͼ��|��B01��|
15-
���Գ���Ա|��Z01��|
3+
create table ���������(���� text, ����� varchar, ��ע1A char(16));
4+
create index ���������index1 on ��������� using btree(����);
5+
create index ���������index2 on ��������� using btree(�����);
6+
insert into ��������� values('������ʾ��','��A01��');
7+
insert into ��������� values('����ͼ��','��B01��');
8+
insert into ��������� values('���Գ���Ա','��Z01��');
9+
vacuum ���������;
10+
select * from ���������;
11+
����|����� |��ע1a
12+
------------+---------+--------
13+
������ʾ�� |��A01�� |
14+
����ͼ�� |��B01�� |
15+
���Գ���Ա |��Z01�� |
1616
(3 rows)
1717

18-
QUERY:select * from ��������� where ����� = '��Z01��';
19-
���� |�����|��ע1a
20-
----------+-------+------
21-
���Գ���Ա|��Z01��|
18+
select * from ��������� where ����� = '��Z01��';
19+
����|����� |��ע1a
20+
------------+---------+--------
21+
���Գ���Ա |��Z01�� |
2222
(1 row)
2323

24-
QUERY:select * from ��������� where ����� ~* '��z01��';
25-
���� |�����|��ע1a
26-
----------+-------+------
27-
���Գ���Ա|��Z01��|
24+
select * from ��������� where ����� ~* '��z01��';
25+
����|����� |��ע1a
26+
------------+---------+--------
27+
���Գ���Ա |��Z01�� |
2828
(1 row)
2929

30-
QUERY:select * from ��������� where ����� like '_Z01_';
31-
���� |�����|��ע1a
32-
----------+-------+------
33-
���Գ���Ա|��Z01��|
30+
select * from ��������� where ����� like '_Z01_';
31+
����|����� |��ע1a
32+
------------+---------+--------
33+
���Գ���Ա |��Z01�� |
3434
(1 row)
3535

36-
QUERY:select * from ��������� where ����� like '_Z%';
37-
���� |�����|��ע1a
38-
----------+-------+------
39-
���Գ���Ա|��Z01��|
36+
select * from ��������� where ����� like '_Z%';
37+
����|����� |��ע1a
38+
------------+---------+--------
39+
���Գ���Ա |��Z01�� |
4040
(1 row)
4141

42-
QUERY:select * from ��������� where ���� ~ '����[��ͼ]';
43-
���� |�����|��ע1a
44-
----------+-------+------
45-
������ʾ��|��A01��|
46-
����ͼ��|��B01��|
42+
select * from ��������� where ���� ~ '����[��ͼ]';
43+
����|����� |��ע1a
44+
------------+---------+--------
45+
������ʾ�� |��A01�� |
46+
����ͼ�� |��B01�� |
4747
(2 rows)
4848

49-
QUERY:select * from ��������� where ���� ~* '����[��ͼ]';
50-
���� |�����|��ע1a
51-
----------+-------+------
52-
������ʾ��|��A01��|
53-
����ͼ��|��B01��|
49+
select * from ��������� where ���� ~* '����[��ͼ]';
50+
����|����� |��ע1a
51+
------------+---------+--------
52+
������ʾ�� |��A01�� |
53+
����ͼ�� |��B01�� |
5454
(2 rows)
5555

56-
QUERY:select *,character_length(����) from ���������;
57-
���� |�����|��ע1a|length
58-
----------+-------+------+------
59-
������ʾ��|��A01��|| 5
60-
����ͼ��|��B01��|| 4
61-
���Գ���Ա|��Z01��|| 5
56+
select *,character_length(����) from ���������;
57+
����|����� |��ע1a |length
58+
------------+---------+--------+--------
59+
������ʾ�� |��A01��| | 5
60+
����ͼ�� |��B01��| | 4
61+
���Գ���Ա |��Z01��| | 5
6262
(3 rows)
6363

64-
QUERY:select *,octet_length(����) from ���������;
65-
���� |�����|��ע1a|octet_length
66-
----------+-------+------+------------
67-
������ʾ��|��A01��|| 10
68-
����ͼ��|��B01��|| 8
69-
���Գ���Ա|��Z01��|| 10
64+
select *,octet_length(����) from ���������;
65+
����|����� |��ע1a |octet_length
66+
------------+---------+--------+--------------
67+
������ʾ�� |��A01��| | 10
68+
����ͼ�� |��B01��| | 8
69+
���Գ���Ա |��Z01��| | 10
7070
(3 rows)
7171

72-
QUERY:select *,position('��' in ����) from ���������;
73-
���� |�����|��ע1a|strpos
74-
----------+-------+------+------
75-
������ʾ��|��A01��|| 3
76-
����ͼ��|��B01��|| 0
77-
���Գ���Ա|��Z01��|| 0
72+
select *,position('��' in ����) from ���������;
73+
����|����� |��ע1a |strpos
74+
------------+---------+--------+--------
75+
������ʾ�� |��A01��| | 3
76+
����ͼ�� |��B01��| | 0
77+
���Գ���Ա |��Z01��| | 0
7878
(3 rows)
7979

80-
QUERY:select *,substring(���� from 3 for 4) from ���������;
81-
���� |�����|��ע1a|substr
82-
----------+-------+------+------
83-
������ʾ��|��A01��||��ʾ��
84-
����ͼ��|��B01��||ͼ��
85-
���Գ���Ա|��Z01��||����Ա
80+
select *,substring(���� from 3 for 4) from ���������;
81+
����|����� |��ע1a |substr
82+
------------+---------+--------+--------
83+
������ʾ�� |��A01��| |��ʾ��
84+
����ͼ�� |��B01��| |ͼ��
85+
���Գ���Ա |��Z01��| |����Ա
8686
(3 rows)
8787

‎src/test/regress/expected/euc_kr.out

Lines changed: 64 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -1,87 +1,87 @@
1-
QUERY:drop table ͪߩѦ���;
1+
drop table ͪߩѦ���;
22
ERROR: Relation 'ͪߩѦ���' does not exist
3-
QUERY:create table ͪߩѦ��� (��� text, ��׾�ڵ� varchar, ���1A�� char(16));
4-
QUERY:create index ͪߩѦ���index1 on ͪߩѦ��� using btree (���);
5-
QUERY:create index ͪߩѦ���index2 on ͪߩѦ��� using hash (��׾�ڵ�);
6-
QUERY:insert into ͪߩѦ��� values('��ǻ�͵��÷���', 'ѦA01߾');
7-
QUERY:insert into ͪߩѦ��� values('��ǻ�ͱ׷��Ƚ�', '��B10��');
8-
QUERY:insert into ͪߩѦ��� values('��ǻ�����α׷���', '��Z01��');
9-
QUERY:vacuum ͪߩѦ���;
10-
QUERY:select * from ͪߩѦ���;
11-
���|��׾�ڵ�|���1a��
12-
----------------+--------+----------
13-
��ǻ�͵��÷���|ѦA01߾|
14-
��ǻ�ͱ׷��Ƚ�|��B10��|
15-
��ǻ�����α׷���|��Z01��|
3+
create table ͪߩѦ��� (��� text, ��׾�ڵ� varchar, ���1A�� char(16));
4+
create index ͪߩѦ���index1 on ͪߩѦ��� using btree (���);
5+
create index ͪߩѦ���index2 on ͪߩѦ��� using hash (��׾�ڵ�);
6+
insert into ͪߩѦ��� values('��ǻ�͵��÷���', 'ѦA01߾');
7+
insert into ͪߩѦ��� values('��ǻ�ͱ׷��Ƚ�', '��B10��');
8+
insert into ͪߩѦ��� values('��ǻ�����α׷���', '��Z01��');
9+
vacuum ͪߩѦ���;
10+
select * from ͪߩѦ���;
11+
��� |��׾�ڵ� |���1a��
12+
------------------+----------+------------
13+
��ǻ�͵��÷��� |ѦA01߾ |
14+
��ǻ�ͱ׷��Ƚ� |��B10�� |
15+
��ǻ�����α׷��� |��Z01�� |
1616
(3 rows)
1717

18-
QUERY:select * from ͪߩѦ��� where ��׾�ڵ� = '��Z01��';
19-
���|��׾�ڵ�|���1a��
20-
----------------+--------+----------
21-
��ǻ�����α׷���|��Z01��|
18+
select * from ͪߩѦ��� where ��׾�ڵ� = '��Z01��';
19+
��� |��׾�ڵ� |���1a��
20+
------------------+----------+------------
21+
��ǻ�����α׷��� |��Z01�� |
2222
(1 row)
2323

24-
QUERY:select * from ͪߩѦ��� where ��׾�ڵ� ~* '��z01��';
25-
���|��׾�ڵ�|���1a��
26-
----------------+--------+----------
27-
��ǻ�����α׷���|��Z01��|
24+
select * from ͪߩѦ��� where ��׾�ڵ� ~* '��z01��';
25+
��� |��׾�ڵ� |���1a��
26+
------------------+----------+------------
27+
��ǻ�����α׷��� |��Z01�� |
2828
(1 row)
2929

30-
QUERY:select * from ͪߩѦ��� where ��׾�ڵ� like '_Z01_';
31-
���|��׾�ڵ�|���1a��
32-
----------------+--------+----------
33-
��ǻ�����α׷���|��Z01��|
30+
select * from ͪߩѦ��� where ��׾�ڵ� like '_Z01_';
31+
��� |��׾�ڵ� |���1a��
32+
------------------+----------+------------
33+
��ǻ�����α׷��� |��Z01�� |
3434
(1 row)
3535

36-
QUERY:select * from ͪߩѦ��� where ��׾�ڵ� like '_Z%';
37-
���|��׾�ڵ�|���1a��
38-
----------------+--------+----------
39-
��ǻ�����α׷���|��Z01��|
36+
select * from ͪߩѦ��� where ��׾�ڵ� like '_Z%';
37+
��� |��׾�ڵ� |���1a��
38+
------------------+----------+------------
39+
��ǻ�����α׷��� |��Z01�� |
4040
(1 row)
4141

42-
QUERY:select * from ͪߩѦ��� where ��� ~ '��ǻ��[���]';
43-
���|��׾�ڵ�|���1a��
44-
----------------+--------+----------
45-
��ǻ�͵��÷���|ѦA01߾|
46-
��ǻ�ͱ׷��Ƚ�|��B10��|
42+
select * from ͪߩѦ��� where ��� ~ '��ǻ��[���]';
43+
��� |��׾�ڵ� |���1a��
44+
------------------+----------+------------
45+
��ǻ�͵��÷��� |ѦA01߾ |
46+
��ǻ�ͱ׷��Ƚ� |��B10�� |
4747
(2 rows)
4848

49-
QUERY:select * from ͪߩѦ��� where ��� ~* '��ǻ��[���]';
50-
���|��׾�ڵ�|���1a��
51-
----------------+--------+----------
52-
��ǻ�͵��÷���|ѦA01߾|
53-
��ǻ�ͱ׷��Ƚ�|��B10��|
49+
select * from ͪߩѦ��� where ��� ~* '��ǻ��[���]';
50+
��� |��׾�ڵ� |���1a��
51+
------------------+----------+------------
52+
��ǻ�͵��÷��� |ѦA01߾ |
53+
��ǻ�ͱ׷��Ƚ� |��B10�� |
5454
(2 rows)
5555

56-
QUERY:select *,character_length(���) from ͪߩѦ���;
57-
���|��׾�ڵ�|���1a��|length
58-
----------------+--------+----------+------
59-
��ǻ�͵��÷���|ѦA01߾ || 8
60-
��ǻ�ͱ׷��Ƚ�|��B10�� || 7
61-
��ǻ�����α׷���|��Z01�� || 8
56+
select *,character_length(���) from ͪߩѦ���;
57+
��� |��׾�ڵ� |���1a�� |length
58+
------------------+----------+------------+--------
59+
��ǻ�͵��÷��� |ѦA01߾| | 8
60+
��ǻ�ͱ׷��Ƚ� |��B10��| | 7
61+
��ǻ�����α׷��� |��Z01��| | 8
6262
(3 rows)
6363

64-
QUERY:select *,octet_length(���) from ͪߩѦ���;
65-
���|��׾�ڵ�|���1a��|octet_length
66-
----------------+--------+----------+------------
67-
��ǻ�͵��÷���|ѦA01߾ || 16
68-
��ǻ�ͱ׷��Ƚ�|��B10�� || 14
69-
��ǻ�����α׷���|��Z01�� || 16
64+
select *,octet_length(���) from ͪߩѦ���;
65+
��� |��׾�ڵ� |���1a�� |octet_length
66+
------------------+----------+------------+--------------
67+
��ǻ�͵��÷��� |ѦA01߾| | 16
68+
��ǻ�ͱ׷��Ƚ� |��B10��| | 14
69+
��ǻ�����α׷��� |��Z01��| | 16
7070
(3 rows)
7171

72-
QUERY:select *,position('��' in ���) from ͪߩѦ���;
73-
���|��׾�ڵ�|���1a��|strpos
74-
----------------+--------+----------+------
75-
��ǻ�͵��÷���|ѦA01߾ || 4
76-
��ǻ�ͱ׷��Ƚ�|��B10�� || 0
77-
��ǻ�����α׷���|��Z01�� || 0
72+
select *,position('��' in ���) from ͪߩѦ���;
73+
��� |��׾�ڵ� |���1a�� |strpos
74+
------------------+----------+------------+--------
75+
��ǻ�͵��÷��� |ѦA01߾| | 4
76+
��ǻ�ͱ׷��Ƚ� |��B10��| | 0
77+
��ǻ�����α׷��� |��Z01��| | 0
7878
(3 rows)
7979

80-
QUERY:select *,substring(��� from 3 for 4) from ͪߩѦ���;
81-
���|��׾�ڵ�|���1a��|substr
82-
----------------+--------+----------+--------
83-
��ǻ�͵��÷���|ѦA01߾ ||�͵���
84-
��ǻ�ͱ׷��Ƚ�|��B10�� ||�ͱ׷���
85-
��ǻ�����α׷���|��Z01�� ||�����α�
80+
select *,substring(��� from 3 for 4) from ͪߩѦ���;
81+
��� |��׾�ڵ� |���1a�� |substr
82+
------------------+----------+------------+----------
83+
��ǻ�͵��÷��� |ѦA01߾| |�͵���
84+
��ǻ�ͱ׷��Ƚ� |��B10��| |�ͱ׷���
85+
��ǻ�����α׷��� |��Z01��| |�����α�
8686
(3 rows)
8787

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp