Some variants of ALTER OWNER tried to make the "object" field of the

tglsfdc · tglsfdc · commit 1ab19a36a568 · 2008-02-07T21:07:55.000Z
statement be a list of bare C strings, rather than String nodes, which is
what they need to be for copyfuncs/equalfuncs to work.  Fortunately these
node types never go out to disk (if they did, we'd likely have noticed the
problem sooner), so we can just fix it without creating a need for initdb.
This bug has been there since 8.0, but 8.3 exposes it in a more common
code path (Parse messages) than prior releases did.  Per bug #3940 from
Vladimir Kokovic.
diff --git a/src/backend/commands/alter.c b/src/backend/commands/alter.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/commands/alter.c,v 1.26 2008/01/01 19:45:48 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/commands/alter.c,v 1.27 2008/02/07 21:07:55 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -216,15 +216,15 @@ ExecAlterOwnerStmt(AlterOwnerStmt *stmt)
 			break;
 
 		case OBJECT_DATABASE:
-			AlterDatabaseOwner((char *) linitial(stmt->object), newowner);
+			AlterDatabaseOwner(strVal(linitial(stmt->object)), newowner);
 			break;
 
 		case OBJECT_FUNCTION:
 			AlterFunctionOwner(stmt->object, stmt->objarg, newowner);
 			break;
 
 		case OBJECT_LANGUAGE:
-			AlterLanguageOwner((char *) linitial(stmt->object), newowner);
+			AlterLanguageOwner(strVal(linitial(stmt->object)), newowner);
 			break;
 
 		case OBJECT_OPERATOR:
@@ -244,11 +244,11 @@ ExecAlterOwnerStmt(AlterOwnerStmt *stmt)
 			break;
 
 		case OBJECT_SCHEMA:
-			AlterSchemaOwner((char *) linitial(stmt->object), newowner);
+			AlterSchemaOwner(strVal(linitial(stmt->object)), newowner);
 			break;
 
 		case OBJECT_TABLESPACE:
-			AlterTableSpaceOwner((char *) linitial(stmt->object), newowner);
+			AlterTableSpaceOwner(strVal(linitial(stmt->object)), newowner);
 			break;
 
 		case OBJECT_TYPE:
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
@@ -11,7 +11,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/parser/gram.y,v 2.605 2008/01/01 19:45:50 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/parser/gram.y,v 2.606 2008/02/07 21:07:55 tgl Exp $
  *
  * HISTORY
  *	  AUTHOR			DATE			MAJOR EVENT
@@ -4825,7 +4825,7 @@ AlterOwnerStmt: ALTER AGGREGATE func_name aggr_args OWNER TO RoleId
 				{
 					AlterOwnerStmt *n = makeNode(AlterOwnerStmt);
 					n->objectType = OBJECT_DATABASE;
-					n->object = list_make1($3);
+					n->object = list_make1(makeString($3));
 					n->newowner = $6;
 					$$ = (Node *)n;
 				}
@@ -4850,7 +4850,7 @@ AlterOwnerStmt: ALTER AGGREGATE func_name aggr_args OWNER TO RoleId
 				{
 					AlterOwnerStmt *n = makeNode(AlterOwnerStmt);
 					n->objectType = OBJECT_LANGUAGE;
-					n->object = list_make1($4);
+					n->object = list_make1(makeString($4));
 					n->newowner = $7;
 					$$ = (Node *)n;
 				}
@@ -4885,7 +4885,7 @@ AlterOwnerStmt: ALTER AGGREGATE func_name aggr_args OWNER TO RoleId
 				{
 					AlterOwnerStmt *n = makeNode(AlterOwnerStmt);
 					n->objectType = OBJECT_SCHEMA;
-					n->object = list_make1($3);
+					n->object = list_make1(makeString($3));
 					n->newowner = $6;
 					$$ = (Node *)n;
 				}
@@ -4901,7 +4901,7 @@ AlterOwnerStmt: ALTER AGGREGATE func_name aggr_args OWNER TO RoleId
 				{
 					AlterOwnerStmt *n = makeNode(AlterOwnerStmt);
 					n->objectType = OBJECT_TABLESPACE;
-					n->object = list_make1($3);
+					n->object = list_make1(makeString($3));
 					n->newowner = $6;
 					$$ = (Node *)n;
 				}

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`*`
`12`	`12`	`*`
`13`	`13`	`* IDENTIFICATION`
`14`		`- * $PostgreSQL: pgsql/src/backend/parser/gram.y,v 2.605 2008/01/01 19:45:50 momjian Exp $`
	`14`	`+ * $PostgreSQL: pgsql/src/backend/parser/gram.y,v 2.606 2008/02/07 21:07:55 tgl Exp $`
`15`	`15`	`*`
`16`	`16`	`* HISTORY`
`17`	`17`	`* AUTHOR DATE MAJOR EVENT`
`@@ -4825,7 +4825,7 @@ AlterOwnerStmt: ALTER AGGREGATE func_name aggr_args OWNER TO RoleId`
`4825`	`4825`	`{`
`4826`	`4826`	`AlterOwnerStmt *n = makeNode(AlterOwnerStmt);`
`4827`	`4827`	`n->objectType = OBJECT_DATABASE;`
`4828`		`- n->object = list_make1($3);`
	`4828`	`+ n->object = list_make1(makeString($3));`
`4829`	`4829`	`n->newowner = $6;`
`4830`	`4830`	`$$ = (Node *)n;`
`4831`	`4831`	`}`
`@@ -4850,7 +4850,7 @@ AlterOwnerStmt: ALTER AGGREGATE func_name aggr_args OWNER TO RoleId`
`4850`	`4850`	`{`
`4851`	`4851`	`AlterOwnerStmt *n = makeNode(AlterOwnerStmt);`
`4852`	`4852`	`n->objectType = OBJECT_LANGUAGE;`
`4853`		`- n->object = list_make1($4);`
	`4853`	`+ n->object = list_make1(makeString($4));`
`4854`	`4854`	`n->newowner = $7;`
`4855`	`4855`	`$$ = (Node *)n;`
`4856`	`4856`	`}`
`@@ -4885,7 +4885,7 @@ AlterOwnerStmt: ALTER AGGREGATE func_name aggr_args OWNER TO RoleId`
`4885`	`4885`	`{`
`4886`	`4886`	`AlterOwnerStmt *n = makeNode(AlterOwnerStmt);`
`4887`	`4887`	`n->objectType = OBJECT_SCHEMA;`
`4888`		`- n->object = list_make1($3);`
	`4888`	`+ n->object = list_make1(makeString($3));`
`4889`	`4889`	`n->newowner = $6;`
`4890`	`4890`	`$$ = (Node *)n;`
`4891`	`4891`	`}`
`@@ -4901,7 +4901,7 @@ AlterOwnerStmt: ALTER AGGREGATE func_name aggr_args OWNER TO RoleId`
`4901`	`4901`	`{`
`4902`	`4902`	`AlterOwnerStmt *n = makeNode(AlterOwnerStmt);`
`4903`	`4903`	`n->objectType = OBJECT_TABLESPACE;`
`4904`		`- n->object = list_make1($3);`
	`4904`	`+ n->object = list_make1(makeString($3));`
`4905`	`4905`	`n->newowner = $6;`
`4906`	`4906`	`$$ = (Node *)n;`
`4907`	`4907`	`}`