From 7ac5760fa283bc090c25e4ea495a0d2bb41db7b5 Mon Sep 17 00:00:00 2001 From: Alvaro Herrera Date: Tue, 15 Jan 2013 13:23:43 -0300 Subject: Rework order of checks in ALTER / SET SCHEMA When attempting to move an object into the schema in which it already was, for most objects classes we were correctly complaining about exactly that ("object is already in schema"); but for some other object classes, such as functions, we were instead complaining of a name collision ("object already exists in schema"). The latter is wrong and misleading, per complaint from Robert Haas in CA+TgmoZ0+gNf7RDKRc3u5rHXffP=QjqPZKGxb4BsPz65k7qnHQ@mail.gmail.com To fix, refactor the way these checks are done. As a bonus, the resulting code is smaller and can also share some code with Rename cases. While at it, remove use of getObjectDescriptionOids() in error messages. These are normally disallowed because of translatability considerations, but this one had slipped through since 9.1. (Not sure that this is worth backpatching, though, as it would create some untranslated messages in back branches.) This is loosely based on a patch by KaiGai Kohei, heavily reworked by me. --- src/include/commands/collationcmds.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/include/commands/collationcmds.h') diff --git a/src/include/commands/collationcmds.h b/src/include/commands/collationcmds.h index c7b536a6358..5aaa1781726 100644 --- a/src/include/commands/collationcmds.h +++ b/src/include/commands/collationcmds.h @@ -19,7 +19,6 @@ extern Oid DefineCollation(List *names, List *parameters); extern Oid RenameCollation(List *name, const char *newname); -extern Oid AlterCollationNamespace(List *name, const char *newschema); -extern Oid AlterCollationNamespace_oid(Oid collOid, Oid newNspOid); +extern void IsThereCollationInNamespace(const char *collname, Oid newNspOid); #endif /* COLLATIONCMDS_H */ -- cgit v1.2.3