diff options
Diffstat (limited to 'src/backend/commands/schemacmds.c')
| -rw-r--r-- | src/backend/commands/schemacmds.c | 29 |
1 files changed, 10 insertions, 19 deletions
diff --git a/src/backend/commands/schemacmds.c b/src/backend/commands/schemacmds.c index 09a284d7a1c..13574938138 100644 --- a/src/backend/commands/schemacmds.c +++ b/src/backend/commands/schemacmds.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/commands/schemacmds.c,v 1.55 2010/01/02 16:57:37 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/commands/schemacmds.c,v 1.56 2010/02/14 18:42:14 rhaas Exp $ * *------------------------------------------------------------------------- */ @@ -178,9 +178,8 @@ RemoveSchemas(DropStmt *drop) errmsg("schema name cannot be qualified"))); namespaceName = strVal(linitial(names)); - namespaceId = GetSysCacheOid(NAMESPACENAME, - CStringGetDatum(namespaceName), - 0, 0, 0); + namespaceId = GetSysCacheOid1(NAMESPACENAME, + CStringGetDatum(namespaceName)); if (!OidIsValid(namespaceId)) { @@ -233,9 +232,8 @@ RemoveSchemaById(Oid schemaOid) relation = heap_open(NamespaceRelationId, RowExclusiveLock); - tup = SearchSysCache(NAMESPACEOID, - ObjectIdGetDatum(schemaOid), - 0, 0, 0); + tup = SearchSysCache1(NAMESPACEOID, + ObjectIdGetDatum(schemaOid)); if (!HeapTupleIsValid(tup)) /* should not happen */ elog(ERROR, "cache lookup failed for namespace %u", schemaOid); @@ -259,9 +257,7 @@ RenameSchema(const char *oldname, const char *newname) rel = heap_open(NamespaceRelationId, RowExclusiveLock); - tup = SearchSysCacheCopy(NAMESPACENAME, - CStringGetDatum(oldname), - 0, 0, 0); + tup = SearchSysCacheCopy1(NAMESPACENAME, CStringGetDatum(oldname)); if (!HeapTupleIsValid(tup)) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_SCHEMA), @@ -269,9 +265,8 @@ RenameSchema(const char *oldname, const char *newname) /* make sure the new name doesn't exist */ if (HeapTupleIsValid( - SearchSysCache(NAMESPACENAME, - CStringGetDatum(newname), - 0, 0, 0))) + SearchSysCache1(NAMESPACENAME, + CStringGetDatum(newname)))) ereport(ERROR, (errcode(ERRCODE_DUPLICATE_SCHEMA), errmsg("schema \"%s\" already exists", newname))); @@ -310,9 +305,7 @@ AlterSchemaOwner_oid(Oid oid, Oid newOwnerId) rel = heap_open(NamespaceRelationId, RowExclusiveLock); - tup = SearchSysCache(NAMESPACEOID, - ObjectIdGetDatum(oid), - 0, 0, 0); + tup = SearchSysCache1(NAMESPACEOID, ObjectIdGetDatum(oid)); if (!HeapTupleIsValid(tup)) elog(ERROR, "cache lookup failed for schema %u", oid); @@ -335,9 +328,7 @@ AlterSchemaOwner(const char *name, Oid newOwnerId) rel = heap_open(NamespaceRelationId, RowExclusiveLock); - tup = SearchSysCache(NAMESPACENAME, - CStringGetDatum(name), - 0, 0, 0); + tup = SearchSysCache1(NAMESPACENAME, CStringGetDatum(name)); if (!HeapTupleIsValid(tup)) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_SCHEMA), |