Fix unique INCLUDE indexes on partitioned tables

We were considering the INCLUDE columns as part of the key, allowing
unicity-violating rows to be inserted in different partitions.

Concurrent development conflict in eb7ed3f30634 and 8224de4f42cc.

Reported-by: Justin Pryzby
Discussion: https://postgr.es/m/20190109065109.GA4285@telsasoft.com

diff --git a/src/backend/commands/indexcmds.c b/src/backend/commands/indexcmds.c
index 965b9f0d23268abe9f646bb1c58180ec8bb12ede..fec5bc5dd64d3e2febd3b2478d9401fe54d06235 100644 (file)
--- a/src/backend/commands/indexcmds.c
+++ b/src/backend/commands/indexcmds.c
@@ -722,7 +722,7 @@ DefineIndex(Oid relationId,
                                                 errdetail("%s constraints cannot be used when partition keys include expressions.",
                                                                   constraint_type)));
 
-                       for (j = 0; j < indexInfo->ii_NumIndexAttrs; j++)
+                       for (j = 0; j < indexInfo->ii_NumIndexKeyAttrs; j++)
                        {
                                if (key->partattrs[i] == indexInfo->ii_IndexAttrNumbers[j])
                                {

diff --git a/src/test/regress/expected/indexing.out b/src/test/regress/expected/indexing.out
index 225f4e9527401ac486ffd400cdc81cd0112c66ac..11fdcdc3b21d975fbf199e60b1693e7f7c355410 100644 (file)
--- a/src/test/regress/expected/indexing.out
+++ b/src/test/regress/expected/indexing.out
@@ -1384,3 +1384,6 @@ insert into covidxpart values (4, 1);
 insert into covidxpart values (4, 1);
 ERROR:  duplicate key value violates unique constraint "covidxpart4_a_b_idx"
 DETAIL:  Key (a)=(4) already exists.
+create unique index on covidxpart (b) include (a); -- should fail
+ERROR:  insufficient columns in UNIQUE constraint definition
+DETAIL:  UNIQUE constraint on table "covidxpart" lacks column "a" which is part of the partition key.

diff --git a/src/test/regress/sql/indexing.sql b/src/test/regress/sql/indexing.sql
index f145384fbc9c04c69fcba57cb90396b597a0b998..8c5a0024eef47e63058dbcffc600d9f0bd052ec4 100644 (file)
--- a/src/test/regress/sql/indexing.sql
+++ b/src/test/regress/sql/indexing.sql
@@ -739,3 +739,4 @@ create unique index on covidxpart4 (a);
 alter table covidxpart attach partition covidxpart4 for values in (4);
 insert into covidxpart values (4, 1);
 insert into covidxpart values (4, 1);
+create unique index on covidxpart (b) include (a); -- should fail