From 2553d082b16db2c54f2e1e4a66f1a57ecabf3c1e Mon Sep 17 00:00:00 2001 From: Ashutosh Bapat Date: Wed, 24 Jan 2024 11:15:15 +0530 Subject: [PATCH 2/4] Mark NULL constraint in merged definition instead of new definition This is a typo/thinko in previous commit. Also fix pgindent issue. Ashutosh Bapat --- src/backend/commands/tablecmds.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c index 04e674bbda..cde524083e 100644 --- a/src/backend/commands/tablecmds.c +++ b/src/backend/commands/tablecmds.c @@ -2726,8 +2726,8 @@ MergeAttributes(List *columns, const List *supers, char relpersistence, /* * Regular inheritance children are independent enough not to - * inherit identity columns. But partitions are integral part - * of a partitioned table and inherit identity column. + * inherit identity columns. But partitions are integral part of + * a partitioned table and inherit identity column. */ if (is_partition) newdef->identity = attribute->attidentity; @@ -2844,7 +2844,7 @@ MergeAttributes(List *columns, const List *supers, char relpersistence, if (bms_is_member(parent_attno, nncols) || bms_is_member(parent_attno - FirstLowInvalidHeapAttributeNumber, pkattrs)) - newdef->is_not_null = true; + prevdef->is_not_null = true; /* * Check for GENERATED conflicts -- 2.25.1