Skip to content

Commit 324505a

Browse files
tglsfdctglsfdc
committed
Update oidjoins regression test for 9.0.
1 parent 66cac8f commit 324505a

File tree

3 files changed

+43
-30
lines changed

3 files changed

+43
-30
lines changed

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

Lines changed: 24 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -377,6 +377,14 @@ WHERE dattablespace != 0 AND
377377
------+---------------
378378
(0 rows)
379379

380+
SELECT ctid, setdatabase
381+
FROM pg_catalog.pg_db_role_setting fk
382+
WHERE setdatabase != 0 AND
383+
NOT EXISTS(SELECT 1 FROM pg_catalog.pg_database pk WHERE pk.oid = fk.setdatabase);
384+
ctid | setdatabase
385+
------+-------------
386+
(0 rows)
387+
380388
SELECT ctid, classid
381389
FROM pg_catalog.pg_depend fk
382390
WHERE classid != 0 AND
@@ -425,6 +433,22 @@ WHERE lanowner != 0 AND
425433
------+----------
426434
(0 rows)
427435

436+
SELECT ctid, lanplcallfoid
437+
FROM pg_catalog.pg_language fk
438+
WHERE lanplcallfoid != 0 AND
439+
NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.lanplcallfoid);
440+
ctid | lanplcallfoid
441+
------+---------------
442+
(0 rows)
443+
444+
SELECT ctid, laninline
445+
FROM pg_catalog.pg_language fk
446+
WHERE laninline != 0 AND
447+
NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.laninline);
448+
ctid | laninline
449+
------+-----------
450+
(0 rows)
451+
428452
SELECT ctid, lanvalidator
429453
FROM pg_catalog.pg_language fk
430454
WHERE lanvalidator != 0 AND
@@ -689,22 +713,6 @@ WHERE spcowner != 0 AND
689713
------+----------
690714
(0 rows)
691715

692-
SELECT ctid, tgrelid
693-
FROM pg_catalog.pg_trigger fk
694-
WHERE tgrelid != 0 AND
695-
NOT EXISTS(SELECT 1 FROM pg_catalog.pg_class pk WHERE pk.oid = fk.tgrelid);
696-
ctid | tgrelid
697-
------+---------
698-
(0 rows)
699-
700-
SELECT ctid, tgfoid
701-
FROM pg_catalog.pg_trigger fk
702-
WHERE tgfoid != 0 AND
703-
NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.tgfoid);
704-
ctid | tgfoid
705-
------+--------
706-
(0 rows)
707-
708716
SELECT ctid, cfgnamespace
709717
FROM pg_catalog.pg_ts_config fk
710718
WHERE cfgnamespace != 0 AND

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

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,10 @@ SELECT ctid, dattablespace
189189
FROM pg_catalog.pg_database fk
190190
WHERE dattablespace != 0 AND
191191
NOT EXISTS(SELECT 1 FROM pg_catalog.pg_tablespace pk WHERE pk.oid = fk.dattablespace);
192+
SELECT ctid, setdatabase
193+
FROM pg_catalog.pg_db_role_setting fk
194+
WHERE setdatabase != 0 AND
195+
NOT EXISTS(SELECT 1 FROM pg_catalog.pg_database pk WHERE pk.oid = fk.setdatabase);
192196
SELECT ctid, classid
193197
FROM pg_catalog.pg_depend fk
194198
WHERE classid != 0 AND
@@ -213,6 +217,14 @@ SELECT ctid, lanowner
213217
FROM pg_catalog.pg_language fk
214218
WHERE lanowner != 0 AND
215219
NOT EXISTS(SELECT 1 FROM pg_catalog.pg_authid pk WHERE pk.oid = fk.lanowner);
220+
SELECT ctid, lanplcallfoid
221+
FROM pg_catalog.pg_language fk
222+
WHERE lanplcallfoid != 0 AND
223+
NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.lanplcallfoid);
224+
SELECT ctid, laninline
225+
FROM pg_catalog.pg_language fk
226+
WHERE laninline != 0 AND
227+
NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.laninline);
216228
SELECT ctid, lanvalidator
217229
FROM pg_catalog.pg_language fk
218230
WHERE lanvalidator != 0 AND
@@ -345,14 +357,6 @@ SELECT ctid, spcowner
345357
FROM pg_catalog.pg_tablespace fk
346358
WHERE spcowner != 0 AND
347359
NOT EXISTS(SELECT 1 FROM pg_catalog.pg_authid pk WHERE pk.oid = fk.spcowner);
348-
SELECT ctid, tgrelid
349-
FROM pg_catalog.pg_trigger fk
350-
WHERE tgrelid != 0 AND
351-
NOT EXISTS(SELECT 1 FROM pg_catalog.pg_class pk WHERE pk.oid = fk.tgrelid);
352-
SELECT ctid, tgfoid
353-
FROM pg_catalog.pg_trigger fk
354-
WHERE tgfoid != 0 AND
355-
NOT EXISTS(SELECT 1 FROM pg_catalog.pg_proc pk WHERE pk.oid = fk.tgfoid);
356360
SELECT ctid, cfgnamespace
357361
FROM pg_catalog.pg_ts_config fk
358362
WHERE cfgnamespace != 0 AND

‎src/tools/findoidjoins/README

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
$PostgreSQL: pgsql/src/tools/findoidjoins/README,v 1.6 2008/10/13 12:59:57 tgl Exp $
1+
$PostgreSQL: pgsql/src/tools/findoidjoins/README,v 1.7 2010/03/14 04:17:54 tgl Exp $
22

33
findoidjoins
44
============
@@ -9,10 +9,10 @@ anything but an empty database, such as template1; else it's likely to
99
be very slow.
1010

1111
Run on an empty database, it returns the system join relationships (shown
12-
below for 8.4devel). Note that unexpected matches may indicate bogus entries
12+
below for 9.0devel). Note that unexpected matches may indicate bogus entries
1313
in system tables --- don't accept a peculiar match without question.
1414
In particular, a field shown as joining to more than one target table is
15-
probably messed up. In 8.4devel, the *only* fields that should join to more
15+
probably messed up. In 9.0devel, the *only* fields that should join to more
1616
than one target are pg_description.objoid, pg_depend.objid,
1717
pg_depend.refobjid, pg_shdescription.objoid, pg_shdepend.objid, and
1818
pg_shdepend.refobjid. (Running make_oidjoins_check is an easy way to spot
@@ -31,7 +31,7 @@ revision in the patterns of cross-links between system tables.
3131
(Ideally we'd just regenerate the script as part of the regression
3232
tests themselves, but that seems too slow...)
3333

34-
NOTE: in 8.4devel, make_oidjoins_check produces two bogus join checks:
34+
NOTE: in 9.0devel, make_oidjoins_check produces two bogus join checks:
3535
Join pg_catalog.pg_class.relfilenode => pg_catalog.pg_class.oid
3636
Join pg_catalog.pg_database.datlastsysoid => pg_catalog.pg_database.oid
3737
These are artifacts and should not be added to the oidjoins regress test.
@@ -87,12 +87,15 @@ Join pg_catalog.pg_conversion.conowner => pg_catalog.pg_authid.oid
8787
Join pg_catalog.pg_conversion.conproc => pg_catalog.pg_proc.oid
8888
Join pg_catalog.pg_database.datdba => pg_catalog.pg_authid.oid
8989
Join pg_catalog.pg_database.dattablespace => pg_catalog.pg_tablespace.oid
90+
Join pg_catalog.pg_db_role_setting.setdatabase => pg_catalog.pg_database.oid
9091
Join pg_catalog.pg_depend.classid => pg_catalog.pg_class.oid
9192
Join pg_catalog.pg_depend.refclassid => pg_catalog.pg_class.oid
9293
Join pg_catalog.pg_description.classoid => pg_catalog.pg_class.oid
9394
Join pg_catalog.pg_index.indexrelid => pg_catalog.pg_class.oid
9495
Join pg_catalog.pg_index.indrelid => pg_catalog.pg_class.oid
9596
Join pg_catalog.pg_language.lanowner => pg_catalog.pg_authid.oid
97+
Join pg_catalog.pg_language.lanplcallfoid => pg_catalog.pg_proc.oid
98+
Join pg_catalog.pg_language.laninline => pg_catalog.pg_proc.oid
9699
Join pg_catalog.pg_language.lanvalidator => pg_catalog.pg_proc.oid
97100
Join pg_catalog.pg_namespace.nspowner => pg_catalog.pg_authid.oid
98101
Join pg_catalog.pg_opclass.opcmethod => pg_catalog.pg_am.oid
@@ -126,8 +129,6 @@ Join pg_catalog.pg_statistic.staop1 => pg_catalog.pg_operator.oid
126129
Join pg_catalog.pg_statistic.staop2 => pg_catalog.pg_operator.oid
127130
Join pg_catalog.pg_statistic.staop3 => pg_catalog.pg_operator.oid
128131
Join pg_catalog.pg_tablespace.spcowner => pg_catalog.pg_authid.oid
129-
Join pg_catalog.pg_trigger.tgrelid => pg_catalog.pg_class.oid
130-
Join pg_catalog.pg_trigger.tgfoid => pg_catalog.pg_proc.oid
131132
Join pg_catalog.pg_ts_config.cfgnamespace => pg_catalog.pg_namespace.oid
132133
Join pg_catalog.pg_ts_config.cfgowner => pg_catalog.pg_authid.oid
133134
Join pg_catalog.pg_ts_config.cfgparser => pg_catalog.pg_ts_parser.oid

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