index fdcd09bc5eb387b6a0e319bbc189c51c5ca26315..1f6073fb9724d3f6f8bd6b5026173a6120c6f343 100644 (file)
@@ -2721,6 +2721,12 @@ MergeAttributes(List *columns, const List *supers, char relpersistence,
int32 deftypmod;
Oid defCollId;
+ /*
+ * Partitions have only one parent and have no column
+ * definitions of their own, so conflict should never occur.
+ */
+ Assert(!is_partition);
+
/*
* Yes, try to merge the two column definitions.
*/
@@ -2792,12 +2798,9 @@ MergeAttributes(List *columns, const List *supers, char relpersistence,
/*
* In regular inheritance, columns in the parent's primary key
- * get an extra not-null constraint. Partitioning doesn't
- * need this, because the PK itself is going to be cloned to
- * the partition.
+ * get an extra not-null constraint.
*/
- if (!is_partition &&
- bms_is_member(parent_attno - FirstLowInvalidHeapAttributeNumber,
+ if (bms_is_member(parent_attno - FirstLowInvalidHeapAttributeNumber,
pkattrs))
{
CookedConstraint *nn;