diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2002-07-29 23:46:35 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2002-07-29 23:46:35 +0000 |
| commit | b5eebc1fd4ebfe91f9a014af7c7ec739336ca02d (patch) | |
| tree | 579173e7497422f3cd6d9eaec94d22dc6d53d7a4 /src/backend/parser | |
| parent | 7b970bc1bcd63b840a307ae96318b9472d730b52 (diff) | |
Centralize code for interpreting schema references, which had gotten
copied more places than I first thought it would. This fixes a bug:
a couple of these places were neglecting to enforce USAGE access on
explicitly-referenced schemas.
Diffstat (limited to 'src/backend/parser')
| -rw-r--r-- | src/backend/parser/parse_type.c | 39 |
1 files changed, 5 insertions, 34 deletions
diff --git a/src/backend/parser/parse_type.c b/src/backend/parser/parse_type.c index 7eafe3e7c84..159428894e4 100644 --- a/src/backend/parser/parse_type.c +++ b/src/backend/parser/parse_type.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/parser/parse_type.c,v 1.45 2002/07/20 05:16:58 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/parse_type.c,v 1.46 2002/07/29 23:46:35 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -99,35 +99,11 @@ LookupTypeName(const TypeName *typename) else { /* Normal reference to a type name */ - char *catalogname; - char *schemaname = NULL; - char *typname = NULL; + char *schemaname; + char *typname; /* deconstruct the name list */ - switch (length(typename->names)) - { - case 1: - typname = strVal(lfirst(typename->names)); - break; - case 2: - schemaname = strVal(lfirst(typename->names)); - typname = strVal(lsecond(typename->names)); - break; - case 3: - catalogname = strVal(lfirst(typename->names)); - schemaname = strVal(lsecond(typename->names)); - typname = strVal(lfirst(lnext(lnext(typename->names)))); - /* - * We check the catalog name and then ignore it. - */ - if (strcmp(catalogname, DatabaseName) != 0) - elog(ERROR, "Cross-database references are not implemented"); - break; - default: - elog(ERROR, "Improper type name (too many dotted names): %s", - NameListToString(typename->names)); - break; - } + DeconstructQualifiedName(typename->names, &schemaname, &typname); /* If an array reference, look up the array type instead */ if (typename->arrayBounds != NIL) @@ -138,12 +114,7 @@ LookupTypeName(const TypeName *typename) /* Look in specific schema only */ Oid namespaceId; - namespaceId = GetSysCacheOid(NAMESPACENAME, - CStringGetDatum(schemaname), - 0, 0, 0); - if (!OidIsValid(namespaceId)) - elog(ERROR, "Namespace \"%s\" does not exist", - schemaname); + namespaceId = LookupExplicitNamespace(schemaname); restype = GetSysCacheOid(TYPENAMENSP, PointerGetDatum(typname), ObjectIdGetDatum(namespaceId), |