From: Robert Haas <rhaas@postgresql.org>
Date: Sat, 7 Jan 2012 03:54:43 +0000 (-0500)
Subject: Fix backwards logic in previous commit.
X-Git-Tag: REL9_2_BETA1~609
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=df970a0ac8fb416b179825a135c18ad3293076af;p=postgresql

Fix backwards logic in previous commit.

I wrote this code before committing it, but managed not to include it in
the actual commit.
---

diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c
index 0cd273e9c6..c37301671e 100644
--- a/src/backend/commands/tablecmds.c
+++ b/src/backend/commands/tablecmds.c
@@ -9947,11 +9947,6 @@ RangeVarCallbackForAlterRelation(const RangeVar *rv, Oid relid, Oid oldrelid,
 				(errcode(ERRCODE_WRONG_OBJECT_TYPE),
 				 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
 		&& !IsA(stmt, RenameStmt))
 		ereport(ERROR,
@@ -9968,6 +9963,12 @@ RangeVarCallbackForAlterRelation(const RangeVar *rv, Oid relid, Oid oldrelid,
 				 errmsg("\"%s\" is a composite type", rv->relname),
 				 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
 	 * moved to a different schema, such as indexes and TOAST tables.