Skip to content

Commit f5bcd39

Browse files
alvherrealvherre
committed
connoinherit may be true only for CHECK constraints
The code was setting it true for other constraints, which is bogus. Doing so caused bogus catalog entries for such constraints, and in particular caused an error to be raised when trying to drop a constraint of types other than CHECK from a table that has children, such as reported in bug #6712. In 9.2, additionally ignore connoinherit=true for other constraint types, to avoid having to force initdb; existing databases might already contain bogus catalog entries. Includes a catversion bump (in HEAD only). Bug report from Miroslav Šulc Analysis from Amit Kapila and Noah Misch; Amit also contributed the patch.
1 parent 8e617e2 commit f5bcd39

File tree

6 files changed

+157
-4
lines changed

6 files changed

+157
-4
lines changed

‎src/backend/catalog/index.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1154,7 +1154,7 @@ index_constraint_create(Relation heapRelation,
11541154
NULL,
11551155
true, /* islocal */
11561156
0, /* inhcount */
1157-
false); /* noinherit */
1157+
true); /* noinherit */
11581158

11591159
/*
11601160
* Register the index as internally dependent on the constraint.

‎src/backend/commands/tablecmds.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6039,7 +6039,7 @@ ATAddForeignKeyConstraint(AlteredTableInfo *tab, Relation rel,
60396039
NULL,
60406040
true, /* islocal */
60416041
0, /* inhcount */
6042-
false); /* isnoinherit */
6042+
true); /* isnoinherit */
60436043

60446044
/*
60456045
* Create the triggers that will enforce the constraint.

‎src/backend/commands/trigger.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -459,7 +459,7 @@ CreateTrigger(CreateTrigStmt *stmt, const char *queryString,
459459
NULL,
460460
true, /* islocal */
461461
0, /* inhcount */
462-
false); /* isnoinherit */
462+
true); /* isnoinherit */
463463
}
464464

465465
/*

‎src/include/catalog/catversion.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,6 @@
5353
*/
5454

5555
/* yyyymmddN */
56-
#define CATALOG_VERSION_NO 201207181
56+
#define CATALOG_VERSION_NO 201207201
5757

5858
#endif

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

Lines changed: 117 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -969,6 +969,123 @@ DETAIL: drop cascades to table inht2
969969
drop cascades to table inhts
970970
drop cascades to table inht3
971971
drop cascades to table inht4
972+
-- Test non-inheritable indices [UNIQUE, EXCLUDE] contraints
973+
CREATE TABLE test_constraints (id int, val1 varchar, val2 int, UNIQUE(val1, val2));
974+
CREATE TABLE test_constraints_inh () INHERITS (test_constraints);
975+
\d+ test_constraints
976+
Table "public.test_constraints"
977+
Column | Type | Modifiers | Storage | Stats target | Description
978+
--------+-------------------+-----------+----------+--------------+-------------
979+
id | integer | | plain | |
980+
val1 | character varying | | extended | |
981+
val2 | integer | | plain | |
982+
Indexes:
983+
"test_constraints_val1_val2_key" UNIQUE CONSTRAINT, btree (val1, val2)
984+
Child tables: test_constraints_inh
985+
Has OIDs: no
986+
987+
ALTER TABLE ONLY test_constraints DROP CONSTRAINT test_constraints_val1_val2_key;
988+
\d+ test_constraints
989+
Table "public.test_constraints"
990+
Column | Type | Modifiers | Storage | Stats target | Description
991+
--------+-------------------+-----------+----------+--------------+-------------
992+
id | integer | | plain | |
993+
val1 | character varying | | extended | |
994+
val2 | integer | | plain | |
995+
Child tables: test_constraints_inh
996+
Has OIDs: no
997+
998+
\d+ test_constraints_inh
999+
Table "public.test_constraints_inh"
1000+
Column | Type | Modifiers | Storage | Stats target | Description
1001+
--------+-------------------+-----------+----------+--------------+-------------
1002+
id | integer | | plain | |
1003+
val1 | character varying | | extended | |
1004+
val2 | integer | | plain | |
1005+
Inherits: test_constraints
1006+
Has OIDs: no
1007+
1008+
DROP TABLE test_constraints_inh;
1009+
DROP TABLE test_constraints;
1010+
CREATE TABLE circles (
1011+
c circle,
1012+
EXCLUDE USING gist (c WITH &&)
1013+
);
1014+
CREATE TABLE circles_inh () INHERITS (circles);
1015+
\d+ circles
1016+
Table "public.circles"
1017+
Column | Type | Modifiers | Storage | Stats target | Description
1018+
--------+--------+-----------+---------+--------------+-------------
1019+
c | circle | | plain | |
1020+
Indexes:
1021+
"circles_c_excl" EXCLUDE USING gist (c WITH &&)
1022+
Child tables: circles_inh
1023+
Has OIDs: no
1024+
1025+
ALTER TABLE circles DROP CONSTRAINT circles_c_excl;
1026+
\d+ circles
1027+
Table "public.circles"
1028+
Column | Type | Modifiers | Storage | Stats target | Description
1029+
--------+--------+-----------+---------+--------------+-------------
1030+
c | circle | | plain | |
1031+
Child tables: circles_inh
1032+
Has OIDs: no
1033+
1034+
\d+ circles_inh
1035+
Table "public.circles_inh"
1036+
Column | Type | Modifiers | Storage | Stats target | Description
1037+
--------+--------+-----------+---------+--------------+-------------
1038+
c | circle | | plain | |
1039+
Inherits: circles
1040+
Has OIDs: no
1041+
1042+
DROP TABLE circles_inh;
1043+
DROP TABLE circles;
1044+
-- Test non-inheritable foreign key contraints
1045+
CREATE TABLE test_primary_constraints(id int PRIMARY KEY);
1046+
CREATE TABLE test_foreign_constraints(id1 int REFERENCES test_primary_constraints(id));
1047+
CREATE TABLE test_foreign_constraints_inh () INHERITS (test_foreign_constraints);
1048+
\d+ test_primary_constraints
1049+
Table "public.test_primary_constraints"
1050+
Column | Type | Modifiers | Storage | Stats target | Description
1051+
--------+---------+-----------+---------+--------------+-------------
1052+
id | integer | not null | plain | |
1053+
Indexes:
1054+
"test_primary_constraints_pkey" PRIMARY KEY, btree (id)
1055+
Referenced by:
1056+
TABLE "test_foreign_constraints" CONSTRAINT "test_foreign_constraints_id1_fkey" FOREIGN KEY (id1) REFERENCES test_primary_constraints(id)
1057+
Has OIDs: no
1058+
1059+
\d+ test_foreign_constraints
1060+
Table "public.test_foreign_constraints"
1061+
Column | Type | Modifiers | Storage | Stats target | Description
1062+
--------+---------+-----------+---------+--------------+-------------
1063+
id1 | integer | | plain | |
1064+
Foreign-key constraints:
1065+
"test_foreign_constraints_id1_fkey" FOREIGN KEY (id1) REFERENCES test_primary_constraints(id)
1066+
Child tables: test_foreign_constraints_inh
1067+
Has OIDs: no
1068+
1069+
ALTER TABLE test_foreign_constraints DROP CONSTRAINT test_foreign_constraints_id1_fkey;
1070+
\d+ test_foreign_constraints
1071+
Table "public.test_foreign_constraints"
1072+
Column | Type | Modifiers | Storage | Stats target | Description
1073+
--------+---------+-----------+---------+--------------+-------------
1074+
id1 | integer | | plain | |
1075+
Child tables: test_foreign_constraints_inh
1076+
Has OIDs: no
1077+
1078+
\d+ test_foreign_constraints_inh
1079+
Table "public.test_foreign_constraints_inh"
1080+
Column | Type | Modifiers | Storage | Stats target | Description
1081+
--------+---------+-----------+---------+--------------+-------------
1082+
id1 | integer | | plain | |
1083+
Inherits: test_foreign_constraints
1084+
Has OIDs: no
1085+
1086+
DROP TABLE test_foreign_constraints_inh;
1087+
DROP TABLE test_foreign_constraints;
1088+
DROP TABLE test_primary_constraints;
9721089
--
9731090
-- Test parameterized append plans for inheritance trees
9741091
--

‎src/test/regress/sql/inherit.sql‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -291,6 +291,42 @@ SELECT a.attrelid::regclass, a.attname, a.attinhcount, e.expected
291291

292292
DROP TABLE inht1, inhs1 CASCADE;
293293

294+
295+
-- Test non-inheritable indices [UNIQUE, EXCLUDE] contraints
296+
CREATE TABLE test_constraints (id int, val1 varchar, val2 int, UNIQUE(val1, val2));
297+
CREATE TABLE test_constraints_inh () INHERITS (test_constraints);
298+
\d+ test_constraints
299+
ALTER TABLE ONLY test_constraints DROP CONSTRAINT test_constraints_val1_val2_key;
300+
\d+ test_constraints
301+
\d+ test_constraints_inh
302+
DROP TABLE test_constraints_inh;
303+
DROP TABLE test_constraints;
304+
305+
CREATE TABLE circles (
306+
c circle,
307+
EXCLUDE USING gist (c WITH &&)
308+
);
309+
CREATE TABLE circles_inh () INHERITS (circles);
310+
\d+ circles
311+
ALTER TABLE circles DROP CONSTRAINT circles_c_excl;
312+
\d+ circles
313+
\d+ circles_inh
314+
DROP TABLE circles_inh;
315+
DROP TABLE circles;
316+
317+
-- Test non-inheritable foreign key contraints
318+
CREATE TABLE test_primary_constraints(id int PRIMARY KEY);
319+
CREATE TABLE test_foreign_constraints(id1 int REFERENCES test_primary_constraints(id));
320+
CREATE TABLE test_foreign_constraints_inh () INHERITS (test_foreign_constraints);
321+
\d+ test_primary_constraints
322+
\d+ test_foreign_constraints
323+
ALTER TABLE test_foreign_constraints DROP CONSTRAINT test_foreign_constraints_id1_fkey;
324+
\d+ test_foreign_constraints
325+
\d+ test_foreign_constraints_inh
326+
DROP TABLE test_foreign_constraints_inh;
327+
DROP TABLE test_foreign_constraints;
328+
DROP TABLE test_primary_constraints;
329+
294330
--
295331
-- Test parameterized append plans for inheritance trees
296332
--

0 commit comments

Comments
 (0)