diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2008-02-07 21:08:25 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2008-02-07 21:08:25 +0000 |
| commit | a209121c06df71abe3222b6798748c13c35f7017 (patch) | |
| tree | 94ecd99d0b83e446a21971e8876a773462b40596 /src | |
| parent | aff5af7dad9bbefa015d4c3c2d2d36726798797b (diff) | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/commands/alter.c | 8 | ||||
| -rw-r--r-- | src/backend/parser/gram.y | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/backend/commands/alter.c b/src/backend/commands/alter.c index 9bb40f35164..f407ec0859b 100644 --- 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.12 2004/12/31 21:59:41 pgsql Exp $ + * $PostgreSQL: pgsql/src/backend/commands/alter.c,v 1.12.4.1 2008/02/07 21:08:25 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -168,7 +168,7 @@ ExecAlterOwnerStmt(AlterOwnerStmt *stmt) break; case OBJECT_DATABASE: - AlterDatabaseOwner((char *) linitial(stmt->object), newowner); + AlterDatabaseOwner(strVal(linitial(stmt->object)), newowner); break; case OBJECT_FUNCTION: @@ -187,11 +187,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 index 43f74fc011e..8f94631cd70 100644 --- 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.481.4.1 2005/11/13 19:12:05 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/parser/gram.y,v 2.481.4.2 2008/02/07 21:08:25 tgl Exp $ * * HISTORY * AUTHOR DATE MAJOR EVENT @@ -3751,7 +3751,7 @@ AlterOwnerStmt: ALTER AGGREGATE func_name '(' aggr_argtype ')' OWNER TO UserId { AlterOwnerStmt *n = makeNode(AlterOwnerStmt); n->objectType = OBJECT_DATABASE; - n->object = list_make1($3); + n->object = list_make1(makeString($3)); n->newowner = $6; $$ = (Node *)n; } @@ -3794,7 +3794,7 @@ AlterOwnerStmt: ALTER AGGREGATE func_name '(' aggr_argtype ')' OWNER TO UserId { AlterOwnerStmt *n = makeNode(AlterOwnerStmt); n->objectType = OBJECT_SCHEMA; - n->object = list_make1($3); + n->object = list_make1(makeString($3)); n->newowner = $6; $$ = (Node *)n; } @@ -3810,7 +3810,7 @@ AlterOwnerStmt: ALTER AGGREGATE func_name '(' aggr_argtype ')' OWNER TO UserId { AlterOwnerStmt *n = makeNode(AlterOwnerStmt); n->objectType = OBJECT_TABLESPACE; - n->object = list_make1($3); + n->object = list_make1(makeString($3)); n->newowner = $6; $$ = (Node *)n; } |