diff options
| author | Thomas G. Lockhart <lockhart@fourpalms.org> | 1998-12-13 23:54:40 +0000 |
|---|---|---|
| committer | Thomas G. Lockhart <lockhart@fourpalms.org> | 1998-12-13 23:54:40 +0000 |
| commit | 44cf948467d5f76632af26893ff048e17961ad1a (patch) | |
| tree | 34a775b2bbdb0da32c00e410db27b713b74d1dfd /src/backend/parser/parse_oper.c | |
| parent | 1a8790f7ebaa46e0565f4aa221ca3b49a3eb5120 (diff) | |
| download | postgresql-44cf948467d5f76632af26893ff048e17961ad1a.tar.gz postgresql-44cf948467d5f76632af26893ff048e17961ad1a.zip | |
Fix up error messages when looking up functions and operators to not
make the sometimes misleading claim that more than one candidate was
identified. Now say "Unable to identify...".
Diffstat (limited to 'src/backend/parser/parse_oper.c')
| -rw-r--r-- | src/backend/parser/parse_oper.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/backend/parser/parse_oper.c b/src/backend/parser/parse_oper.c index 6ee4d216099..d91e72be5a3 100644 --- a/src/backend/parser/parse_oper.c +++ b/src/backend/parser/parse_oper.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/parser/parse_oper.c,v 1.22 1998/12/08 06:18:57 thomas Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/parse_oper.c,v 1.23 1998/12/13 23:54:40 thomas Exp $ * *------------------------------------------------------------------------- */ @@ -48,8 +48,8 @@ any_ordering_op(int restype) order_op = oper("<", restype, restype, TRUE); if (!HeapTupleIsValid(order_op)) { - elog(ERROR, "Unable to find an ordering operator '%s' for type %s." - "\n\tUse an explicit ordering operator or modify the query.", + elog(ERROR, "Unable to identify an ordering operator '%s' for type '%s'" + "\n\tUse an explicit ordering operator or modify the query", "<", typeidTypeName(restype)); } order_opid = oprid(order_op); @@ -513,7 +513,7 @@ oper_inexact(char *op, Oid arg1, Oid arg2, Node **ltree, Node **rtree, bool noWa { if (!noWarnings) { - elog(ERROR, "There is more than one possible operator '%s' for types '%s' and '%s'" + elog(ERROR, "Unable to identify an operator '%s' for types '%s' and '%s'" "\n\tYou will have to retype this query using an explicit cast", op, typeTypeName(typeidType(arg1)), typeTypeName(typeidType(arg2))); } @@ -544,7 +544,7 @@ oper(char *opname, Oid ltypeId, Oid rtypeId, bool noWarnings) } else if (!noWarnings) { - elog(ERROR, "Unable to find binary operator '%s' for types %s and %s", + elog(ERROR, "Unable to identify a binary operator '%s' for types %s and %s", opname, typeTypeName(typeidType(ltypeId)), typeTypeName(typeidType(rtypeId))); } @@ -662,7 +662,7 @@ right_oper(char *op, Oid arg) if (!HeapTupleIsValid(tup)) { - elog(ERROR, "Unable to convert right operator '%s' from type %s", + elog(ERROR, "Unable to convert right operator '%s' from type '%s'", op, typeidTypeName(arg)); return NULL; } @@ -723,7 +723,7 @@ left_oper(char *op, Oid arg) if (!HeapTupleIsValid(tup)) { - elog(ERROR, "Unable to convert left operator '%s' from type %s", + elog(ERROR, "Unable to convert left operator '%s' from type '%s'", op, typeidTypeName(arg)); return NULL; } |