diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2003-07-04 02:51:34 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2003-07-04 02:51:34 +0000 |
| commit | 79fafdf49ca9b5adbe36fb21facddb4ef1d81241 (patch) | |
| tree | 899cad919aba943e324e24b30dd7aa6183c0a901 /src/backend/commands/opclasscmds.c | |
| parent | cdb8a844e62c50e87d5eef19ee29b50837b1c460 (diff) | |
| download | postgresql-79fafdf49ca9b5adbe36fb21facddb4ef1d81241.tar.gz | |
Some early work on error message editing. Operator-not-found and
function-not-found messages now distinguish the cases no-match and
ambiguous-match, and they follow the style guidelines too.
Diffstat (limited to 'src/backend/commands/opclasscmds.c')
| -rw-r--r-- | src/backend/commands/opclasscmds.c | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/src/backend/commands/opclasscmds.c b/src/backend/commands/opclasscmds.c index 9b90698a26..84a01446d4 100644 --- a/src/backend/commands/opclasscmds.c +++ b/src/backend/commands/opclasscmds.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/opclasscmds.c,v 1.10 2003/06/27 14:45:27 petere Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/opclasscmds.c,v 1.11 2003/07/04 02:51:33 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -155,19 +155,15 @@ DefineOpClass(CreateOpClassStmt *stmt) TypeName *typeName2 = (TypeName *) lsecond(item->args); operOid = LookupOperNameTypeNames(item->name, - typeName1, typeName2, - "DefineOpClass"); - /* No need to check for error */ + typeName1, + typeName2, + false); } else { /* Default to binary op on input datatype */ - operOid = LookupOperName(item->name, typeoid, typeoid); - if (!OidIsValid(operOid)) - elog(ERROR, "DefineOpClass: Operator '%s' for types '%s' and '%s' does not exist", - NameListToString(item->name), - format_type_be(typeoid), - format_type_be(typeoid)); + operOid = LookupOperName(item->name, typeoid, typeoid, + false); } /* Caller must have execute permission on operators */ funcOid = get_opcode(operOid); @@ -187,7 +183,7 @@ DefineOpClass(CreateOpClassStmt *stmt) elog(ERROR, "DefineOpClass: procedure number %d appears more than once", item->number); funcOid = LookupFuncNameTypeNames(item->name, item->args, - "DefineOpClass"); + false); /* Caller must have execute permission on functions */ aclresult = pg_proc_aclcheck(funcOid, GetUserId(), ACL_EXECUTE); |