Push attidentity and attgenerated handling into BuildDescForRelation()

petere · petere · commit 6d341407a6e3 · 2023-10-05T16:20:46.000+02:00
Previously, this was handled by the callers separately, but it can be trivially moved into BuildDescForRelation() so that it is handled in a central place. Reviewed-by: Alvaro Herrera <alvherre@alvh.no-ip.org> Discussion: https://www.postgresql.org/message-id/flat/52a125e4-ff9a-95f5-9f61-b87cf447e4da@eisentraut.org
diff --git a/src/backend/access/common/tupdesc.c b/src/backend/access/common/tupdesc.c
@@ -856,6 +856,8 @@ BuildDescForRelation(const List *columns)
 		has_not_null |= entry->is_not_null;
 		att->attislocal = entry->is_local;
 		att->attinhcount = entry->inhcount;
+		att->attidentity = entry->identity;
+		att->attgenerated = entry->generated;
 	}
 
 	if (has_not_null)
diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c
@@ -941,8 +941,6 @@ DefineRelation(CreateStmt *stmt, char relkind, Oid ownerId,
 			attr->atthasdef = true;
 		}
 
-		attr->attidentity = colDef->identity;
-		attr->attgenerated = colDef->generated;
 		attr->attcompression = GetAttributeCompression(attr->atttypid, colDef->compression);
 		if (colDef->storage_name)
 			attr->attstorage = GetAttributeStorage(attr->atttypid, colDef->storage_name);

Original file line number	Diff line number	Diff line change
`@@ -856,6 +856,8 @@ BuildDescForRelation(const List *columns)`
`856`	`856`	`has_not_null \|= entry->is_not_null;`
`857`	`857`	`att->attislocal = entry->is_local;`
`858`	`858`	`att->attinhcount = entry->inhcount;`
	`859`	`+ att->attidentity = entry->identity;`
	`860`	`+ att->attgenerated = entry->generated;`
`859`	`861`	`}`
`860`	`862`
`861`	`863`	`if (has_not_null)`
Original file line number	Diff line number	Diff line change
`@@ -941,8 +941,6 @@ DefineRelation(CreateStmt *stmt, char relkind, Oid ownerId,`
`941`	`941`	`attr->atthasdef = true;`
`942`	`942`	`}`
`943`	`943`
`944`		`- attr->attidentity = colDef->identity;`
`945`		`- attr->attgenerated = colDef->generated;`
`946`	`944`	`attr->attcompression = GetAttributeCompression(attr->atttypid, colDef->compression);`
`947`	`945`	`if (colDef->storage_name)`
`948`	`946`	`attr->attstorage = GetAttributeStorage(attr->atttypid, colDef->storage_name);`