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

Commite84c71b

Browse files
committed
Update oidjoins regression test to match current catalog structure.
1 parentbb892ce commite84c71b

File tree

3 files changed

+32
-4
lines changed

3 files changed

+32
-4
lines changed

‎contrib/findoidjoins/README.findoidjoins

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ anything but an empty database, such as template1; else it's likely to
77
be very slow.
88

99
Run on an empty database, it returns the system join relationships (shown
10-
below for7.4). Note that unexpected matches may indicate bogus entries
10+
below for8.0). Note that unexpected matches may indicate bogus entries
1111
in system tables --- don't accept a peculiar match without question.
1212
In particular, a field shown as joining to more than one target table is
13-
probably messed up. In7.4, the *only* fields that should join to more
13+
probably messed up. In8.0, the *only* fields that should join to more
1414
than one target are pg_description.objoid, pg_depend.objid, and
1515
pg_depend.refobjid. (Running make_oidjoins_check is an easy way to spot
1616
fields joining to more than one table, BTW.)
@@ -26,11 +26,11 @@ revision in the patterns of cross-links between system tables.
2626
(Ideally we'd just regenerate the script as part of the regression
2727
tests themselves, but that seems too slow...)
2828

29-
NOTE: in7.4, make_oidjoins_check produces one bogus join check:
29+
NOTE: in8.0, make_oidjoins_check produces one bogus join check:
3030
Join pg_catalog.pg_class.relfilenode => pg_catalog.pg_class.oid
3131
This is an artifact and should not be added to the oidjoins regress test.
3232
Also beware of any claim that pg_database.datlastsysoid joins to anything;
33-
this does not actually happen in7.4, but it did happen before and might
33+
this does not actually happen in8.0, but it did happen before and might
3434
happen again in future, depending on what operation initdb does last.
3535

3636
---------------------------------------------------------------------------
@@ -51,8 +51,10 @@ Join pg_catalog.pg_am.ambulkdelete => pg_catalog.pg_proc.oid
5151
Join pg_catalog.pg_am.amvacuumcleanup => pg_catalog.pg_proc.oid
5252
Join pg_catalog.pg_am.amcostestimate => pg_catalog.pg_proc.oid
5353
Join pg_catalog.pg_amop.amopclaid => pg_catalog.pg_opclass.oid
54+
Join pg_catalog.pg_amop.amopsubtype => pg_catalog.pg_type.oid
5455
Join pg_catalog.pg_amop.amopopr => pg_catalog.pg_operator.oid
5556
Join pg_catalog.pg_amproc.amopclaid => pg_catalog.pg_opclass.oid
57+
Join pg_catalog.pg_amproc.amprocsubtype => pg_catalog.pg_type.oid
5658
Join pg_catalog.pg_amproc.amproc => pg_catalog.pg_proc.oid
5759
Join pg_catalog.pg_attribute.attrelid => pg_catalog.pg_class.oid
5860
Join pg_catalog.pg_attribute.atttypid => pg_catalog.pg_type.oid
@@ -62,12 +64,14 @@ Join pg_catalog.pg_cast.castfunc => pg_catalog.pg_proc.oid
6264
Join pg_catalog.pg_class.relnamespace => pg_catalog.pg_namespace.oid
6365
Join pg_catalog.pg_class.reltype => pg_catalog.pg_type.oid
6466
Join pg_catalog.pg_class.relam => pg_catalog.pg_am.oid
67+
Join pg_catalog.pg_class.reltablespace => pg_catalog.pg_tablespace.oid
6568
Join pg_catalog.pg_class.reltoastrelid => pg_catalog.pg_class.oid
6669
Join pg_catalog.pg_class.reltoastidxid => pg_catalog.pg_class.oid
6770
Join pg_catalog.pg_constraint.connamespace => pg_catalog.pg_namespace.oid
6871
Join pg_catalog.pg_constraint.contypid => pg_catalog.pg_type.oid
6972
Join pg_catalog.pg_conversion.connamespace => pg_catalog.pg_namespace.oid
7073
Join pg_catalog.pg_conversion.conproc => pg_catalog.pg_proc.oid
74+
Join pg_catalog.pg_database.dattablespace => pg_catalog.pg_tablespace.oid
7175
Join pg_catalog.pg_depend.classid => pg_catalog.pg_class.oid
7276
Join pg_catalog.pg_depend.refclassid => pg_catalog.pg_class.oid
7377
Join pg_catalog.pg_description.classoid => pg_catalog.pg_class.oid

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,14 @@ WHERErelam != 0 AND
233233
------+-------
234234
(0 rows)
235235

236+
SELECTctid, reltablespace
237+
FROMpg_catalog.pg_class fk
238+
WHEREreltablespace != 0 AND
239+
NOT EXISTS(SELECT 1 FROM pg_catalog.pg_tablespace pk WHERE pk.oid = fk.reltablespace);
240+
ctid | reltablespace
241+
------+---------------
242+
(0 rows)
243+
236244
SELECTctid, reltoastrelid
237245
FROMpg_catalog.pg_class fk
238246
WHEREreltoastrelid != 0 AND
@@ -281,6 +289,14 @@ WHEREconproc != 0 AND
281289
------+---------
282290
(0 rows)
283291

292+
SELECTctid, dattablespace
293+
FROMpg_catalog.pg_database fk
294+
WHEREdattablespace != 0 AND
295+
NOT EXISTS(SELECT 1 FROM pg_catalog.pg_tablespace pk WHERE pk.oid = fk.dattablespace);
296+
ctid | dattablespace
297+
------+---------------
298+
(0 rows)
299+
284300
SELECTctid, classid
285301
FROMpg_catalog.pg_depend fk
286302
WHEREclassid != 0 AND

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,10 @@ SELECTctid, relam
117117
FROMpg_catalog.pg_class fk
118118
WHERErelam!=0AND
119119
NOT EXISTS(SELECT1FROMpg_catalog.pg_am pkWHEREpk.oid=fk.relam);
120+
SELECTctid, reltablespace
121+
FROMpg_catalog.pg_class fk
122+
WHEREreltablespace!=0AND
123+
NOT EXISTS(SELECT1FROMpg_catalog.pg_tablespace pkWHEREpk.oid=fk.reltablespace);
120124
SELECTctid, reltoastrelid
121125
FROMpg_catalog.pg_class fk
122126
WHEREreltoastrelid!=0AND
@@ -141,6 +145,10 @@ SELECTctid, conproc
141145
FROMpg_catalog.pg_conversion fk
142146
WHEREconproc!=0AND
143147
NOT EXISTS(SELECT1FROMpg_catalog.pg_proc pkWHEREpk.oid=fk.conproc);
148+
SELECTctid, dattablespace
149+
FROMpg_catalog.pg_database fk
150+
WHEREdattablespace!=0AND
151+
NOT EXISTS(SELECT1FROMpg_catalog.pg_tablespace pkWHEREpk.oid=fk.dattablespace);
144152
SELECTctid, classid
145153
FROMpg_catalog.pg_depend fk
146154
WHEREclassid!=0AND

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp