From: Peter Eisentraut Date: Wed, 12 Jul 2023 14:12:34 +0000 (+0200) Subject: Remove ancient special case code for adding oid columns X-Git-Tag: REL_17_BETA1~2155 X-Git-Url: http://git.postgresql.org/gitweb/?a=commitdiff_plain;h=5eaa0e92e;p=postgresql.git Remove ancient special case code for adding oid columns The special handling of negative attribute numbers in ATExecAddColumn() was introduced to support SET WITH OIDS (commit 6d1e361852). But that feature doesn't exist anymore, so we can revert to the previous, simpler version. In passing, also remove an obsolete comment about OID support. Reviewed-by: Alvaro Herrera Discussion: https://www.postgresql.org/message-id/flat/52a125e4-ff9a-95f5-9f61-b87cf447e4da@eisentraut.org --- diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c index 8fff036b73d..a9e2a1a1ad2 100644 --- a/src/backend/commands/tablecmds.c +++ b/src/backend/commands/tablecmds.c @@ -2450,8 +2450,7 @@ MergeAttributes(List *schema, List *supers, char relpersistence, /* * Scan the parents left-to-right, and merge their attributes to form a - * list of inherited attributes (inhSchema). Also check to see if we need - * to inherit an OID column. + * list of inherited attributes (inhSchema). */ child_attno = 0; foreach(entry, supers) @@ -6945,7 +6944,7 @@ ATExecAddColumn(List **wqueue, AlteredTableInfo *tab, Relation rel, attribute.attrelid = myrelid; namestrcpy(&(attribute.attname), colDef->colname); attribute.atttypid = typeOid; - attribute.attstattarget = (newattnum > 0) ? -1 : 0; + attribute.attstattarget = -1; attribute.attlen = tform->typlen; attribute.attnum = newattnum; if (list_length(colDef->typeName->arrayBounds) > PG_INT16_MAX) @@ -7068,7 +7067,7 @@ ATExecAddColumn(List **wqueue, AlteredTableInfo *tab, Relation rel, * is certainly not going to touch them. System attributes don't have * interesting defaults, either. */ - if (RELKIND_HAS_STORAGE(relkind) && attribute.attnum > 0) + if (RELKIND_HAS_STORAGE(relkind)) { /* * For an identity column, we can't use build_column_default(),