From fb4de0c4adf2d8dd04bd3c2ca79a715787018d43 Mon Sep 17 00:00:00 2001 From: Alvaro Herrera Date: Mon, 23 Feb 2015 17:02:25 -0300 Subject: [PATCH 01/44] Remove OBJECT_ATTRIBUTE All cases in which it is used can be processed as OBJECT_COLUMN instead; there is no functional difference. --- src/backend/catalog/objectaddress.c | 1 - src/backend/commands/alter.c | 1 - src/backend/commands/event_trigger.c | 1 - src/backend/parser/gram.y | 2 +- src/backend/tcop/utility.c | 3 --- src/include/nodes/parsenodes.h | 1 - 6 files changed, 1 insertion(+), 8 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index d899dd7..1da38c0 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -1591,7 +1591,6 @@ check_object_ownership(Oid roleid, ObjectType objtype, ObjectAddress address, break; case OBJECT_TYPE: case OBJECT_DOMAIN: - case OBJECT_ATTRIBUTE: case OBJECT_DOMCONSTRAINT: if (!pg_type_ownercheck(address.objectId, roleid)) aclcheck_error_type(ACLCHECK_NOT_OWNER, address.objectId); diff --git a/src/backend/commands/alter.c b/src/backend/commands/alter.c index 78b54b4..7f85fa4 100644 --- a/src/backend/commands/alter.c +++ b/src/backend/commands/alter.c @@ -330,7 +330,6 @@ ExecRenameStmt(RenameStmt *stmt) return RenameRelation(stmt); case OBJECT_COLUMN: - case OBJECT_ATTRIBUTE: return renameatt(stmt); case OBJECT_RULE: diff --git a/src/backend/commands/event_trigger.c b/src/backend/commands/event_trigger.c index dcf5b98..d14346f 100644 --- a/src/backend/commands/event_trigger.c +++ b/src/backend/commands/event_trigger.c @@ -1056,7 +1056,6 @@ EventTriggerSupportsObjectType(ObjectType obtype) /* no support for event triggers on event triggers */ return false; case OBJECT_AGGREGATE: - case OBJECT_ATTRIBUTE: case OBJECT_CAST: case OBJECT_COLUMN: case OBJECT_COLLATION: diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y index 6c21002..8ad933d 100644 --- a/src/backend/parser/gram.y +++ b/src/backend/parser/gram.y @@ -7848,7 +7848,7 @@ RenameStmt: ALTER AGGREGATE func_name aggr_args RENAME TO name | ALTER TYPE_P any_name RENAME ATTRIBUTE name TO name opt_drop_behavior { RenameStmt *n = makeNode(RenameStmt); - n->renameType = OBJECT_ATTRIBUTE; + n->renameType = OBJECT_COLUMN; n->relationType = OBJECT_TYPE; n->relation = makeRangeVarFromAnyName($3, @3, yyscanner); n->subname = $6; diff --git a/src/backend/tcop/utility.c b/src/backend/tcop/utility.c index 6d26986..2b6fc3e 100644 --- a/src/backend/tcop/utility.c +++ b/src/backend/tcop/utility.c @@ -1615,9 +1615,6 @@ AlterObjectTypeCommandTag(ObjectType objtype) case OBJECT_AGGREGATE: tag = "ALTER AGGREGATE"; break; - case OBJECT_ATTRIBUTE: - tag = "ALTER TYPE"; - break; case OBJECT_CAST: tag = "ALTER CAST"; break; diff --git a/src/include/nodes/parsenodes.h b/src/include/nodes/parsenodes.h index ac13302..09607eb 100644 --- a/src/include/nodes/parsenodes.h +++ b/src/include/nodes/parsenodes.h @@ -1212,7 +1212,6 @@ typedef struct SetOperationStmt typedef enum ObjectType { OBJECT_AGGREGATE, - OBJECT_ATTRIBUTE, /* type's attribute, when distinct from column */ OBJECT_CAST, OBJECT_COLUMN, OBJECT_COLLATION, -- 2.1.4