rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

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.
This commit is contained in:
Tom Lane 2008-02-07 21:07:55 +00:00
parent 49a730128c
commit 1ab19a36a5
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/backend/commands/alter.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * 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,7 +216,7 @@ ExecAlterOwnerStmt(AlterOwnerStmt *stmt)
break; break;
case OBJECT_DATABASE: case OBJECT_DATABASE:
AlterDatabaseOwner((char *) linitial(stmt->object), newowner); AlterDatabaseOwner(strVal(linitial(stmt->object)), newowner);
break; break;
case OBJECT_FUNCTION: case OBJECT_FUNCTION:
@ -224,7 +224,7 @@ ExecAlterOwnerStmt(AlterOwnerStmt *stmt)
break; break;
case OBJECT_LANGUAGE: case OBJECT_LANGUAGE:
AlterLanguageOwner((char *) linitial(stmt->object), newowner); AlterLanguageOwner(strVal(linitial(stmt->object)), newowner);
break; break;
case OBJECT_OPERATOR: case OBJECT_OPERATOR:
@ -244,11 +244,11 @@ ExecAlterOwnerStmt(AlterOwnerStmt *stmt)
break; break;
case OBJECT_SCHEMA: case OBJECT_SCHEMA:
AlterSchemaOwner((char *) linitial(stmt->object), newowner); AlterSchemaOwner(strVal(linitial(stmt->object)), newowner);
break; break;
case OBJECT_TABLESPACE: case OBJECT_TABLESPACE:
AlterTableSpaceOwner((char *) linitial(stmt->object), newowner); AlterTableSpaceOwner(strVal(linitial(stmt->object)), newowner);
break; break;
case OBJECT_TYPE: case OBJECT_TYPE:

10
src/backend/parser/gram.y
View File

@ -11,7 +11,7 @@
* *
* *
* IDENTIFICATION * 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 * HISTORY
* AUTHOR DATE MAJOR EVENT * AUTHOR DATE MAJOR EVENT
@ -4825,7 +4825,7 @@ AlterOwnerStmt: ALTER AGGREGATE func_name aggr_args OWNER TO RoleId
{ {
AlterOwnerStmt *n = makeNode(AlterOwnerStmt); AlterOwnerStmt *n = makeNode(AlterOwnerStmt);
n->objectType = OBJECT_DATABASE; n->objectType = OBJECT_DATABASE;
n->object = list_make1($3); n->object = list_make1(makeString($3));
n->newowner = $6; n->newowner = $6;
$$ = (Node *)n; $$ = (Node *)n;
} }
@ -4850,7 +4850,7 @@ AlterOwnerStmt: ALTER AGGREGATE func_name aggr_args OWNER TO RoleId
{ {
AlterOwnerStmt *n = makeNode(AlterOwnerStmt); AlterOwnerStmt *n = makeNode(AlterOwnerStmt);
n->objectType = OBJECT_LANGUAGE; n->objectType = OBJECT_LANGUAGE;
n->object = list_make1($4); n->object = list_make1(makeString($4));
n->newowner = $7; n->newowner = $7;
$$ = (Node *)n; $$ = (Node *)n;
} }
@ -4885,7 +4885,7 @@ AlterOwnerStmt: ALTER AGGREGATE func_name aggr_args OWNER TO RoleId
{ {
AlterOwnerStmt *n = makeNode(AlterOwnerStmt); AlterOwnerStmt *n = makeNode(AlterOwnerStmt);
n->objectType = OBJECT_SCHEMA; n->objectType = OBJECT_SCHEMA;
n->object = list_make1($3); n->object = list_make1(makeString($3));
n->newowner = $6; n->newowner = $6;
$$ = (Node *)n; $$ = (Node *)n;
} }
@ -4901,7 +4901,7 @@ AlterOwnerStmt: ALTER AGGREGATE func_name aggr_args OWNER TO RoleId
{ {
AlterOwnerStmt *n = makeNode(AlterOwnerStmt); AlterOwnerStmt *n = makeNode(AlterOwnerStmt);
n->objectType = OBJECT_TABLESPACE; n->objectType = OBJECT_TABLESPACE;
n->object = list_make1($3); n->object = list_make1(makeString($3));
n->newowner = $6; n->newowner = $6;
$$ = (Node *)n; $$ = (Node *)n;
} }