Skip to content

Commit 8b1b34f

Browse files
tglsfdctglsfdc
committed
Update pltcl regress test's expected output for 7.0 psql output format.
NOTE: this implementation of tcl_avg() fails with 'divide by zero' for zero input rows. It ought to return NULL, but pltcl does not currently provide a way to do that, so I'm leaving the problem unsolved for now.
1 parent 0d72b2d commit 8b1b34f

File tree

1 file changed

+133
-137
lines changed

1 file changed

+133
-137
lines changed

‎src/pl/tcl/test/test.expected

Lines changed: 133 additions & 137 deletions
Original file line numberDiff line numberDiff line change
@@ -1,178 +1,174 @@
1-
QUERY: insert into T_pkey1 values (1, 'key1-1', 'test key');
2-
QUERY: insert into T_pkey1 values (1, 'key1-2', 'test key');
3-
QUERY: insert into T_pkey1 values (1, 'key1-3', 'test key');
4-
QUERY: insert into T_pkey1 values (2, 'key2-1', 'test key');
5-
QUERY: insert into T_pkey1 values (2, 'key2-2', 'test key');
6-
QUERY: insert into T_pkey1 values (2, 'key2-3', 'test key');
7-
QUERY: insert into T_pkey2 values (1, 'key1-1', 'test key');
8-
QUERY: insert into T_pkey2 values (1, 'key1-2', 'test key');
9-
QUERY: insert into T_pkey2 values (1, 'key1-3', 'test key');
10-
QUERY: insert into T_pkey2 values (2, 'key2-1', 'test key');
11-
QUERY: insert into T_pkey2 values (2, 'key2-2', 'test key');
12-
QUERY: insert into T_pkey2 values (2, 'key2-3', 'test key');
13-
QUERY: select * from T_pkey1;
14-
key1|key2 |txt
15-
----+--------------------+----------------------------------------
16-
1|key1-1 |test key
17-
1|key1-2 |test key
18-
1|key1-3 |test key
19-
2|key2-1 |test key
20-
2|key2-2 |test key
21-
2|key2-3 |test key
1+
insert into T_pkey1 values (1, 'key1-1', 'test key');
2+
insert into T_pkey1 values (1, 'key1-2', 'test key');
3+
insert into T_pkey1 values (1, 'key1-3', 'test key');
4+
insert into T_pkey1 values (2, 'key2-1', 'test key');
5+
insert into T_pkey1 values (2, 'key2-2', 'test key');
6+
insert into T_pkey1 values (2, 'key2-3', 'test key');
7+
insert into T_pkey2 values (1, 'key1-1', 'test key');
8+
insert into T_pkey2 values (1, 'key1-2', 'test key');
9+
insert into T_pkey2 values (1, 'key1-3', 'test key');
10+
insert into T_pkey2 values (2, 'key2-1', 'test key');
11+
insert into T_pkey2 values (2, 'key2-2', 'test key');
12+
insert into T_pkey2 values (2, 'key2-3', 'test key');
13+
select * from T_pkey1;
14+
key1 | key2 | txt
15+
------+----------------------+------------------------------------------
16+
1 | key1-1 | test key
17+
1 | key1-2 | test key
18+
1 | key1-3 | test key
19+
2 | key2-1 | test key
20+
2 | key2-2 | test key
21+
2 | key2-3 | test key
2222
(6 rows)
2323

24-
QUERY: select * from T_pkey2;
25-
key1|key2 |txt
26-
----+--------------------+----------------------------------------
27-
1|KEY1-1 |test key
28-
1|KEY1-2 |test key
29-
1|KEY1-3 |test key
30-
2|KEY2-1 |test key
31-
2|KEY2-2 |test key
32-
2|KEY2-3 |test key
24+
select * from T_pkey2;
25+
key1 | key2 | txt
26+
------+----------------------+------------------------------------------
27+
1 | KEY1-1 | test key
28+
1 | KEY1-2 | test key
29+
1 | KEY1-3 | test key
30+
2 | KEY2-1 | test key
31+
2 | KEY2-2 | test key
32+
2 | KEY2-3 | test key
3333
(6 rows)
3434

35-
QUERY: insert into T_pkey1 values (1, 'KEY1-3', 'should work');
36-
QUERY: insert into T_pkey2 values (1, 'KEY1-3', 'should fail');
35+
insert into T_pkey1 values (1, 'KEY1-3', 'should work');
36+
insert into T_pkey2 values (1, 'KEY1-3', 'should fail');
3737
ERROR: duplicate key '1', 'KEY1-3' for T_pkey2
38-
QUERY: insert into T_dta1 values ('trec 1', 1, 'key1-1');
39-
QUERY: insert into T_dta1 values ('trec 2', 1, 'key1-2');
40-
QUERY: insert into T_dta1 values ('trec 3', 1, 'key1-3');
41-
QUERY: insert into T_dta1 values ('trec 4', 1, 'key1-4');
38+
insert into T_dta1 values ('trec 1', 1, 'key1-1');
39+
insert into T_dta1 values ('trec 2', 1, 'key1-2');
40+
insert into T_dta1 values ('trec 3', 1, 'key1-3');
41+
insert into T_dta1 values ('trec 4', 1, 'key1-4');
4242
ERROR: key for t_dta1 not in t_pkey1
43-
QUERY: insert into T_dta2 values ('trec 1', 1, 'KEY1-1');
44-
QUERY: insert into T_dta2 values ('trec 2', 1, 'KEY1-2');
45-
QUERY: insert into T_dta2 values ('trec 3', 1, 'KEY1-3');
46-
QUERY: insert into T_dta2 values ('trec 4', 1, 'KEY1-4');
43+
insert into T_dta2 values ('trec 1', 1, 'KEY1-1');
44+
insert into T_dta2 values ('trec 2', 1, 'KEY1-2');
45+
insert into T_dta2 values ('trec 3', 1, 'KEY1-3');
46+
insert into T_dta2 values ('trec 4', 1, 'KEY1-4');
4747
ERROR: key for t_dta2 not in t_pkey2
48-
QUERY: select * from T_dta1;
49-
tkey |ref1|ref2
50-
----------+----+--------------------
51-
trec 1 | 1|key1-1
52-
trec 2 | 1|key1-2
53-
trec 3 | 1|key1-3
48+
select * from T_dta1;
49+
tkey | ref1 | ref2
50+
------------+------+----------------------
51+
trec 1 | 1 | key1-1
52+
trec 2 | 1 | key1-2
53+
trec 3 | 1 | key1-3
5454
(3 rows)
5555

56-
QUERY: select * from T_dta2;
57-
tkey |ref1|ref2
58-
----------+----+--------------------
59-
trec 1 | 1|KEY1-1
60-
trec 2 | 1|KEY1-2
61-
trec 3 | 1|KEY1-3
56+
select * from T_dta2;
57+
tkey | ref1 | ref2
58+
------------+------+----------------------
59+
trec 1 | 1 | KEY1-1
60+
trec 2 | 1 | KEY1-2
61+
trec 3 | 1 | KEY1-3
6262
(3 rows)
6363

64-
QUERY: update T_pkey1 set key2 = 'key2-9' where key1 = 2 and key2 = 'key2-1';
65-
QUERY: update T_pkey1 set key2 = 'key1-9' where key1 = 1 and key2 = 'key1-1';
64+
update T_pkey1 set key2 = 'key2-9' where key1 = 2 and key2 = 'key2-1';
65+
update T_pkey1 set key2 = 'key1-9' where key1 = 1 and key2 = 'key1-1';
6666
ERROR: key '1', 'key1-1 ' referenced by T_dta1
67-
QUERY: delete from T_pkey1 where key1 = 2 and key2 = 'key2-2';
68-
QUERY: delete from T_pkey1 where key1 = 1 and key2 = 'key1-2';
67+
delete from T_pkey1 where key1 = 2 and key2 = 'key2-2';
68+
delete from T_pkey1 where key1 = 1 and key2 = 'key1-2';
6969
ERROR: key '1', 'key1-2 ' referenced by T_dta1
70-
QUERY: update T_pkey2 set key2 = 'KEY2-9' where key1 = 2 and key2 = 'KEY2-1';
71-
QUERY: update T_pkey2 set key2 = 'KEY1-9' where key1 = 1 and key2 = 'KEY1-1';
70+
update T_pkey2 set key2 = 'KEY2-9' where key1 = 2 and key2 = 'KEY2-1';
71+
update T_pkey2 set key2 = 'KEY1-9' where key1 = 1 and key2 = 'KEY1-1';
7272
NOTICE: updated 1 entries in T_dta2 for new key in T_pkey2
73-
QUERY: delete from T_pkey2 where key1 = 2 and key2 = 'KEY2-2';
74-
QUERY: delete from T_pkey2 where key1 = 1 and key2 = 'KEY1-2';
73+
delete from T_pkey2 where key1 = 2 and key2 = 'KEY2-2';
74+
delete from T_pkey2 where key1 = 1 and key2 = 'KEY1-2';
7575
NOTICE: deleted 1 entries from T_dta2
76-
QUERY: select * from T_pkey1;
77-
key1|key2 |txt
78-
----+--------------------+----------------------------------------
79-
1|key1-1 |test key
80-
1|key1-2 |test key
81-
1|key1-3 |test key
82-
2|key2-3 |test key
83-
1|KEY1-3 |should work
84-
2|key2-9 |test key
76+
select * from T_pkey1;
77+
key1 | key2 | txt
78+
------+----------------------+------------------------------------------
79+
1 | key1-1 | test key
80+
1 | key1-2 | test key
81+
1 | key1-3 | test key
82+
2 | key2-3 | test key
83+
1 | KEY1-3 | should work
84+
2 | key2-9 | test key
8585
(6 rows)
8686

87-
QUERY: select * from T_pkey2;
88-
key1|key2 |txt
89-
----+--------------------+----------------------------------------
90-
1|KEY1-3 |test key
91-
2|KEY2-3 |test key
92-
2|KEY2-9 |test key
93-
1|KEY1-9 |test key
87+
select * from T_pkey2;
88+
key1 | key2 | txt
89+
------+----------------------+------------------------------------------
90+
1 | KEY1-3 | test key
91+
2 | KEY2-3 | test key
92+
2 | KEY2-9 | test key
93+
1 | KEY1-9 | test key
9494
(4 rows)
9595

96-
QUERY: select * from T_dta1;
97-
tkey |ref1|ref2
98-
----------+----+--------------------
99-
trec 1 | 1|key1-1
100-
trec 2 | 1|key1-2
101-
trec 3 | 1|key1-3
96+
select * from T_dta1;
97+
tkey | ref1 | ref2
98+
------------+------+----------------------
99+
trec 1 | 1 | key1-1
100+
trec 2 | 1 | key1-2
101+
trec 3 | 1 | key1-3
102102
(3 rows)
103103

104-
QUERY: select * from T_dta2;
105-
tkey |ref1|ref2
106-
----------+----+--------------------
107-
trec 3 | 1|KEY1-3
108-
trec 1 | 1|KEY1-9
104+
select * from T_dta2;
105+
tkey | ref1 | ref2
106+
------------+------+----------------------
107+
trec 3 | 1 | KEY1-3
108+
trec 1 | 1 | KEY1-9
109109
(2 rows)
110110

111-
QUERY: select tcl_avg(key1) from T_pkey1;
112-
tcl_avg
113-
-------
114-
1
111+
select tcl_avg(key1) from T_pkey1;
112+
tcl_avg
113+
---------
114+
1
115115
(1 row)
116116

117-
QUERY: select tcl_sum(key1) from T_pkey1;
118-
tcl_sum
119-
-------
120-
8
117+
select tcl_sum(key1) from T_pkey1;
118+
tcl_sum
119+
---------
120+
8
121121
(1 row)
122122

123-
QUERY: select tcl_avg(key1) from T_pkey2;
124-
tcl_avg
125-
-------
126-
1
123+
select tcl_avg(key1) from T_pkey2;
124+
tcl_avg
125+
---------
126+
1
127127
(1 row)
128128

129-
QUERY: select tcl_sum(key1) from T_pkey2;
130-
tcl_sum
131-
-------
132-
6
129+
select tcl_sum(key1) from T_pkey2;
130+
tcl_sum
131+
---------
132+
6
133133
(1 row)
134134

135-
QUERY: select tcl_avg(key1) from T_pkey1 where key1 = 99;
136-
tcl_avg
137-
-------
138-
135+
select tcl_avg(key1) from T_pkey1 where key1 = 99;
136+
ERROR: pltcl: divide by zero
137+
select tcl_sum(key1) from T_pkey1 where key1 = 99;
138+
tcl_sum
139+
---------
140+
0
139141
(1 row)
140142

141-
QUERY: select tcl_sum(key1) from T_pkey1 where key1 = 99;
142-
tcl_sum
143-
-------
144-
0
143+
select 1 @< 2;
144+
?column?
145+
----------
146+
t
145147
(1 row)
146148

147-
QUERY: select 1 @< 2;
148-
?column?
149-
--------
150-
t
149+
select 100 @< 4;
150+
?column?
151+
----------
152+
f
151153
(1 row)
152154

153-
QUERY: select 100 @< 4;
154-
?column?
155-
--------
156-
f
157-
(1 row)
158-
159-
QUERY: select * from T_pkey1 order by key1 using @<;
160-
key1|key2 |txt
161-
----+--------------------+----------------------------------------
162-
1|key1-1 |test key
163-
1|key1-2 |test key
164-
1|key1-3 |test key
165-
1|KEY1-3 |should work
166-
2|key2-3 |test key
167-
2|key2-9 |test key
155+
select * from T_pkey1 order by key1 using @<;
156+
key1 | key2 | txt
157+
------+----------------------+------------------------------------------
158+
1 | key1-2 | test key
159+
1 | key1-1 | test key
160+
1 | key1-3 | test key
161+
1 | KEY1-3 | should work
162+
2 | key2-9 | test key
163+
2 | key2-3 | test key
168164
(6 rows)
169165

170-
QUERY: select * from T_pkey2 order by key1 using @<;
171-
key1|key2 |txt
172-
----+--------------------+----------------------------------------
173-
1|KEY1-3 |test key
174-
1|KEY1-9 |test key
175-
2|KEY2-3 |test key
176-
2|KEY2-9 |test key
166+
select * from T_pkey2 order by key1 using @<;
167+
key1 | key2 | txt
168+
------+----------------------+------------------------------------------
169+
1 | KEY1-3 | test key
170+
1 | KEY1-9 | test key
171+
2 | KEY2-9 | test key
172+
2 | KEY2-3 | test key
177173
(4 rows)
178174

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy