Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit beba98d

Browse files
committed
Adopt for new psql
1 parent 28125ed commit beba98d

File tree

2 files changed

+129
-129
lines changed

2 files changed

+129
-129
lines changed

src/test/mb/expected/euc_jp.out

+64-64
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�� | | 12
60-
����ԥ塼������ե��å���|ʬB10�� | | 13
61-
����ԥ塼���ץ�����ޡ� |��Z01�� | | 12
56+
select *,character_length(�Ѹ�) from �׻����Ѹ�;
57+
�Ѹ� | ʬ�ॳ���� | ����1a���� | length
58+
----------------------------+------------+------------+--------
59+
����ԥ塼���ǥ����ץ쥤 | ��A01�� | | 12
60+
����ԥ塼������ե��å��� | ʬB10�� | | 13
61+
����ԥ塼���ץ�����ޡ� | ��Z01�� | | 12
6262
(3 rows)
6363

64-
QUERY: select *,octet_length(�Ѹ�) from �׻����Ѹ�;
65-
�Ѹ� |ʬ�ॳ����|����1a����|octet_length
66-
--------------------------+----------+----------+------------
67-
����ԥ塼���ǥ����ץ쥤 |��A01�� | | 24
68-
����ԥ塼������ե��å���|ʬB10�� | | 26
69-
����ԥ塼���ץ�����ޡ� |��Z01�� | | 24
64+
select *,octet_length(�Ѹ�) from �׻����Ѹ�;
65+
�Ѹ� | ʬ�ॳ���� | ����1a���� | octet_length
66+
----------------------------+------------+------------+--------------
67+
����ԥ塼���ǥ����ץ쥤 | ��A01�� | | 24
68+
����ԥ塼������ե��å��� | ʬB10�� | | 26
69+
����ԥ塼���ץ�����ޡ� | ��Z01�� | | 24
7070
(3 rows)
7171

72-
QUERY: select *,position('��' in �Ѹ�) from �׻����Ѹ�;
73-
�Ѹ� |ʬ�ॳ����|����1a����|strpos
74-
--------------------------+----------+----------+------
75-
����ԥ塼���ǥ����ץ쥤 |��A01�� | | 7
76-
����ԥ塼������ե��å���|ʬB10�� | | 0
77-
����ԥ塼���ץ�����ޡ� |��Z01�� | | 0
72+
select *,position('��' in �Ѹ�) from �׻����Ѹ�;
73+
�Ѹ� | ʬ�ॳ���� | ����1a���� | strpos
74+
----------------------------+------------+------------+--------
75+
����ԥ塼���ǥ����ץ쥤 | ��A01�� | | 7
76+
����ԥ塼������ե��å��� | ʬB10�� | | 0
77+
����ԥ塼���ץ�����ޡ� | ��Z01�� | | 0
7878
(3 rows)
7979

80-
QUERY: select *,substring(�Ѹ� from 10 for 4) from �׻����Ѹ�;
81-
�Ѹ� |ʬ�ॳ����|����1a����|substr
82-
--------------------------+----------+----------+--------
83-
����ԥ塼���ǥ����ץ쥤 |��A01�� | |�ץ쥤
84-
����ԥ塼������ե��å���|ʬB10�� | |���å���
85-
����ԥ塼���ץ�����ޡ� |��Z01�� | |��ޡ�
80+
select *,substring(�Ѹ� from 10 for 4) from �׻����Ѹ�;
81+
�Ѹ� | ʬ�ॳ���� | ����1a���� | substr
82+
----------------------------+------------+------------+----------
83+
����ԥ塼���ǥ����ץ쥤 | ��A01�� | | �ץ쥤
84+
����ԥ塼������ե��å��� | ʬB10�� | | ���å���
85+
����ԥ塼���ץ�����ޡ� | ��Z01�� | | ��ޡ�
8686
(3 rows)
8787

src/test/mb/expected/sjis.out

+65-65
Original file line numberDiff line numberDiff line change
@@ -1,90 +1,90 @@
1-
QUERY: drop table �v�Z�@�p��;
2-
QUERY: create table �v�Z�@�p�� (�p�� text, ���ރR�[�h varchar, ���l1A���� char(16));
3-
QUERY: create index �v�Z�@�p��index1 on �v�Z�@�p�� using btree (�p��);
4-
QUERY: create index �v�Z�@�p��index2 on �v�Z�@�p�� using hash (���ރR�[�h);
5-
QUERY: insert into �v�Z�@�p�� values('�R���s���[�^�f�B�X�v���C','�@A01��');
6-
QUERY: insert into �v�Z�@�p�� values('�R���s���[�^�O���t�B�b�N�X','��B10��');
7-
QUERY: insert into �v�Z�@�p�� values('�R���s���[�^�v���O���}�[','�lZ01��');
8-
QUERY: vacuum �v�Z�@�p��;
9-
QUERY: select * from �v�Z�@�p��;
10-
�p�� |���ރR�[�h|���l1a����
11-
--------------------------+----------+----------
12-
�R���s���[�^�f�B�X�v���C |�@A01�� |
13-
�R���s���[�^�O���t�B�b�N�X|��B10�� |
14-
�R���s���[�^�v���O���}�[ |�lZ01�� |
1+
drop table �v�Z�@�p��;
2+
create table �v�Z�@�p�� (�p�� text, ���ރR�[�h varchar, ���l1A���� char(16));
3+
create index �v�Z�@�p��index1 on �v�Z�@�p�� using btree (�p��);
4+
create index �v�Z�@�p��index2 on �v�Z�@�p�� using hash (���ރR�[�h);
5+
insert into �v�Z�@�p�� values('�R���s���[�^�f�B�X�v���C','�@A01��');
6+
insert into �v�Z�@�p�� values('�R���s���[�^�O���t�B�b�N�X','��B10��');
7+
insert into �v�Z�@�p�� values('�R���s���[�^�v���O���}�[','�lZ01��');
8+
vacuum �v�Z�@�p��;
9+
select * from �v�Z�@�p��;
10+
�p�� | ���ރR�[�h | ���l1a����
11+
----------------------------+------------+------------
12+
�R���s���[�^�f�B�X�v���C | �@A01�� |
13+
�R���s���[�^�O���t�B�b�N�X | ��B10�� |
14+
�R���s���[�^�v���O���}�[ | �lZ01�� |
1515
(3 rows)
1616

17-
QUERY: select * from �v�Z�@�p�� where ���ރR�[�h = '�lZ01��';
18-
�p�� |���ރR�[�h|���l1a����
19-
------------------------+----------+----------
20-
�R���s���[�^�v���O���}�[|�lZ01�� |
17+
select * from �v�Z�@�p�� where ���ރR�[�h = '�lZ01��';
18+
�p�� | ���ރR�[�h | ���l1a����
19+
--------------------------+------------+------------
20+
�R���s���[�^�v���O���}�[ | �lZ01�� |
2121
(1 row)
2222

23-
QUERY: select * from �v�Z�@�p�� where ���ރR�[�h ~* '�lz01��';
24-
�p�� |���ރR�[�h|���l1a����
25-
------------------------+----------+----------
26-
�R���s���[�^�v���O���}�[|�lZ01�� |
23+
select * from �v�Z�@�p�� where ���ރR�[�h ~* '�lz01��';
24+
�p�� | ���ރR�[�h | ���l1a����
25+
--------------------------+------------+------------
26+
�R���s���[�^�v���O���}�[ | �lZ01�� |
2727
(1 row)
2828

29-
QUERY: select * from �v�Z�@�p�� where ���ރR�[�h like '_Z01_';
30-
�p�� |���ރR�[�h|���l1a����
31-
------------------------+----------+----------
32-
�R���s���[�^�v���O���}�[|�lZ01�� |
29+
select * from �v�Z�@�p�� where ���ރR�[�h like '_Z01_';
30+
�p�� | ���ރR�[�h | ���l1a����
31+
--------------------------+------------+------------
32+
�R���s���[�^�v���O���}�[ | �lZ01�� |
3333
(1 row)
3434

35-
QUERY: select * from �v�Z�@�p�� where ���ރR�[�h like '_Z%';
36-
�p�� |���ރR�[�h|���l1a����
37-
------------------------+----------+----------
38-
�R���s���[�^�v���O���}�[|�lZ01�� |
35+
select * from �v�Z�@�p�� where ���ރR�[�h like '_Z%';
36+
�p�� | ���ރR�[�h | ���l1a����
37+
--------------------------+------------+------------
38+
�R���s���[�^�v���O���}�[ | �lZ01�� |
3939
(1 row)
4040

41-
QUERY: select * from �v�Z�@�p�� where �p�� ~ '�R���s���[�^[�f�O]';
42-
�p�� |���ރR�[�h|���l1a����
43-
--------------------------+----------+----------
44-
�R���s���[�^�f�B�X�v���C |�@A01�� |
45-
�R���s���[�^�O���t�B�b�N�X|��B10�� |
41+
select * from �v�Z�@�p�� where �p�� ~ '�R���s���[�^[�f�O]';
42+
�p�� | ���ރR�[�h | ���l1a����
43+
----------------------------+------------+------------
44+
�R���s���[�^�f�B�X�v���C | �@A01�� |
45+
�R���s���[�^�O���t�B�b�N�X | ��B10�� |
4646
(2 rows)
4747

48-
QUERY: select * from �v�Z�@�p�� where �p�� ~* '�R���s���[�^[�f�O]';
49-
�p�� |���ރR�[�h|���l1a����
50-
--------------------------+----------+----------
51-
�R���s���[�^�f�B�X�v���C |�@A01�� |
52-
�R���s���[�^�O���t�B�b�N�X|��B10�� |
48+
select * from �v�Z�@�p�� where �p�� ~* '�R���s���[�^[�f�O]';
49+
�p�� | ���ރR�[�h | ���l1a����
50+
----------------------------+------------+------------
51+
�R���s���[�^�f�B�X�v���C | �@A01�� |
52+
�R���s���[�^�O���t�B�b�N�X | ��B10�� |
5353
(2 rows)
5454

55-
QUERY: select *,character_length(�p��) from �v�Z�@�p��;
56-
�p�� |���ރR�[�h|���l1a����|length
57-
--------------------------+----------+----------+------
58-
�R���s���[�^�f�B�X�v���C |�@A01�� | | 12
59-
�R���s���[�^�O���t�B�b�N�X|��B10�� | | 13
60-
�R���s���[�^�v���O���}�[ |�lZ01�� | | 12
55+
select *,character_length(�p��) from �v�Z�@�p��;
56+
�p�� | ���ރR�[�h | ���l1a���� | length
57+
----------------------------+------------+------------+--------
58+
�R���s���[�^�f�B�X�v���C | �@A01�� | | 12
59+
�R���s���[�^�O���t�B�b�N�X | ��B10�� | | 13
60+
�R���s���[�^�v���O���}�[ | �lZ01�� | | 12
6161
(3 rows)
6262

63-
QUERY: select *,octet_length(�p��) from �v�Z�@�p��;
64-
�p�� |���ރR�[�h|���l1a����|octet_length
65-
--------------------------+----------+----------+------------
66-
�R���s���[�^�f�B�X�v���C |�@A01�� | | 24
67-
�R���s���[�^�O���t�B�b�N�X|��B10�� | | 26
68-
�R���s���[�^�v���O���}�[ |�lZ01�� | | 24
63+
select *,octet_length(�p��) from �v�Z�@�p��;
64+
�p�� | ���ރR�[�h | ���l1a���� | octet_length
65+
----------------------------+------------+------------+--------------
66+
�R���s���[�^�f�B�X�v���C | �@A01�� | | 24
67+
�R���s���[�^�O���t�B�b�N�X | ��B10�� | | 26
68+
�R���s���[�^�v���O���}�[ | �lZ01�� | | 24
6969
(3 rows)
7070

71-
QUERY: select *,position('�f' in �p��) from �v�Z�@�p��;
72-
�p�� |���ރR�[�h|���l1a����|strpos
73-
--------------------------+----------+----------+------
74-
�R���s���[�^�f�B�X�v���C |�@A01�� | | 7
75-
�R���s���[�^�O���t�B�b�N�X|��B10�� | | 0
76-
�R���s���[�^�v���O���}�[ |�lZ01�� | | 0
71+
select *,position('�f' in �p��) from �v�Z�@�p��;
72+
�p�� | ���ރR�[�h | ���l1a���� | strpos
73+
----------------------------+------------+------------+--------
74+
�R���s���[�^�f�B�X�v���C | �@A01�� | | 7
75+
�R���s���[�^�O���t�B�b�N�X | ��B10�� | | 0
76+
�R���s���[�^�v���O���}�[ | �lZ01�� | | 0
7777
(3 rows)
7878

79-
QUERY: select *,substring(�p�� from 10 for 4) from �v�Z�@�p��;
80-
�p�� |���ރR�[�h|���l1a����|substr
81-
--------------------------+----------+----------+--------
82-
�R���s���[�^�f�B�X�v���C |�@A01�� | |�v���C
83-
�R���s���[�^�O���t�B�b�N�X|��B10�� | |�B�b�N�X
84-
�R���s���[�^�v���O���}�[ |�lZ01�� | |���}�[
79+
select *,substring(�p�� from 10 for 4) from �v�Z�@�p��;
80+
�p�� | ���ރR�[�h | ���l1a���� | substr
81+
----------------------------+------------+------------+----------
82+
�R���s���[�^�f�B�X�v���C | �@A01�� | | �v���C
83+
�R���s���[�^�O���t�B�b�N�X | ��B10�� | | �B�b�N�X
84+
�R���s���[�^�v���O���}�[ | �lZ01�� | | ���}�[
8585
(3 rows)
8686

87-
QUERY: copy �v�Z�@�p�� to stdout;
87+
copy �v�Z�@�p�� to stdout;
8888
�R���s���[�^�f�B�X�v���C �@A01�� \N
8989
�R���s���[�^�O���t�B�b�N�X ��B10�� \N
9090
�R���s���[�^�v���O���}�[ �lZ01�� \N

0 commit comments

Comments
 (0)