Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 63ae052

Browse files
tglsfdctglsfdc
committed
Update oidjoins regression test for 9.6.
Looks like we had some more catalog drift recently.
1 parent f8ace54 commit 63ae052

File tree

3 files changed

+58
-4
lines changed

3 files changed

+58
-4
lines changed

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

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,30 @@ WHERE aggfinalfn != 0 AND
2525
------+------------
2626
(0 rows)
2727

28+
SELECT ctid, aggcombinefn
29+
FROM pg_catalog.pg_aggregate fk
30+
WHERE aggcombinefn != 0 AND
31+
NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.aggcombinefn);
32+
ctid | aggcombinefn
33+
------+--------------
34+
(0 rows)
35+
36+
SELECT ctid, aggserialfn
37+
FROM pg_catalog.pg_aggregate fk
38+
WHERE aggserialfn != 0 AND
39+
NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.aggserialfn);
40+
ctid | aggserialfn
41+
------+-------------
42+
(0 rows)
43+
44+
SELECT ctid, aggdeserialfn
45+
FROM pg_catalog.pg_aggregate fk
46+
WHERE aggdeserialfn != 0 AND
47+
NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.aggdeserialfn);
48+
ctid | aggdeserialfn
49+
------+---------------
50+
(0 rows)
51+
2852
SELECT ctid, aggmtransfn
2953
FROM pg_catalog.pg_aggregate fk
3054
WHERE aggmtransfn != 0 AND
@@ -481,6 +505,14 @@ WHERE inhparent != 0 AND
481505
------+-----------
482506
(0 rows)
483507

508+
SELECT ctid, classoid
509+
FROM pg_catalog.pg_init_privs fk
510+
WHERE classoid != 0 AND
511+
NOT EXISTS(SELECT 1 FROM pg_catalog.pg_class pk WHERE pk.oid = fk.classoid);
512+
ctid | classoid
513+
------+----------
514+
(0 rows)
515+
484516
SELECT ctid, lanowner
485517
FROM pg_catalog.pg_language fk
486518
WHERE lanowner != 0 AND

‎src/test/regress/sql/oidjoins.sql

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,18 @@ SELECT ctid, aggfinalfn
1313
FROM pg_catalog.pg_aggregate fk
1414
WHERE aggfinalfn != 0 AND
1515
NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.aggfinalfn);
16+
SELECT ctid, aggcombinefn
17+
FROM pg_catalog.pg_aggregate fk
18+
WHERE aggcombinefn != 0 AND
19+
NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.aggcombinefn);
20+
SELECT ctid, aggserialfn
21+
FROM pg_catalog.pg_aggregate fk
22+
WHERE aggserialfn != 0 AND
23+
NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.aggserialfn);
24+
SELECT ctid, aggdeserialfn
25+
FROM pg_catalog.pg_aggregate fk
26+
WHERE aggdeserialfn != 0 AND
27+
NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.aggdeserialfn);
1628
SELECT ctid, aggmtransfn
1729
FROM pg_catalog.pg_aggregate fk
1830
WHERE aggmtransfn != 0 AND
@@ -241,6 +253,10 @@ SELECT ctid, inhparent
241253
FROM pg_catalog.pg_inherits fk
242254
WHERE inhparent != 0 AND
243255
NOT EXISTS(SELECT 1 FROM pg_catalog.pg_class pk WHERE pk.oid = fk.inhparent);
256+
SELECT ctid, classoid
257+
FROM pg_catalog.pg_init_privs fk
258+
WHERE classoid != 0 AND
259+
NOT EXISTS(SELECT 1 FROM pg_catalog.pg_class pk WHERE pk.oid = fk.classoid);
244260
SELECT ctid, lanowner
245261
FROM pg_catalog.pg_language fk
246262
WHERE lanowner != 0 AND

‎src/tools/findoidjoins/README

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,11 @@ catalogs in interesting ways.
1616
Note that unexpected matches may indicate bogus entries in system tables;
1717
don't accept a peculiar match without question. In particular, a field
1818
shown as joining to more than one target table is probably messed up.
19-
In 9.6devel, the *only* fields that should join to more than one target
20-
table are pg_description.objoid, pg_depend.objid, pg_depend.refobjid,
21-
pg_shdescription.objoid, pg_shdepend.objid, and pg_shdepend.refobjid.
19+
In 9.6, the *only* fields that should join to more than one target
20+
table are:
21+
pg_description.objoid, pg_depend.objid, pg_depend.refobjid,
22+
pg_shdescription.objoid, pg_shdepend.objid, pg_shdepend.refobjid,
23+
and pg_init_privs.objoid.
2224
(Running make_oidjoins_check is an easy way to spot fields joining to more
2325
than one table, BTW.)
2426

@@ -33,7 +35,7 @@ regression test. The oidjoins test should be updated after any
3335
revision in the patterns of cross-links between system tables.
3436
(Typically we update it at the end of each development cycle.)
3537

36-
NOTE: as of 9.6devel, make_oidjoins_check produces two bogus join checks:
38+
NOTE: as of 9.6, make_oidjoins_check produces two bogus join checks:
3739
Join pg_catalog.pg_class.relfilenode => pg_catalog.pg_class.oid
3840
Join pg_catalog.pg_database.datlastsysoid => pg_catalog.pg_database.oid
3941
These are artifacts and should not be added to the oidjoins regression test.
@@ -45,6 +47,9 @@ neither of which should be added to the regression test.
4547
Join pg_catalog.pg_aggregate.aggfnoid => pg_catalog.pg_proc.oid
4648
Join pg_catalog.pg_aggregate.aggtransfn => pg_catalog.pg_proc.oid
4749
Join pg_catalog.pg_aggregate.aggfinalfn => pg_catalog.pg_proc.oid
50+
Join pg_catalog.pg_aggregate.aggcombinefn => pg_catalog.pg_proc.oid
51+
Join pg_catalog.pg_aggregate.aggserialfn => pg_catalog.pg_proc.oid
52+
Join pg_catalog.pg_aggregate.aggdeserialfn => pg_catalog.pg_proc.oid
4853
Join pg_catalog.pg_aggregate.aggmtransfn => pg_catalog.pg_proc.oid
4954
Join pg_catalog.pg_aggregate.aggminvtransfn => pg_catalog.pg_proc.oid
5055
Join pg_catalog.pg_aggregate.aggmfinalfn => pg_catalog.pg_proc.oid
@@ -102,6 +107,7 @@ Join pg_catalog.pg_index.indexrelid => pg_catalog.pg_class.oid
102107
Join pg_catalog.pg_index.indrelid => pg_catalog.pg_class.oid
103108
Join pg_catalog.pg_inherits.inhrelid => pg_catalog.pg_class.oid
104109
Join pg_catalog.pg_inherits.inhparent => pg_catalog.pg_class.oid
110+
Join pg_catalog.pg_init_privs.classoid => pg_catalog.pg_class.oid
105111
Join pg_catalog.pg_language.lanowner => pg_catalog.pg_authid.oid
106112
Join pg_catalog.pg_language.lanplcallfoid => pg_catalog.pg_proc.oid
107113
Join pg_catalog.pg_language.laninline => pg_catalog.pg_proc.oid

0 commit comments

Comments
 (0)