From 5c5ffee80f3547625021c29f45b37321d8c710bf Mon Sep 17 00:00:00 2001 From: Alvaro Herrera <alvherre@alvh.no-ip.org> Date: Mon, 12 Jan 2015 15:32:48 -0300 Subject: [PATCH] Fix get_object_address argument type for extension statement Commit 3f88672a4 neglected to update the AlterExtensionContentsStmt production in the grammar to use TypeName to represent types when passing objects to get_object_address. Reported as a pg_upgrade failure by Jeff Janes. --- src/backend/parser/gram.y | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y index 679e1bb5ae4..36dac299144 100644 --- a/src/backend/parser/gram.y +++ b/src/backend/parser/gram.y @@ -3907,13 +3907,13 @@ AlterExtensionContentsStmt: n->objname = $6; $$ = (Node *)n; } - | ALTER EXTENSION name add_drop DOMAIN_P any_name + | ALTER EXTENSION name add_drop DOMAIN_P Typename { AlterExtensionContentsStmt *n = makeNode(AlterExtensionContentsStmt); n->extname = $3; n->action = $4; n->objtype = OBJECT_DOMAIN; - n->objname = $6; + n->objname = list_make1($6); $$ = (Node *)n; } | ALTER EXTENSION name add_drop FUNCTION function_with_argtypes @@ -4082,13 +4082,13 @@ AlterExtensionContentsStmt: n->objname = list_make1(makeString($6)); $$ = (Node *)n; } - | ALTER EXTENSION name add_drop TYPE_P any_name + | ALTER EXTENSION name add_drop TYPE_P Typename { AlterExtensionContentsStmt *n = makeNode(AlterExtensionContentsStmt); n->extname = $3; n->action = $4; n->objtype = OBJECT_TYPE; - n->objname = $6; + n->objname = list_make1($6); $$ = (Node *)n; } ; -- GitLab