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

Commitc44c2d2

Browse files
committed
Fix instability in recently added regression tests
We missed the usual ORDER BY clause.Author: Amul Sul <amul.sul@enterprisedb.com>Discussion:https://postgr.es/m/CAAJ_b974U3Vvf-qGwFyZ73DFHqyFJP9TOmuiXR2Kp8KVcJtP6w@mail.gmail.com
1 parentaeb8ea3 commitc44c2d2

File tree

2 files changed

+18
-12
lines changed

2 files changed

+18
-12
lines changed

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

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1684,7 +1684,7 @@ ALTER TABLE fk_partitioned_fk_1 ADD FOREIGN KEY (a, b) REFERENCES fk_notpartitio
16841684
ALTER TABLE fk_partitioned_fk ATTACH PARTITION fk_partitioned_fk_1 FOR VALUES FROM (0,0) TO (1000,1000);
16851685
-- Child constraint will remain valid.
16861686
SELECT conname, convalidated, conrelid::regclass FROM pg_constraint
1687-
WHERE conrelid::regclass::text like 'fk_partitioned_fk%' ORDER BY oid;
1687+
WHERE conrelid::regclass::text like 'fk_partitioned_fk%' ORDER BY oid::regclass::text;
16881688
conname | convalidated | conrelid
16891689
------------------------------+--------------+---------------------
16901690
fk_partitioned_fk_a_b_fkey | f | fk_partitioned_fk
@@ -1695,7 +1695,7 @@ WHERE conrelid::regclass::text like 'fk_partitioned_fk%' ORDER BY oid;
16951695
ALTER TABLE fk_partitioned_fk VALIDATE CONSTRAINT fk_partitioned_fk_a_b_fkey;
16961696
-- All constraints are now valid.
16971697
SELECT conname, convalidated, conrelid::regclass FROM pg_constraint
1698-
WHERE conrelid::regclass::text like 'fk_partitioned_fk%' ORDER BY oid;
1698+
WHERE conrelid::regclass::text like 'fk_partitioned_fk%' ORDER BY oid::regclass::text;
16991699
conname | convalidated | conrelid
17001700
------------------------------+--------------+---------------------
17011701
fk_partitioned_fk_a_b_fkey | t | fk_partitioned_fk
@@ -1714,7 +1714,8 @@ DETAIL: Key (a, b)=(1000, 1000) is not present in table "fk_notpartitioned_pk".
17141714
TRUNCATE fk_partitioned_fk_2;
17151715
ALTER TABLE fk_partitioned_fk ATTACH PARTITION fk_partitioned_fk_2 FOR VALUES FROM (1000,1000) TO (2000,2000);
17161716
-- The child constraint will also be valid.
1717-
SELECT conname, convalidated FROM pg_constraint WHERE conrelid = 'fk_partitioned_fk_2'::regclass;
1717+
SELECT conname, convalidated FROM pg_constraint
1718+
WHERE conrelid = 'fk_partitioned_fk_2'::regclass ORDER BY oid::regclass::text;
17181719
conname | convalidated
17191720
------------------------------+--------------
17201721
fk_partitioned_fk_2_a_b_fkey | t
@@ -1731,7 +1732,7 @@ ALTER TABLE fk_partitioned_fk_3 ATTACH PARTITION fk_partitioned_fk_3_1 FOR VALUE
17311732
ALTER TABLE fk_partitioned_fk ATTACH PARTITION fk_partitioned_fk_3 FOR VALUES FROM (2000,2000) TO (3000,3000);
17321733
-- All constraints are now valid.
17331734
SELECT conname, convalidated, conrelid::regclass FROM pg_constraint
1734-
WHERE conrelid::regclass::text like 'fk_partitioned_fk%' ORDER BY oid;
1735+
WHERE conrelid::regclass::text like 'fk_partitioned_fk%' ORDER BY oid::regclass::text;
17351736
conname | convalidated | conrelid
17361737
--------------------------------+--------------+-----------------------
17371738
fk_partitioned_fk_a_b_fkey | t | fk_partitioned_fk
@@ -1748,7 +1749,8 @@ CREATE TABLE fk_partitioned_pk_1 PARTITION OF fk_partitioned_pk FOR VALUES FROM
17481749
CREATE TABLE fk_notpartitioned_fk (b int, a int);
17491750
ALTER TABLE fk_notpartitioned_fk ADD FOREIGN KEY (a, b) REFERENCES fk_partitioned_pk NOT VALID;
17501751
-- Constraint will be invalid.
1751-
SELECT conname, convalidated FROM pg_constraint WHERE conrelid = 'fk_notpartitioned_fk'::regclass;
1752+
SELECT conname, convalidated FROM pg_constraint
1753+
WHERE conrelid = 'fk_notpartitioned_fk'::regclass ORDER BY oid::regclass::text;
17521754
conname | convalidated
17531755
--------------------------------+--------------
17541756
fk_notpartitioned_fk_a_b_fkey | f
@@ -1757,7 +1759,8 @@ SELECT conname, convalidated FROM pg_constraint WHERE conrelid = 'fk_notpartitio
17571759

17581760
ALTER TABLE fk_notpartitioned_fk VALIDATE CONSTRAINT fk_notpartitioned_fk_a_b_fkey;
17591761
-- All constraints are now valid.
1760-
SELECT conname, convalidated FROM pg_constraint WHERE conrelid = 'fk_notpartitioned_fk'::regclass;
1762+
SELECT conname, convalidated FROM pg_constraint
1763+
WHERE conrelid = 'fk_notpartitioned_fk'::regclass ORDER BY oid::regclass::text;
17611764
conname | convalidated
17621765
--------------------------------+--------------
17631766
fk_notpartitioned_fk_a_b_fkey | t

‎src/test/regress/sql/foreign_key.sql

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1259,14 +1259,14 @@ ALTER TABLE fk_partitioned_fk ATTACH PARTITION fk_partitioned_fk_1 FOR VALUES FR
12591259

12601260
-- Child constraint will remain valid.
12611261
SELECT conname, convalidated, conrelid::regclassFROM pg_constraint
1262-
WHERE conrelid::regclass::textlike'fk_partitioned_fk%'ORDER BYoid;
1262+
WHERE conrelid::regclass::textlike'fk_partitioned_fk%'ORDER BYoid::regclass::text;
12631263

12641264
-- Validate the constraint
12651265
ALTERTABLE fk_partitioned_fk VALIDATECONSTRAINT fk_partitioned_fk_a_b_fkey;
12661266

12671267
-- All constraints are now valid.
12681268
SELECT conname, convalidated, conrelid::regclassFROM pg_constraint
1269-
WHERE conrelid::regclass::textlike'fk_partitioned_fk%'ORDER BYoid;
1269+
WHERE conrelid::regclass::textlike'fk_partitioned_fk%'ORDER BYoid::regclass::text;
12701270

12711271
-- Attaching a child with a NOT VALID constraint.
12721272
CREATETABLEfk_partitioned_fk_2 (aint, bint);
@@ -1281,7 +1281,8 @@ TRUNCATE fk_partitioned_fk_2;
12811281
ALTERTABLE fk_partitioned_fk ATTACH PARTITION fk_partitioned_fk_2 FORVALUESFROM (1000,1000) TO (2000,2000);
12821282

12831283
-- The child constraint will also be valid.
1284-
SELECT conname, convalidatedFROM pg_constraintWHERE conrelid='fk_partitioned_fk_2'::regclass;
1284+
SELECT conname, convalidatedFROM pg_constraint
1285+
WHERE conrelid='fk_partitioned_fk_2'::regclassORDER BYoid::regclass::text;
12851286

12861287
-- Test case where the child constraint is invalid, the grandchild constraint
12871288
-- is valid, and the validation for the grandchild should be skipped when a
@@ -1295,7 +1296,7 @@ ALTER TABLE fk_partitioned_fk ATTACH PARTITION fk_partitioned_fk_3 FOR VALUES FR
12951296

12961297
-- All constraints are now valid.
12971298
SELECT conname, convalidated, conrelid::regclassFROM pg_constraint
1298-
WHERE conrelid::regclass::textlike'fk_partitioned_fk%'ORDER BYoid;
1299+
WHERE conrelid::regclass::textlike'fk_partitioned_fk%'ORDER BYoid::regclass::text;
12991300

13001301
DROPTABLE fk_partitioned_fk, fk_notpartitioned_pk;
13011302

@@ -1306,12 +1307,14 @@ CREATE TABLE fk_notpartitioned_fk (b int, a int);
13061307
ALTERTABLE fk_notpartitioned_fk ADDFOREIGN KEY (a, b)REFERENCES fk_partitioned_pk NOT VALID;
13071308

13081309
-- Constraint will be invalid.
1309-
SELECT conname, convalidatedFROM pg_constraintWHERE conrelid='fk_notpartitioned_fk'::regclass;
1310+
SELECT conname, convalidatedFROM pg_constraint
1311+
WHERE conrelid='fk_notpartitioned_fk'::regclassORDER BYoid::regclass::text;
13101312

13111313
ALTERTABLE fk_notpartitioned_fk VALIDATECONSTRAINT fk_notpartitioned_fk_a_b_fkey;
13121314

13131315
-- All constraints are now valid.
1314-
SELECT conname, convalidatedFROM pg_constraintWHERE conrelid='fk_notpartitioned_fk'::regclass;
1316+
SELECT conname, convalidatedFROM pg_constraint
1317+
WHERE conrelid='fk_notpartitioned_fk'::regclassORDER BYoid::regclass::text;
13151318

13161319
DROPTABLE fk_notpartitioned_fk, fk_partitioned_pk;
13171320

0 commit comments

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