aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPeter Eisentraut <peter@eisentraut.org>2023-07-12 16:12:34 +0200
committerPeter Eisentraut <peter@eisentraut.org>2023-07-12 16:13:40 +0200
commit5eaa0e92ee2f94994c55c02d01b3feabc6c35f54 (patch)
tree837af9613582e345a4ec0e41d5053c5cfef55e7b /src
parentadf333b4edb24fc9134fd76cd6c2d65f9a89c3a4 (diff)
downloadpostgresql-5eaa0e92ee2f94994c55c02d01b3feabc6c35f54.tar.gz
postgresql-5eaa0e92ee2f94994c55c02d01b3feabc6c35f54.zip
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 <alvherre@alvh.no-ip.org> Discussion: https://www.postgresql.org/message-id/flat/52a125e4-ff9a-95f5-9f61-b87cf447e4da@eisentraut.org
Diffstat (limited to 'src')
-rw-r--r--src/backend/commands/tablecmds.c7
1 files changed, 3 insertions, 4 deletions
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(),