Fix get_object_address argument type for extension statement

alvherre · alvherre · commit 5c5ffee80f35 · 2015-01-12T15:32:48.000-03:00
Commit 3f88672 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.
diff --git 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;
 				}
 		;

Original file line number	Diff line number	Diff line change
`@@ -3907,13 +3907,13 @@ AlterExtensionContentsStmt:`
`3907`	`3907`	`n->objname = $6;`
`3908`	`3908`	`$$ = (Node *)n;`
`3909`	`3909`	`}`
`3910`		`- \| ALTER EXTENSION name add_drop DOMAIN_P any_name`
	`3910`	`+ \| ALTER EXTENSION name add_drop DOMAIN_P Typename`
`3911`	`3911`	`{`
`3912`	`3912`	`AlterExtensionContentsStmt *n = makeNode(AlterExtensionContentsStmt);`
`3913`	`3913`	`n->extname = $3;`
`3914`	`3914`	`n->action = $4;`
`3915`	`3915`	`n->objtype = OBJECT_DOMAIN;`
`3916`		`- n->objname = $6;`
	`3916`	`+ n->objname = list_make1($6);`
`3917`	`3917`	`$$ = (Node *)n;`
`3918`	`3918`	`}`
`3919`	`3919`	`\| ALTER EXTENSION name add_drop FUNCTION function_with_argtypes`
`@@ -4082,13 +4082,13 @@ AlterExtensionContentsStmt:`
`4082`	`4082`	`n->objname = list_make1(makeString($6));`
`4083`	`4083`	`$$ = (Node *)n;`
`4084`	`4084`	`}`
`4085`		`- \| ALTER EXTENSION name add_drop TYPE_P any_name`
	`4085`	`+ \| ALTER EXTENSION name add_drop TYPE_P Typename`
`4086`	`4086`	`{`
`4087`	`4087`	`AlterExtensionContentsStmt *n = makeNode(AlterExtensionContentsStmt);`
`4088`	`4088`	`n->extname = $3;`
`4089`	`4089`	`n->action = $4;`
`4090`	`4090`	`n->objtype = OBJECT_TYPE;`
`4091`		`- n->objname = $6;`
	`4091`	`+ n->objname = list_make1($6);`
`4092`	`4092`	`$$ = (Node *)n;`
`4093`	`4093`	`}`
`4094`	`4094`	`;`