mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix backwards logic in previous commit.

Browse Source 
I wrote this code before committing it, but managed not to include it in
the actual commit.
This commit is contained in:
Robert Haas 2012-01-06 22:54:43 -05:00
parent 1489e2f26a
commit df970a0ac8
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/backend/commands/tablecmds.c
View File

@ -9947,11 +9947,6 @@ RangeVarCallbackForAlterRelation(const RangeVar *rv, Oid relid, Oid oldrelid,
(errcode(ERRCODE_WRONG_OBJECT_TYPE), (errcode(ERRCODE_WRONG_OBJECT_TYPE),
errmsg("\"%s\" is not a composite type", rv->relname))); errmsg("\"%s\" is not a composite type", rv->relname)));
if (reltype == OBJECT_FOREIGN_TABLE && relkind != RELKIND_FOREIGN_TABLE)
ereport(ERROR,
(errcode(ERRCODE_WRONG_OBJECT_TYPE),
errmsg("\"%s\" is not a foreign table", rv->relname)));
if (reltype == OBJECT_INDEX && relkind != RELKIND_INDEX if (reltype == OBJECT_INDEX && relkind != RELKIND_INDEX
&& !IsA(stmt, RenameStmt)) && !IsA(stmt, RenameStmt))
ereport(ERROR, ereport(ERROR,
@ -9968,6 +9963,12 @@ RangeVarCallbackForAlterRelation(const RangeVar *rv, Oid relid, Oid oldrelid,
errmsg("\"%s\" is a composite type", rv->relname), errmsg("\"%s\" is a composite type", rv->relname),
errhint("Use ALTER TYPE instead."))); errhint("Use ALTER TYPE instead.")));
if (reltype != OBJECT_FOREIGN_TABLE && relkind == RELKIND_FOREIGN_TABLE)
ereport(ERROR,
(errcode(ERRCODE_WRONG_OBJECT_TYPE),
errmsg("\"%s\" is a foreign table", rv->relname),
errhint("Use ALTER FOREIGN TABLE instead.")));
/* /*
* Don't allow ALTER TABLE .. SET SCHEMA on relations that can't be * Don't allow ALTER TABLE .. SET SCHEMA on relations that can't be
* moved to a different schema, such as indexes and TOAST tables. * moved to a different schema, such as indexes and TOAST tables.