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

Commit2ae20ef

Browse files
committed
Update regression tests for ONLY and other recent changes.
1 parent9369000 commit2ae20ef

File tree

7 files changed

+53
-20
lines changed

7 files changed

+53
-20
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ SELECT avg(b) AS avg_107_943 FROM aggtest;
1919
107.943
2020
(1 row)
2121

22-
SELECT avg(gpa) AS avg_3_4 FROM student;
22+
SELECT avg(gpa) AS avg_3_4 FROMONLYstudent;
2323
avg_3_4
2424
---------
2525
3.4
@@ -43,7 +43,7 @@ SELECT sum(b) AS avg_431_773 FROM aggtest;
4343
431.773
4444
(1 row)
4545

46-
SELECT sum(gpa) AS avg_6_8 FROM student;
46+
SELECT sum(gpa) AS avg_6_8 FROMONLYstudent;
4747
avg_6_8
4848
---------
4949
6.8

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
--
66
CREATE VIEW street AS
77
SELECT r.name, r.thepath, c.cname AS cname
8-
FROM road r, real_city c
8+
FROMONLYroad r, real_city c
99
WHERE c.outline ## r.thepath;
1010
CREATE VIEW iexit AS
1111
SELECT ih.name, ih.thepath,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1168,7 +1168,7 @@ SELECT viewname, definition FROM pg_views ORDER BY viewname;
11681168
pg_indexes | SELECT c.relname AS tablename, i.relname AS indexname, pg_get_indexdef(x.indexrelid) AS indexdef FROM pg_index x, pg_class c, pg_class i WHERE ((c.oid = x.indrelid) AND (i.oid = x.indexrelid));
11691169
pg_rules | SELECT c.relname AS tablename, r.rulename, pg_get_ruledef(r.rulename) AS definition FROM pg_rewrite r, pg_class c WHERE ((r.rulename !~ '^_RET'::text) AND (c.oid = r.ev_class));
11701170
pg_tables | SELECT c.relname AS tablename, pg_get_userbyid(c.relowner) AS tableowner, c.relhasindex AS hasindexes, c.relhasrules AS hasrules, (c.reltriggers > 0) AS hastriggers FROM pg_class c WHERE (((c.relkind = 'r'::"char") OR (c.relkind = 's'::"char")) AND (NOT (EXISTS (SELECT pg_rewrite.rulename FROM pg_rewrite WHERE ((pg_rewrite.ev_class = c.oid) AND (pg_rewrite.ev_type = '1'::"char"))))));
1171-
pg_user | SELECT pg_shadow.usename, pg_shadow.usesysid, pg_shadow.usecreatedb, pg_shadow.usetrace, pg_shadow.usesuper, pg_shadow.usecatupd, '********'::text AS passwd, pg_shadow.valuntil FROM pg_shadow;
1171+
pg_user | SELECT pg_shadow.usename, pg_shadow.usesysid, pg_shadow.usecreatedb, pg_shadow.usecreatetable, pg_shadow.uselocktable, pg_shadow.usetrace, pg_shadow.usesuper, pg_shadow.usecatupd, '********'::text AS passwd, pg_shadow.valuntil FROM pg_shadow;
11721172
pg_views | SELECT c.relname AS viewname, pg_get_userbyid(c.relowner) AS viewowner, pg_get_viewdef(c.relname) AS definition FROM pg_class c WHERE (c.relhasrules AND (EXISTS (SELECT r.rulename FROM pg_rewrite r WHERE ((r.ev_class = c.oid) AND (r.ev_type = '1'::"char")))));
11731173
rtest_v1 | SELECT rtest_t1.a, rtest_t1.b FROM rtest_t1;
11741174
rtest_vcomp | SELECT x.part, (x.size * y.factor) AS size_in_cm FROM rtest_comp x, rtest_unitfact y WHERE (x.unit = y.unit);
@@ -1182,7 +1182,7 @@ SELECT viewname, definition FROM pg_views ORDER BY viewname;
11821182
shoelace | SELECT s.sl_name, s.sl_avail, s.sl_color, s.sl_len, s.sl_unit, (s.sl_len * u.un_fact) AS sl_len_cm FROM shoelace_data s, unit u WHERE (s.sl_unit = u.un_name);
11831183
shoelace_candelete | SELECT shoelace_obsolete.sl_name, shoelace_obsolete.sl_avail, shoelace_obsolete.sl_color, shoelace_obsolete.sl_len, shoelace_obsolete.sl_unit, shoelace_obsolete.sl_len_cm FROM shoelace_obsolete WHERE (shoelace_obsolete.sl_avail = 0);
11841184
shoelace_obsolete | SELECT shoelace.sl_name, shoelace.sl_avail, shoelace.sl_color, shoelace.sl_len, shoelace.sl_unit, shoelace.sl_len_cm FROM shoelace WHERE (NOT (EXISTS (SELECT shoe.shoename FROM shoe WHERE (shoe.slcolor = shoelace.sl_color))));
1185-
street | SELECT r.name, r.thepath, c.cname FROM road r, real_city c WHERE (c.outline ## r.thepath);
1185+
street | SELECT r.name, r.thepath, c.cname FROMONLYroad r, real_city c WHERE (c.outline ## r.thepath);
11861186
toyemp | SELECT emp.name, emp.age, emp."location", (12 * emp.salary) AS annualsal FROM emp;
11871187
(20 rows)
11881188

‎src/test/regress/input/misc.source

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -124,10 +124,13 @@ SELECT class, aa
124124
FROM a_star* x
125125
WHERE aa ISNULL;
126126

127+
-- As of Postgres 7.1, ALTER implicitly recurses,
128+
-- so this should be same as ALTER a_star*
129+
127130
ALTER TABLE a_star RENAME COLUMN aa TO foo;
128131

129132
SELECT class, foo
130-
FROM a_star x
133+
FROM a_star* x
131134
WHERE x.foo >= 2;
132135

133136
ALTER TABLE a_star RENAME COLUMN foo TO aa;
@@ -167,7 +170,7 @@ SELECT class, aa, a FROM a_star*;
167170
-- joe and sally play basketball, and
168171
-- everyone else does nothing.
169172
--
170-
SELECT p.name, p.hobbies.name FROM person p;
173+
SELECT p.name, p.hobbies.name FROMONLYperson p;
171174

172175
--
173176
-- as above, but jeff also does post_hacking.
@@ -187,7 +190,7 @@ SELECT hobbies_r.name, hobbies_r.equipment.name FROM hobbies_r;
187190
-- joe and sally need hightops, and
188191
-- everyone else is fine.
189192
--
190-
SELECT p.name, p.hobbies.name, p.hobbies.equipment.name FROM person p;
193+
SELECT p.name, p.hobbies.name, p.hobbies.equipment.name FROMONLYperson p;
191194

192195
--
193196
-- as above, but jeff needs advil and peet's coffee as well.
@@ -198,11 +201,11 @@ SELECT p.name, p.hobbies.name, p.hobbies.equipment.name FROM person* p;
198201
-- just like the last two, but make sure that the target list fixup and
199202
-- unflattening is being done correctly.
200203
--
201-
SELECT p.hobbies.equipment.name, p.name, p.hobbies.name FROM person p;
204+
SELECT p.hobbies.equipment.name, p.name, p.hobbies.name FROMONLYperson p;
202205

203206
SELECT p.hobbies.equipment.name, p.name, p.hobbies.name FROM person* p;
204207

205-
SELECT p.hobbies.equipment.name, p.hobbies.name, p.name FROM person p;
208+
SELECT p.hobbies.equipment.name, p.hobbies.name, p.name FROMONLYperson p;
206209

207210
SELECT p.hobbies.equipment.name, p.hobbies.name, p.name FROM person* p;
208211

‎src/test/regress/output/misc.source

Lines changed: 37 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -271,14 +271,40 @@ SELECT class, aa
271271
f |
272272
(24 rows)
273273

274+
-- As of Postgres 7.1, ALTER implicitly recurses,
275+
-- so this should be same as ALTER a_star*
274276
ALTER TABLE a_star RENAME COLUMN aa TO foo;
275277
SELECT class, foo
276-
FROM a_star x
278+
FROM a_star* x
277279
WHERE x.foo >= 2;
278280
class | foo
279281
-------+-----
280282
a | 2
281-
(1 row)
283+
b | 3
284+
b | 4
285+
c | 5
286+
c | 6
287+
d | 7
288+
d | 8
289+
d | 9
290+
d | 10
291+
d | 11
292+
d | 12
293+
d | 13
294+
d | 14
295+
e | 15
296+
e | 16
297+
e | 17
298+
e | 18
299+
f | 19
300+
f | 20
301+
f | 21
302+
f | 22
303+
f | 24
304+
f | 25
305+
f | 26
306+
f | 27
307+
(25 rows)
282308

283309
ALTER TABLE a_star RENAME COLUMN foo TO aa;
284310
SELECT *
@@ -416,7 +442,7 @@ SELECT class, aa, a FROM a_star*;
416442
-- joe and sally play basketball, and
417443
-- everyone else does nothing.
418444
--
419-
SELECT p.name, p.hobbies.name FROM person p;
445+
SELECT p.name, p.hobbies.name FROMONLYperson p;
420446
name | name
421447
-------+-------------
422448
mike | posthacking
@@ -466,7 +492,7 @@ SELECT hobbies_r.name, hobbies_r.equipment.name FROM hobbies_r;
466492
-- joe and sally need hightops, and
467493
-- everyone else is fine.
468494
--
469-
SELECT p.name, p.hobbies.name, p.hobbies.equipment.name FROM person p;
495+
SELECT p.name, p.hobbies.name, p.hobbies.equipment.name FROMONLYperson p;
470496
name | name | name
471497
-------+-------------+---------------
472498
mike | posthacking | advil
@@ -493,7 +519,7 @@ SELECT p.name, p.hobbies.name, p.hobbies.equipment.name FROM person* p;
493519
-- just like the last two, but make sure that the target list fixup and
494520
-- unflattening is being done correctly.
495521
--
496-
SELECT p.hobbies.equipment.name, p.name, p.hobbies.name FROM person p;
522+
SELECT p.hobbies.equipment.name, p.name, p.hobbies.name FROMONLYperson p;
497523
name | name | name
498524
---------------+-------+-------------
499525
advil | mike | posthacking
@@ -513,7 +539,7 @@ SELECT p.hobbies.equipment.name, p.name, p.hobbies.name FROM person* p;
513539
peet's coffee | jeff | posthacking
514540
(6 rows)
515541

516-
SELECT p.hobbies.equipment.name, p.hobbies.name, p.name FROM person p;
542+
SELECT p.hobbies.equipment.name, p.hobbies.name, p.name FROMONLYperson p;
517543
name | name | name
518544
---------------+-------------+-------
519545
advil | posthacking | mike
@@ -537,17 +563,20 @@ SELECT user_relns() AS user_relns
537563
ORDER BY user_relns;
538564
user_relns
539565
---------------------
566+
a
540567
a_star
541568
abstime_tbl
542569
aggtest
543570
arrtest
571+
b
544572
b_star
545573
box_tbl
546574
bprime
547575
bt_f8_heap
548576
bt_i4_heap
549577
bt_name_heap
550578
bt_txt_heap
579+
c
551580
c_star
552581
char_tbl
553582
check2_tbl
@@ -556,6 +585,7 @@ SELECT user_relns() AS user_relns
556585
circle_tbl
557586
city
558587
copy_tbl
588+
d
559589
d_star
560590
default_seq
561591
default_tbl
@@ -623,7 +653,7 @@ SELECT user_relns() AS user_relns
623653
toyemp
624654
varchar_tbl
625655
xacttest
626-
(86 rows)
656+
(90 rows)
627657

628658
--SELECT name(equipment(hobby_construct(text 'skywalking', text 'mer'))) AS equip_name;
629659
--

‎src/test/regress/sql/aggregates.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ SELECT avg(a) AS avg_32 FROM aggtest WHERE a < 100;
88

99
SELECTavg(b)AS avg_107_943FROM aggtest;
1010

11-
SELECTavg(gpa)AS avg_3_4FROM student;
11+
SELECTavg(gpa)AS avg_3_4FROMONLYstudent;
1212

1313

1414
SELECTsum(four)AS sum_1500FROM onek;
@@ -17,7 +17,7 @@ SELECT sum(a) AS sum_198 FROM aggtest;
1717

1818
SELECTsum(b)AS avg_431_773FROM aggtest;
1919

20-
SELECTsum(gpa)AS avg_6_8FROM student;
20+
SELECTsum(gpa)AS avg_6_8FROMONLYstudent;
2121

2222

2323
SELECTmax(four)AS max_3FROM onek;

‎src/test/regress/sql/create_view.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
CREATEVIEWstreetAS
88
SELECTr.name,r.thepath,c.cnameAS cname
9-
FROM road r, real_city c
9+
FROMONLYroad r, real_city c
1010
WHEREc.outline## r.thepath;
1111

1212
CREATEVIEWiexitAS

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp