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

Commit 805e0c4

Browse files
committed
Fixes for char_length() changes.
1 parent d14c8aa commit 805e0c4

File tree

8 files changed

+263
-263
lines changed

8 files changed

+263
-263
lines changed

src/test/mb/expected/big5.out

+24-24
Original file line numberDiff line numberDiff line change
@@ -1,80 +1,80 @@
1-
drop table �t�Ӹ��
2-
create table �t�Ӹ�� (��~�O text, ���q���Y varchar, �a�} varchar(16))
3-
create index �t�Ӹ��index1 on �t�Ӹ�� using btree (��~�O)
4-
create index �t�Ӹ��index2 on �t�Ӹ�� using hash (���q���Y)
5-
insert into �t�Ӹ�� values ('�q���~', '�F�F���', '�_A01��')
6-
insert into �t�Ӹ�� values ('�s�y�~', '�]���������q', '��B10��')
7-
insert into �t�Ӹ�� values ('�\���~', '�����ѥ��������q', '��Z01�E')
8-
vacuum �t�Ӹ��
9-
select * from �t�Ӹ��
1+
drop table �t�Ӹ��;
2+
create table �t�Ӹ�� (��~�O text, ���q���Y varchar, �a�} varchar(16));
3+
create index �t�Ӹ��index1 on �t�Ӹ�� using btree (��~�O);
4+
create index �t�Ӹ��index2 on �t�Ӹ�� using hash (���q���Y);
5+
insert into �t�Ӹ�� values ('�q���~', '�F�F���', '�_A01��');
6+
insert into �t�Ӹ�� values ('�s�y�~', '�]���������q', '��B10��');
7+
insert into �t�Ӹ�� values ('�\���~', '�����ѥ��������q', '��Z01�E');
8+
vacuum �t�Ӹ��;
9+
select * from �t�Ӹ��;
1010
��~�O | ���q���Y | �a�}
1111
--------+------------------+---------
1212
�q���~ | �F�F��� | �_A01��
1313
�s�y�~ | �]���������q | ��B10��
1414
�\���~ | �����ѥ��������q | ��Z01�E
1515
(3 rows)
1616

17-
select * from �t�Ӹ�� where �a�} = '��Z01�E'
17+
select * from �t�Ӹ�� where �a�} = '��Z01�E';
1818
��~�O | ���q���Y | �a�}
1919
--------+------------------+---------
2020
�\���~ | �����ѥ��������q | ��Z01�E
2121
(1 row)
2222

23-
select * from �t�Ӹ�� where �a�} ~* '��z01�E'
23+
select * from �t�Ӹ�� where �a�} ~* '��z01�E';
2424
��~�O | ���q���Y | �a�}
2525
--------+------------------+---------
2626
�\���~ | �����ѥ��������q | ��Z01�E
2727
(1 row)
2828

29-
select * from �t�Ӹ�� where �a�} like '_Z01_'
29+
select * from �t�Ӹ�� where �a�} like '_Z01_';
3030
��~�O | ���q���Y | �a�}
3131
--------+------------------+---------
3232
�\���~ | �����ѥ��������q | ��Z01�E
3333
(1 row)
3434

35-
select * from �t�Ӹ�� where �a�} like '_Z%'
35+
select * from �t�Ӹ�� where �a�} like '_Z%';
3636
��~�O | ���q���Y | �a�}
3737
--------+------------------+---------
3838
�\���~ | �����ѥ��������q | ��Z01�E
3939
(1 row)
4040

41-
select * from �t�Ӹ�� where ���q���Y ~ '�F�F��[�H�O��]'
41+
select * from �t�Ӹ�� where ���q���Y ~ '�F�F��[�H�O��]';
4242
��~�O | ���q���Y | �a�}
4343
--------+----------+---------
4444
�q���~ | �F�F��� | �_A01��
4545
(1 row)
4646

47-
select * from �t�Ӹ�� where ���q���Y ~* '�F�F��[�H�O��]'
47+
select * from �t�Ӹ�� where ���q���Y ~* '�F�F��[�H�O��]';
4848
��~�O | ���q���Y | �a�}
4949
--------+----------+---------
5050
�q���~ | �F�F��� | �_A01��
5151
(1 row)
5252

53-
select *, character_length(��~�O) from �t�Ӹ��
54-
��~�O | ���q���Y | �a�} | length
55-
--------+------------------+---------+--------
56-
�q���~ | �F�F��� | �_A01�� | 3
57-
�s�y�~ | �]���������q | ��B10�� | 3
58-
�\���~ | �����ѥ��������q | ��Z01�E | 3
53+
select *, character_length(��~�O) from �t�Ӹ��;
54+
��~�O | ���q���Y | �a�} | char_length
55+
--------+------------------+---------+-------------
56+
�q���~ | �F�F��� | �_A01�� | 3
57+
�s�y�~ | �]���������q | ��B10�� | 3
58+
�\���~ | �����ѥ��������q | ��Z01�E | 3
5959
(3 rows)
6060

61-
select *, octet_length(��~�O) from �t�Ӹ��
61+
select *, octet_length(��~�O) from �t�Ӹ��;
6262
��~�O | ���q���Y | �a�} | octet_length
6363
--------+------------------+---------+--------------
6464
�q���~ | �F�F��� | �_A01�� | 6
6565
�s�y�~ | �]���������q | ��B10�� | 6
6666
�\���~ | �����ѥ��������q | ��Z01�E | 6
6767
(3 rows)
6868

69-
select *, position('����' in ���q���Y) from �t�Ӹ��
69+
select *, position('����' in ���q���Y) from �t�Ӹ��;
7070
��~�O | ���q���Y | �a�} | strpos
7171
--------+------------------+---------+--------
7272
�q���~ | �F�F��� | �_A01�� | 0
7373
�s�y�~ | �]���������q | ��B10�� | 3
7474
�\���~ | �����ѥ��������q | ��Z01�E | 5
7575
(3 rows)
7676

77-
select *, substring(���q���Y from 3 for 6 ) from �t�Ӹ��
77+
select *, substring(���q���Y from 3 for 6 ) from �t�Ӹ��;
7878
��~�O | ���q���Y | �a�} | substr
7979
--------+------------------+---------+--------------
8080
�q���~ | �F�F��� | �_A01�� | ���

src/test/mb/expected/euc_cn.out

+24-24
Original file line numberDiff line numberDiff line change
@@ -1,83 +1,83 @@
1-
drop table ���������
1+
drop table ���������;
22
ERROR: Relation '���������' does not exist
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 ���������
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 ���������;
1111
���� | ����� | ��ע1a
1212
------------+---------+--------
1313
������ʾ�� | ��A01�� |
1414
����ͼ�� | ��B01�� |
1515
���Գ���Ա | ��Z01�� |
1616
(3 rows)
1717

18-
select * from ��������� where ����� = '��Z01��'
18+
select * from ��������� where ����� = '��Z01��';
1919
���� | ����� | ��ע1a
2020
------------+---------+--------
2121
���Գ���Ա | ��Z01�� |
2222
(1 row)
2323

24-
select * from ��������� where ����� ~* '��z01��'
24+
select * from ��������� where ����� ~* '��z01��';
2525
���� | ����� | ��ע1a
2626
------------+---------+--------
2727
���Գ���Ա | ��Z01�� |
2828
(1 row)
2929

30-
select * from ��������� where ����� like '_Z01_'
30+
select * from ��������� where ����� like '_Z01_';
3131
���� | ����� | ��ע1a
3232
------------+---------+--------
3333
���Գ���Ա | ��Z01�� |
3434
(1 row)
3535

36-
select * from ��������� where ����� like '_Z%'
36+
select * from ��������� where ����� like '_Z%';
3737
���� | ����� | ��ע1a
3838
------------+---------+--------
3939
���Գ���Ա | ��Z01�� |
4040
(1 row)
4141

42-
select * from ��������� where ���� ~ '����[��ͼ]'
42+
select * from ��������� where ���� ~ '����[��ͼ]';
4343
���� | ����� | ��ע1a
4444
------------+---------+--------
4545
������ʾ�� | ��A01�� |
4646
����ͼ�� | ��B01�� |
4747
(2 rows)
4848

49-
select * from ��������� where ���� ~* '����[��ͼ]'
49+
select * from ��������� where ���� ~* '����[��ͼ]';
5050
���� | ����� | ��ע1a
5151
------------+---------+--------
5252
������ʾ�� | ��A01�� |
5353
����ͼ�� | ��B01�� |
5454
(2 rows)
5555

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

64-
select *,octet_length(����) from ���������
64+
select *,octet_length(����) from ���������;
6565
���� | ����� | ��ע1a | octet_length
6666
------------+---------+--------+--------------
6767
������ʾ�� | ��A01�� | | 10
6868
����ͼ�� | ��B01�� | | 8
6969
���Գ���Ա | ��Z01�� | | 10
7070
(3 rows)
7171

72-
select *,position('��' in ����) from ���������
72+
select *,position('��' in ����) from ���������;
7373
���� | ����� | ��ע1a | strpos
7474
------------+---------+--------+--------
7575
������ʾ�� | ��A01�� | | 3
7676
����ͼ�� | ��B01�� | | 0
7777
���Գ���Ա | ��Z01�� | | 0
7878
(3 rows)
7979

80-
select *,substring(���� from 3 for 4) from ���������
80+
select *,substring(���� from 3 for 4) from ���������;
8181
���� | ����� | ��ע1a | substr
8282
------------+---------+--------+--------
8383
������ʾ�� | ��A01�� | | ��ʾ��

src/test/mb/expected/euc_jp.out

+24-24
Original file line numberDiff line numberDiff line change
@@ -1,83 +1,83 @@
1-
drop table �׻����Ѹ�
1+
drop table �׻����Ѹ�;
22
ERROR: Relation '�׻����Ѹ�' does not exist
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 �׻����Ѹ�
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 �׻����Ѹ�;
1111
�Ѹ� | ʬ�ॳ���� | ����1a����
1212
----------------------------+------------+------------
1313
����ԥ塼���ǥ����ץ쥤 | ��A01�� |
1414
����ԥ塼������ե��å��� | ʬB10�� |
1515
����ԥ塼���ץ�����ޡ� | ��Z01�� |
1616
(3 rows)
1717

18-
select * from �׻����Ѹ� where ʬ�ॳ���� = '��Z01��'
18+
select * from �׻����Ѹ� where ʬ�ॳ���� = '��Z01��';
1919
�Ѹ� | ʬ�ॳ���� | ����1a����
2020
--------------------------+------------+------------
2121
����ԥ塼���ץ�����ޡ� | ��Z01�� |
2222
(1 row)
2323

24-
select * from �׻����Ѹ� where ʬ�ॳ���� ~* '��z01��'
24+
select * from �׻����Ѹ� where ʬ�ॳ���� ~* '��z01��';
2525
�Ѹ� | ʬ�ॳ���� | ����1a����
2626
--------------------------+------------+------------
2727
����ԥ塼���ץ�����ޡ� | ��Z01�� |
2828
(1 row)
2929

30-
select * from �׻����Ѹ� where ʬ�ॳ���� like '_Z01_'
30+
select * from �׻����Ѹ� where ʬ�ॳ���� like '_Z01_';
3131
�Ѹ� | ʬ�ॳ���� | ����1a����
3232
--------------------------+------------+------------
3333
����ԥ塼���ץ�����ޡ� | ��Z01�� |
3434
(1 row)
3535

36-
select * from �׻����Ѹ� where ʬ�ॳ���� like '_Z%'
36+
select * from �׻����Ѹ� where ʬ�ॳ���� like '_Z%';
3737
�Ѹ� | ʬ�ॳ���� | ����1a����
3838
--------------------------+------------+------------
3939
����ԥ塼���ץ�����ޡ� | ��Z01�� |
4040
(1 row)
4141

42-
select * from �׻����Ѹ� where �Ѹ� ~ '����ԥ塼��[�ǥ�]'
42+
select * from �׻����Ѹ� where �Ѹ� ~ '����ԥ塼��[�ǥ�]';
4343
�Ѹ� | ʬ�ॳ���� | ����1a����
4444
----------------------------+------------+------------
4545
����ԥ塼���ǥ����ץ쥤 | ��A01�� |
4646
����ԥ塼������ե��å��� | ʬB10�� |
4747
(2 rows)
4848

49-
select * from �׻����Ѹ� where �Ѹ� ~* '����ԥ塼��[�ǥ�]'
49+
select * from �׻����Ѹ� where �Ѹ� ~* '����ԥ塼��[�ǥ�]';
5050
�Ѹ� | ʬ�ॳ���� | ����1a����
5151
----------------------------+------------+------------
5252
����ԥ塼���ǥ����ץ쥤 | ��A01�� |
5353
����ԥ塼������ե��å��� | ʬB10�� |
5454
(2 rows)
5555

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

64-
select *,octet_length(�Ѹ�) from �׻����Ѹ�
64+
select *,octet_length(�Ѹ�) from �׻����Ѹ�;
6565
�Ѹ� | ʬ�ॳ���� | ����1a���� | octet_length
6666
----------------------------+------------+------------+--------------
6767
����ԥ塼���ǥ����ץ쥤 | ��A01�� | | 24
6868
����ԥ塼������ե��å��� | ʬB10�� | | 26
6969
����ԥ塼���ץ�����ޡ� | ��Z01�� | | 24
7070
(3 rows)
7171

72-
select *,position('��' in �Ѹ�) from �׻����Ѹ�
72+
select *,position('��' in �Ѹ�) from �׻����Ѹ�;
7373
�Ѹ� | ʬ�ॳ���� | ����1a���� | strpos
7474
----------------------------+------------+------------+--------
7575
����ԥ塼���ǥ����ץ쥤 | ��A01�� | | 7
7676
����ԥ塼������ե��å��� | ʬB10�� | | 0
7777
����ԥ塼���ץ�����ޡ� | ��Z01�� | | 0
7878
(3 rows)
7979

80-
select *,substring(�Ѹ� from 10 for 4) from �׻����Ѹ�
80+
select *,substring(�Ѹ� from 10 for 4) from �׻����Ѹ�;
8181
�Ѹ� | ʬ�ॳ���� | ����1a���� | substr
8282
----------------------------+------------+------------+----------
8383
����ԥ塼���ǥ����ץ쥤 | ��A01�� | | �ץ쥤

0 commit comments

Comments
 (0)