From 976fa1abff9da882ddf63636e3cb3ceec105dc57 Mon Sep 17 00:00:00 2001
From: Jehan-Guillaume de Rorthais <jgdr@dalibo.com>
Date: Mon, 23 Sep 2024 18:50:20 +0200
Subject: [PATCH v3-17 1/4] Add tests about FK between partitionned tables

These tests cover two reported bugs related to FK
between two partitionned tables.

co-author : Alvaro Herrera <alvherre@alvh.no-ip.org>
co-author : Jehan-Guillaume de Rorthais <jgdr@dalibo.com>
co-author : Tender Wang <tndrwang@gmail.com>

Discussion: https://postgr.es/m/20230420144344.40744130@karst
Discussion: https://postgr.es/m/20230705233028.2f554f73@karst
---
 src/test/regress/expected/foreign_key.out | 266 ++++++++++++++++++++++
 src/test/regress/sql/foreign_key.sql      | 101 ++++++++
 2 files changed, 367 insertions(+)

diff --git a/src/test/regress/expected/foreign_key.out b/src/test/regress/expected/foreign_key.out
index 8c04a24b37..da67bbeb4f 100644
--- a/src/test/regress/expected/foreign_key.out
+++ b/src/test/regress/expected/foreign_key.out
@@ -2934,3 +2934,269 @@ DETAIL:  drop cascades to table fkpart11.pk
 drop cascades to table fkpart11.fk_parted
 drop cascades to table fkpart11.fk_another
 drop cascades to function fkpart11.print_row()
+-- When a table is attached as partition to a partitioned table that has
+-- a foreign key to another partitioned table, it acquires a clone of the
+-- FK.  Upon detach, this clone is not removed, but instead becomes an
+-- independent FK.  If it then attaches to the partitioned table again,
+-- the FK from the parent "takes over" ownership of the independent FK rather
+-- than creating a separate one.
+CREATE SCHEMA fkpart12
+  CREATE TABLE fk_p ( id int, jd int, PRIMARY KEY(id, jd)) PARTITION BY list (id)
+  CREATE TABLE fk_p_1 PARTITION OF fk_p FOR VALUES IN (1) PARTITION BY list (jd)
+  CREATE TABLE fk_p_1_1 PARTITION OF fk_p_1 FOR VALUES IN (1)
+  CREATE TABLE fk_p_1_2 PARTITION OF fk_p_1 FOR VALUES IN (2)
+  CREATE TABLE fk_p_2 PARTITION OF fk_p FOR VALUES IN (2) PARTITION BY list (jd)
+  CREATE TABLE fk_p_2_1 PARTITION OF fk_p_2 FOR VALUES IN (1)
+  CREATE TABLE fk_p_2_2 PARTITION OF fk_p_2 FOR VALUES IN (2)
+  CREATE TABLE fk_r_1 ( id int PRIMARY KEY, p_id int NOT NULL, p_jd int NOT NULL)
+  CREATE TABLE fk_r_2 ( id int PRIMARY KEY, p_id int NOT NULL, p_jd int NOT NULL)
+  CREATE TABLE fk_r   ( id int PRIMARY KEY, p_id int NOT NULL, p_jd int NOT NULL,
+       FOREIGN KEY (p_id, p_jd) REFERENCES fk_p (id, jd)
+  ) PARTITION BY list (id);
+SET search_path TO fkpart12;
+CREATE OR REPLACE FUNCTION
+fkpart12_constraints(OUT conname name, OUT conrel regclass,
+                   OUT confrelid regclass, OUT conparent name) RETURNS SETOF record AS $$
+  WITH RECURSIVE r AS (
+    SELECT oid, conname, conrelid, confrelid, NULL::name AS conparent
+    FROM pg_constraint
+    WHERE conrelid = 'fk_r'::regclass
+      AND contype = 'f'
+      AND conparentid = 0
+    UNION ALL
+    SELECT c.oid, c.conname, c.conrelid, c.confrelid, r.conname
+    FROM pg_constraint c
+    JOIN r ON c.conparentid = r.oid
+  )
+  SELECT conname, conrelid::regclass, confrelid::regclass, conparent
+  FROM r
+  ORDER BY oid, conname, confrelid, conparent;
+$$
+LANGUAGE SQL;
+CREATE OR REPLACE FUNCTION
+fkpart12_triggers(OUT conname name, OUT conparent name,
+                   OUT tgfoid regproc, OUT tgfparent regproc) RETURNS SETOF record AS $$
+
+  WITH RECURSIVE r AS (
+    SELECT t.oid, t.tgfoid::regproc, c.conname, NULL::name AS conparent, NULL::regproc AS tgfparent
+    FROM pg_trigger t
+    JOIN pg_constraint c ON c.oid = t.tgconstraint
+    WHERE c.conrelid = 'fk_r'::regclass
+      AND c.contype = 'f'
+      AND t.tgparentid = 0
+    UNION ALL
+    SELECT t2.oid, t2.tgfoid::regproc, c2.conname, c3.conname, r.tgfoid::regproc AS tgfparent
+    FROM pg_trigger t2
+    JOIN pg_constraint c2 ON c2.oid = t2.tgconstraint
+    LEFT JOIN pg_constraint c3 ON c3.oid = c2.conparentid
+    JOIN r ON r.oid = t2.tgparentid
+  )
+  SELECT conname, conparent, tgfoid, tgfparent
+  FROM r
+  ORDER BY conname, conparent, tgfoid, tgfparent;
+$$
+LANGUAGE SQL;
+SELECT * FROM fkpart12_constraints();
+       conname        | conrel | confrelid |      conparent       
+----------------------+--------+-----------+----------------------
+ fk_r_p_id_p_jd_fkey  | fk_r   | fk_p      | 
+ fk_r_p_id_p_jd_fkey1 | fk_r   | fk_p_1    | fk_r_p_id_p_jd_fkey
+ fk_r_p_id_p_jd_fkey2 | fk_r   | fk_p_1_1  | fk_r_p_id_p_jd_fkey1
+ fk_r_p_id_p_jd_fkey3 | fk_r   | fk_p_1_2  | fk_r_p_id_p_jd_fkey1
+ fk_r_p_id_p_jd_fkey4 | fk_r   | fk_p_2    | fk_r_p_id_p_jd_fkey
+ fk_r_p_id_p_jd_fkey5 | fk_r   | fk_p_2_1  | fk_r_p_id_p_jd_fkey4
+ fk_r_p_id_p_jd_fkey6 | fk_r   | fk_p_2_2  | fk_r_p_id_p_jd_fkey4
+(7 rows)
+
+SELECT * FROM fkpart12_triggers();
+       conname        |      conparent       |         tgfoid         |       tgfparent        
+----------------------+----------------------+------------------------+------------------------
+ fk_r_p_id_p_jd_fkey  |                      | "RI_FKey_check_ins"    | 
+ fk_r_p_id_p_jd_fkey  |                      | "RI_FKey_check_upd"    | 
+ fk_r_p_id_p_jd_fkey  |                      | "RI_FKey_noaction_del" | 
+ fk_r_p_id_p_jd_fkey  |                      | "RI_FKey_noaction_upd" | 
+ fk_r_p_id_p_jd_fkey1 | fk_r_p_id_p_jd_fkey  | "RI_FKey_noaction_del" | "RI_FKey_noaction_del"
+ fk_r_p_id_p_jd_fkey1 | fk_r_p_id_p_jd_fkey  | "RI_FKey_noaction_upd" | "RI_FKey_noaction_upd"
+ fk_r_p_id_p_jd_fkey2 | fk_r_p_id_p_jd_fkey1 | "RI_FKey_noaction_del" | "RI_FKey_noaction_del"
+ fk_r_p_id_p_jd_fkey2 | fk_r_p_id_p_jd_fkey1 | "RI_FKey_noaction_upd" | "RI_FKey_noaction_upd"
+ fk_r_p_id_p_jd_fkey3 | fk_r_p_id_p_jd_fkey1 | "RI_FKey_noaction_del" | "RI_FKey_noaction_del"
+ fk_r_p_id_p_jd_fkey3 | fk_r_p_id_p_jd_fkey1 | "RI_FKey_noaction_upd" | "RI_FKey_noaction_upd"
+ fk_r_p_id_p_jd_fkey4 | fk_r_p_id_p_jd_fkey  | "RI_FKey_noaction_del" | "RI_FKey_noaction_del"
+ fk_r_p_id_p_jd_fkey4 | fk_r_p_id_p_jd_fkey  | "RI_FKey_noaction_upd" | "RI_FKey_noaction_upd"
+ fk_r_p_id_p_jd_fkey5 | fk_r_p_id_p_jd_fkey4 | "RI_FKey_noaction_del" | "RI_FKey_noaction_del"
+ fk_r_p_id_p_jd_fkey5 | fk_r_p_id_p_jd_fkey4 | "RI_FKey_noaction_upd" | "RI_FKey_noaction_upd"
+ fk_r_p_id_p_jd_fkey6 | fk_r_p_id_p_jd_fkey4 | "RI_FKey_noaction_del" | "RI_FKey_noaction_del"
+ fk_r_p_id_p_jd_fkey6 | fk_r_p_id_p_jd_fkey4 | "RI_FKey_noaction_upd" | "RI_FKey_noaction_upd"
+(16 rows)
+
+INSERT INTO fk_p VALUES (1, 1);
+ALTER TABLE fk_r ATTACH PARTITION fk_r_1 FOR VALUES IN (1);
+ALTER TABLE fk_r ATTACH PARTITION fk_r_2 FOR VALUES IN (2);
+\d fk_r_1
+              Table "fkpart12.fk_r_1"
+ Column |  Type   | Collation | Nullable | Default 
+--------+---------+-----------+----------+---------
+ id     | integer |           | not null | 
+ p_id   | integer |           | not null | 
+ p_jd   | integer |           | not null | 
+Partition of: fk_r FOR VALUES IN (1)
+Indexes:
+    "fk_r_1_pkey" PRIMARY KEY, btree (id)
+Foreign-key constraints:
+    TABLE "fk_r" CONSTRAINT "fk_r_p_id_p_jd_fkey" FOREIGN KEY (p_id, p_jd) REFERENCES fk_p(id, jd)
+
+SELECT * FROM fkpart12_constraints();
+       conname        | conrel | confrelid |      conparent       
+----------------------+--------+-----------+----------------------
+ fk_r_p_id_p_jd_fkey  | fk_r   | fk_p      | 
+ fk_r_p_id_p_jd_fkey1 | fk_r   | fk_p_1    | fk_r_p_id_p_jd_fkey
+ fk_r_p_id_p_jd_fkey2 | fk_r   | fk_p_1_1  | fk_r_p_id_p_jd_fkey1
+ fk_r_p_id_p_jd_fkey3 | fk_r   | fk_p_1_2  | fk_r_p_id_p_jd_fkey1
+ fk_r_p_id_p_jd_fkey4 | fk_r   | fk_p_2    | fk_r_p_id_p_jd_fkey
+ fk_r_p_id_p_jd_fkey5 | fk_r   | fk_p_2_1  | fk_r_p_id_p_jd_fkey4
+ fk_r_p_id_p_jd_fkey6 | fk_r   | fk_p_2_2  | fk_r_p_id_p_jd_fkey4
+ fk_r_p_id_p_jd_fkey  | fk_r_1 | fk_p      | fk_r_p_id_p_jd_fkey
+ fk_r_p_id_p_jd_fkey  | fk_r_2 | fk_p      | fk_r_p_id_p_jd_fkey
+(9 rows)
+
+SELECT * FROM fkpart12_triggers();
+       conname        |      conparent       |         tgfoid         |       tgfparent        
+----------------------+----------------------+------------------------+------------------------
+ fk_r_p_id_p_jd_fkey  | fk_r_p_id_p_jd_fkey  | "RI_FKey_check_ins"    | "RI_FKey_check_ins"
+ fk_r_p_id_p_jd_fkey  | fk_r_p_id_p_jd_fkey  | "RI_FKey_check_ins"    | "RI_FKey_check_ins"
+ fk_r_p_id_p_jd_fkey  | fk_r_p_id_p_jd_fkey  | "RI_FKey_check_upd"    | "RI_FKey_check_upd"
+ fk_r_p_id_p_jd_fkey  | fk_r_p_id_p_jd_fkey  | "RI_FKey_check_upd"    | "RI_FKey_check_upd"
+ fk_r_p_id_p_jd_fkey  |                      | "RI_FKey_check_ins"    | 
+ fk_r_p_id_p_jd_fkey  |                      | "RI_FKey_check_upd"    | 
+ fk_r_p_id_p_jd_fkey  |                      | "RI_FKey_noaction_del" | 
+ fk_r_p_id_p_jd_fkey  |                      | "RI_FKey_noaction_upd" | 
+ fk_r_p_id_p_jd_fkey1 | fk_r_p_id_p_jd_fkey  | "RI_FKey_noaction_del" | "RI_FKey_noaction_del"
+ fk_r_p_id_p_jd_fkey1 | fk_r_p_id_p_jd_fkey  | "RI_FKey_noaction_upd" | "RI_FKey_noaction_upd"
+ fk_r_p_id_p_jd_fkey2 | fk_r_p_id_p_jd_fkey1 | "RI_FKey_noaction_del" | "RI_FKey_noaction_del"
+ fk_r_p_id_p_jd_fkey2 | fk_r_p_id_p_jd_fkey1 | "RI_FKey_noaction_upd" | "RI_FKey_noaction_upd"
+ fk_r_p_id_p_jd_fkey3 | fk_r_p_id_p_jd_fkey1 | "RI_FKey_noaction_del" | "RI_FKey_noaction_del"
+ fk_r_p_id_p_jd_fkey3 | fk_r_p_id_p_jd_fkey1 | "RI_FKey_noaction_upd" | "RI_FKey_noaction_upd"
+ fk_r_p_id_p_jd_fkey4 | fk_r_p_id_p_jd_fkey  | "RI_FKey_noaction_del" | "RI_FKey_noaction_del"
+ fk_r_p_id_p_jd_fkey4 | fk_r_p_id_p_jd_fkey  | "RI_FKey_noaction_upd" | "RI_FKey_noaction_upd"
+ fk_r_p_id_p_jd_fkey5 | fk_r_p_id_p_jd_fkey4 | "RI_FKey_noaction_del" | "RI_FKey_noaction_del"
+ fk_r_p_id_p_jd_fkey5 | fk_r_p_id_p_jd_fkey4 | "RI_FKey_noaction_upd" | "RI_FKey_noaction_upd"
+ fk_r_p_id_p_jd_fkey6 | fk_r_p_id_p_jd_fkey4 | "RI_FKey_noaction_del" | "RI_FKey_noaction_del"
+ fk_r_p_id_p_jd_fkey6 | fk_r_p_id_p_jd_fkey4 | "RI_FKey_noaction_upd" | "RI_FKey_noaction_upd"
+(20 rows)
+
+INSERT INTO fk_r VALUES (1, 1, 1);
+ALTER TABLE fk_r DETACH PARTITION fk_r_1;
+\d fk_r_1
+              Table "fkpart12.fk_r_1"
+ Column |  Type   | Collation | Nullable | Default 
+--------+---------+-----------+----------+---------
+ id     | integer |           | not null | 
+ p_id   | integer |           | not null | 
+ p_jd   | integer |           | not null | 
+Indexes:
+    "fk_r_1_pkey" PRIMARY KEY, btree (id)
+Foreign-key constraints:
+    "fk_r_p_id_p_jd_fkey" FOREIGN KEY (p_id, p_jd) REFERENCES fk_p(id, jd)
+
+SELECT * FROM fkpart12_constraints();
+       conname        | conrel | confrelid |      conparent       
+----------------------+--------+-----------+----------------------
+ fk_r_p_id_p_jd_fkey  | fk_r   | fk_p      | 
+ fk_r_p_id_p_jd_fkey1 | fk_r   | fk_p_1    | fk_r_p_id_p_jd_fkey
+ fk_r_p_id_p_jd_fkey2 | fk_r   | fk_p_1_1  | fk_r_p_id_p_jd_fkey1
+ fk_r_p_id_p_jd_fkey3 | fk_r   | fk_p_1_2  | fk_r_p_id_p_jd_fkey1
+ fk_r_p_id_p_jd_fkey4 | fk_r   | fk_p_2    | fk_r_p_id_p_jd_fkey
+ fk_r_p_id_p_jd_fkey5 | fk_r   | fk_p_2_1  | fk_r_p_id_p_jd_fkey4
+ fk_r_p_id_p_jd_fkey6 | fk_r   | fk_p_2_2  | fk_r_p_id_p_jd_fkey4
+ fk_r_p_id_p_jd_fkey  | fk_r_2 | fk_p      | fk_r_p_id_p_jd_fkey
+(8 rows)
+
+SELECT * FROM fkpart12_triggers();
+       conname        |      conparent       |         tgfoid         |       tgfparent        
+----------------------+----------------------+------------------------+------------------------
+ fk_r_p_id_p_jd_fkey  | fk_r_p_id_p_jd_fkey  | "RI_FKey_check_ins"    | "RI_FKey_check_ins"
+ fk_r_p_id_p_jd_fkey  | fk_r_p_id_p_jd_fkey  | "RI_FKey_check_upd"    | "RI_FKey_check_upd"
+ fk_r_p_id_p_jd_fkey  |                      | "RI_FKey_check_ins"    | 
+ fk_r_p_id_p_jd_fkey  |                      | "RI_FKey_check_upd"    | 
+ fk_r_p_id_p_jd_fkey  |                      | "RI_FKey_noaction_del" | 
+ fk_r_p_id_p_jd_fkey  |                      | "RI_FKey_noaction_upd" | 
+ fk_r_p_id_p_jd_fkey1 | fk_r_p_id_p_jd_fkey  | "RI_FKey_noaction_del" | "RI_FKey_noaction_del"
+ fk_r_p_id_p_jd_fkey1 | fk_r_p_id_p_jd_fkey  | "RI_FKey_noaction_upd" | "RI_FKey_noaction_upd"
+ fk_r_p_id_p_jd_fkey2 | fk_r_p_id_p_jd_fkey1 | "RI_FKey_noaction_del" | "RI_FKey_noaction_del"
+ fk_r_p_id_p_jd_fkey2 | fk_r_p_id_p_jd_fkey1 | "RI_FKey_noaction_upd" | "RI_FKey_noaction_upd"
+ fk_r_p_id_p_jd_fkey3 | fk_r_p_id_p_jd_fkey1 | "RI_FKey_noaction_del" | "RI_FKey_noaction_del"
+ fk_r_p_id_p_jd_fkey3 | fk_r_p_id_p_jd_fkey1 | "RI_FKey_noaction_upd" | "RI_FKey_noaction_upd"
+ fk_r_p_id_p_jd_fkey4 | fk_r_p_id_p_jd_fkey  | "RI_FKey_noaction_del" | "RI_FKey_noaction_del"
+ fk_r_p_id_p_jd_fkey4 | fk_r_p_id_p_jd_fkey  | "RI_FKey_noaction_upd" | "RI_FKey_noaction_upd"
+ fk_r_p_id_p_jd_fkey5 | fk_r_p_id_p_jd_fkey4 | "RI_FKey_noaction_del" | "RI_FKey_noaction_del"
+ fk_r_p_id_p_jd_fkey5 | fk_r_p_id_p_jd_fkey4 | "RI_FKey_noaction_upd" | "RI_FKey_noaction_upd"
+ fk_r_p_id_p_jd_fkey6 | fk_r_p_id_p_jd_fkey4 | "RI_FKey_noaction_del" | "RI_FKey_noaction_del"
+ fk_r_p_id_p_jd_fkey6 | fk_r_p_id_p_jd_fkey4 | "RI_FKey_noaction_upd" | "RI_FKey_noaction_upd"
+(18 rows)
+
+INSERT INTO fk_r_1 VALUES (2, 1, 2); -- fails as EXPECTED
+ERROR:  insert or update on table "fk_r_1" violates foreign key constraint "fk_r_p_id_p_jd_fkey"
+DETAIL:  Key (p_id, p_jd)=(1, 2) is not present in table "fk_p".
+DELETE FROM fk_p; -- should fail but was buggy
+ERROR:  update or delete on table "fk_p_1_1" violates foreign key constraint "fk_r_1_p_id_p_jd_fkey1" on table "fk_r_1"
+DETAIL:  Key (id, jd)=(1, 1) is still referenced from table "fk_r_1".
+ALTER TABLE fk_r ATTACH PARTITION fk_r_1 FOR VALUES IN (1);
+\d fk_r_1
+              Table "fkpart12.fk_r_1"
+ Column |  Type   | Collation | Nullable | Default 
+--------+---------+-----------+----------+---------
+ id     | integer |           | not null | 
+ p_id   | integer |           | not null | 
+ p_jd   | integer |           | not null | 
+Partition of: fk_r FOR VALUES IN (1)
+Indexes:
+    "fk_r_1_pkey" PRIMARY KEY, btree (id)
+Foreign-key constraints:
+    TABLE "fk_r" CONSTRAINT "fk_r_p_id_p_jd_fkey" FOREIGN KEY (p_id, p_jd) REFERENCES fk_p(id, jd)
+
+SELECT * FROM fkpart12_constraints();
+       conname        | conrel | confrelid |      conparent       
+----------------------+--------+-----------+----------------------
+ fk_r_p_id_p_jd_fkey  | fk_r   | fk_p      | 
+ fk_r_p_id_p_jd_fkey1 | fk_r   | fk_p_1    | fk_r_p_id_p_jd_fkey
+ fk_r_p_id_p_jd_fkey2 | fk_r   | fk_p_1_1  | fk_r_p_id_p_jd_fkey1
+ fk_r_p_id_p_jd_fkey3 | fk_r   | fk_p_1_2  | fk_r_p_id_p_jd_fkey1
+ fk_r_p_id_p_jd_fkey4 | fk_r   | fk_p_2    | fk_r_p_id_p_jd_fkey
+ fk_r_p_id_p_jd_fkey5 | fk_r   | fk_p_2_1  | fk_r_p_id_p_jd_fkey4
+ fk_r_p_id_p_jd_fkey6 | fk_r   | fk_p_2_2  | fk_r_p_id_p_jd_fkey4
+ fk_r_p_id_p_jd_fkey  | fk_r_1 | fk_p      | fk_r_p_id_p_jd_fkey
+ fk_r_p_id_p_jd_fkey  | fk_r_2 | fk_p      | fk_r_p_id_p_jd_fkey
+(9 rows)
+
+SELECT * FROM fkpart12_triggers();
+       conname        |      conparent       |         tgfoid         |       tgfparent        
+----------------------+----------------------+------------------------+------------------------
+ fk_r_p_id_p_jd_fkey  | fk_r_p_id_p_jd_fkey  | "RI_FKey_check_ins"    | "RI_FKey_check_ins"
+ fk_r_p_id_p_jd_fkey  | fk_r_p_id_p_jd_fkey  | "RI_FKey_check_ins"    | "RI_FKey_check_ins"
+ fk_r_p_id_p_jd_fkey  | fk_r_p_id_p_jd_fkey  | "RI_FKey_check_upd"    | "RI_FKey_check_upd"
+ fk_r_p_id_p_jd_fkey  | fk_r_p_id_p_jd_fkey  | "RI_FKey_check_upd"    | "RI_FKey_check_upd"
+ fk_r_p_id_p_jd_fkey  |                      | "RI_FKey_check_ins"    | 
+ fk_r_p_id_p_jd_fkey  |                      | "RI_FKey_check_upd"    | 
+ fk_r_p_id_p_jd_fkey  |                      | "RI_FKey_noaction_del" | 
+ fk_r_p_id_p_jd_fkey  |                      | "RI_FKey_noaction_upd" | 
+ fk_r_p_id_p_jd_fkey1 | fk_r_p_id_p_jd_fkey  | "RI_FKey_noaction_del" | "RI_FKey_noaction_del"
+ fk_r_p_id_p_jd_fkey1 | fk_r_p_id_p_jd_fkey  | "RI_FKey_noaction_upd" | "RI_FKey_noaction_upd"
+ fk_r_p_id_p_jd_fkey2 | fk_r_p_id_p_jd_fkey1 | "RI_FKey_noaction_del" | "RI_FKey_noaction_del"
+ fk_r_p_id_p_jd_fkey2 | fk_r_p_id_p_jd_fkey1 | "RI_FKey_noaction_upd" | "RI_FKey_noaction_upd"
+ fk_r_p_id_p_jd_fkey3 | fk_r_p_id_p_jd_fkey1 | "RI_FKey_noaction_del" | "RI_FKey_noaction_del"
+ fk_r_p_id_p_jd_fkey3 | fk_r_p_id_p_jd_fkey1 | "RI_FKey_noaction_upd" | "RI_FKey_noaction_upd"
+ fk_r_p_id_p_jd_fkey4 | fk_r_p_id_p_jd_fkey  | "RI_FKey_noaction_del" | "RI_FKey_noaction_del"
+ fk_r_p_id_p_jd_fkey4 | fk_r_p_id_p_jd_fkey  | "RI_FKey_noaction_upd" | "RI_FKey_noaction_upd"
+ fk_r_p_id_p_jd_fkey5 | fk_r_p_id_p_jd_fkey4 | "RI_FKey_noaction_del" | "RI_FKey_noaction_del"
+ fk_r_p_id_p_jd_fkey5 | fk_r_p_id_p_jd_fkey4 | "RI_FKey_noaction_upd" | "RI_FKey_noaction_upd"
+ fk_r_p_id_p_jd_fkey6 | fk_r_p_id_p_jd_fkey4 | "RI_FKey_noaction_del" | "RI_FKey_noaction_del"
+ fk_r_p_id_p_jd_fkey6 | fk_r_p_id_p_jd_fkey4 | "RI_FKey_noaction_upd" | "RI_FKey_noaction_upd"
+(20 rows)
+
+DELETE FROM fk_p; -- should fail but was buggy
+ERROR:  update or delete on table "fk_p_1_1" violates foreign key constraint "fk_r_p_id_p_jd_fkey2" on table "fk_r"
+DETAIL:  Key (id, jd)=(1, 1) is still referenced from table "fk_r".
+SET client_min_messages TO warning;
+DROP SCHEMA fkpart12 CASCADE;
+RESET client_min_messages;
+RESET search_path;
diff --git a/src/test/regress/sql/foreign_key.sql b/src/test/regress/sql/foreign_key.sql
index d1aac5357f..e96ab5c703 100644
--- a/src/test/regress/sql/foreign_key.sql
+++ b/src/test/regress/sql/foreign_key.sql
@@ -2086,3 +2086,104 @@ UPDATE fkpart11.pk SET a = 3 WHERE a = 4;
 UPDATE fkpart11.pk SET a = 1 WHERE a = 2;
 
 DROP SCHEMA fkpart11 CASCADE;
+
+-- When a table is attached as partition to a partitioned table that has
+-- a foreign key to another partitioned table, it acquires a clone of the
+-- FK.  Upon detach, this clone is not removed, but instead becomes an
+-- independent FK.  If it then attaches to the partitioned table again,
+-- the FK from the parent "takes over" ownership of the independent FK rather
+-- than creating a separate one.
+CREATE SCHEMA fkpart12
+  CREATE TABLE fk_p ( id int, jd int, PRIMARY KEY(id, jd)) PARTITION BY list (id)
+  CREATE TABLE fk_p_1 PARTITION OF fk_p FOR VALUES IN (1) PARTITION BY list (jd)
+  CREATE TABLE fk_p_1_1 PARTITION OF fk_p_1 FOR VALUES IN (1)
+  CREATE TABLE fk_p_1_2 PARTITION OF fk_p_1 FOR VALUES IN (2)
+  CREATE TABLE fk_p_2 PARTITION OF fk_p FOR VALUES IN (2) PARTITION BY list (jd)
+  CREATE TABLE fk_p_2_1 PARTITION OF fk_p_2 FOR VALUES IN (1)
+  CREATE TABLE fk_p_2_2 PARTITION OF fk_p_2 FOR VALUES IN (2)
+  CREATE TABLE fk_r_1 ( id int PRIMARY KEY, p_id int NOT NULL, p_jd int NOT NULL)
+  CREATE TABLE fk_r_2 ( id int PRIMARY KEY, p_id int NOT NULL, p_jd int NOT NULL)
+  CREATE TABLE fk_r   ( id int PRIMARY KEY, p_id int NOT NULL, p_jd int NOT NULL,
+       FOREIGN KEY (p_id, p_jd) REFERENCES fk_p (id, jd)
+  ) PARTITION BY list (id);
+SET search_path TO fkpart12;
+
+CREATE OR REPLACE FUNCTION
+fkpart12_constraints(OUT conname name, OUT conrel regclass,
+                   OUT confrelid regclass, OUT conparent name) RETURNS SETOF record AS $$
+  WITH RECURSIVE r AS (
+    SELECT oid, conname, conrelid, confrelid, NULL::name AS conparent
+    FROM pg_constraint
+    WHERE conrelid = 'fk_r'::regclass
+      AND contype = 'f'
+      AND conparentid = 0
+    UNION ALL
+    SELECT c.oid, c.conname, c.conrelid, c.confrelid, r.conname
+    FROM pg_constraint c
+    JOIN r ON c.conparentid = r.oid
+  )
+  SELECT conname, conrelid::regclass, confrelid::regclass, conparent
+  FROM r
+  ORDER BY oid, conname, confrelid, conparent;
+$$
+LANGUAGE SQL;
+
+CREATE OR REPLACE FUNCTION
+fkpart12_triggers(OUT conname name, OUT conparent name,
+                   OUT tgfoid regproc, OUT tgfparent regproc) RETURNS SETOF record AS $$
+
+  WITH RECURSIVE r AS (
+    SELECT t.oid, t.tgfoid::regproc, c.conname, NULL::name AS conparent, NULL::regproc AS tgfparent
+    FROM pg_trigger t
+    JOIN pg_constraint c ON c.oid = t.tgconstraint
+    WHERE c.conrelid = 'fk_r'::regclass
+      AND c.contype = 'f'
+      AND t.tgparentid = 0
+    UNION ALL
+    SELECT t2.oid, t2.tgfoid::regproc, c2.conname, c3.conname, r.tgfoid::regproc AS tgfparent
+    FROM pg_trigger t2
+    JOIN pg_constraint c2 ON c2.oid = t2.tgconstraint
+    LEFT JOIN pg_constraint c3 ON c3.oid = c2.conparentid
+    JOIN r ON r.oid = t2.tgparentid
+  )
+  SELECT conname, conparent, tgfoid, tgfparent
+  FROM r
+  ORDER BY conname, conparent, tgfoid, tgfparent;
+$$
+LANGUAGE SQL;
+
+SELECT * FROM fkpart12_constraints();
+SELECT * FROM fkpart12_triggers();
+
+INSERT INTO fk_p VALUES (1, 1);
+
+ALTER TABLE fk_r ATTACH PARTITION fk_r_1 FOR VALUES IN (1);
+ALTER TABLE fk_r ATTACH PARTITION fk_r_2 FOR VALUES IN (2);
+
+\d fk_r_1
+SELECT * FROM fkpart12_constraints();
+SELECT * FROM fkpart12_triggers();
+
+INSERT INTO fk_r VALUES (1, 1, 1);
+
+ALTER TABLE fk_r DETACH PARTITION fk_r_1;
+
+\d fk_r_1
+SELECT * FROM fkpart12_constraints();
+SELECT * FROM fkpart12_triggers();
+
+INSERT INTO fk_r_1 VALUES (2, 1, 2); -- fails as EXPECTED
+DELETE FROM fk_p; -- should fail but was buggy
+
+ALTER TABLE fk_r ATTACH PARTITION fk_r_1 FOR VALUES IN (1);
+
+\d fk_r_1
+SELECT * FROM fkpart12_constraints();
+SELECT * FROM fkpart12_triggers();
+
+DELETE FROM fk_p; -- should fail but was buggy
+
+SET client_min_messages TO warning;
+DROP SCHEMA fkpart12 CASCADE;
+RESET client_min_messages;
+RESET search_path;
-- 
2.46.0

