summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane2008-02-07 21:08:25 +0000
committerTom Lane2008-02-07 21:08:25 +0000
commit9dbd2c003becbb9ffde0a58afd20dd3dfc946d5b (patch)
treebf7dbfbd9f5c7c0b09e250d1578ec84723a74d1c
parent66cf667735d2ecc02b4e4bc5a590b183c74d5094 (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.
-rw-r--r--src/backend/commands/alter.c8
-rw-r--r--src/backend/parser/gram.y8
2 files changed, 8 insertions, 8 deletions
diff --git a/src/backend/commands/alter.c b/src/backend/commands/alter.c
index 4c87248adf..3074ad585e 100644
--- a/src/backend/commands/alter.c
+++ b/src/backend/commands/alter.c
@@ -216,7 +216,7 @@ ExecAlterOwnerStmt(AlterOwnerStmt *stmt)
break;
case OBJECT_DATABASE:
- AlterDatabaseOwner((char *) linitial(stmt->object), newowner);
+ AlterDatabaseOwner(strVal(linitial(stmt->object)), newowner);
break;
case OBJECT_FUNCTION:
@@ -224,7 +224,7 @@ ExecAlterOwnerStmt(AlterOwnerStmt *stmt)
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
index d780e750d1..3dc2c36e21 100644
--- a/src/backend/parser/gram.y
+++ b/src/backend/parser/gram.y
@@ -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;
}