diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/parser/parse_func.c | 6 | ||||
| -rw-r--r-- | src/backend/parser/parse_oper.c | 14 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/backend/parser/parse_func.c b/src/backend/parser/parse_func.c index a95c1b46b5c..c2066a43b12 100644 --- a/src/backend/parser/parse_func.c +++ b/src/backend/parser/parse_func.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/parser/parse_func.c,v 1.33 1998/12/13 04:16:51 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/parse_func.c,v 1.34 1998/12/13 23:54:40 thomas Exp $ * *------------------------------------------------------------------------- */ @@ -399,7 +399,7 @@ ParseFuncOrColumn(ParseState *pstate, char *funcname, List *fargs, } else { - elog(ERROR,"Unable to select an aggregate function for type %s", + elog(ERROR,"Unable to select an aggregate function for type '%s'", typeidTypeName(basetype)); } } @@ -986,7 +986,7 @@ func_get_detail(char *funcname, if (*true_typeids == NULL) { func_error(NULL, funcname, nargs, oid_array, - "There is more than one function that satisfies the given argument types" + "Unable to identify a function which satisfies the given argument types" "\n\tYou will have to retype your query using explicit typecasts"); } 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; } |