diff options
| author | Marc G. Fournier <scrappy@hub.org> | 1998-02-05 04:08:44 +0000 |
|---|---|---|
| committer | Marc G. Fournier <scrappy@hub.org> | 1998-02-05 04:08:44 +0000 |
| commit | 7b6cbd53f7930838060dcec1503d1be1fb4ac5f0 (patch) | |
| tree | fd65b20346e15c8cd59327b556de138def8eeb91 /src/backend/parser/parse_func.c | |
| parent | af7a2b3243f64e56a5e77b5d0ce70de0f98c789a (diff) | |
| download | postgresql-7b6cbd53f7930838060dcec1503d1be1fb4ac5f0.tar.gz postgresql-7b6cbd53f7930838060dcec1503d1be1fb4ac5f0.zip | |
func_error() changed so that if caller is passed with NULL value, its
output at least doesn't appear that its missing something.
wasn't particularly confident with removing 'caller' altogether :(
Diffstat (limited to 'src/backend/parser/parse_func.c')
| -rw-r--r-- | src/backend/parser/parse_func.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/backend/parser/parse_func.c b/src/backend/parser/parse_func.c index f1ce43f8b82..2325251ade3 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.11 1998/02/05 03:35:48 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/parse_func.c,v 1.12 1998/02/05 04:08:42 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -728,7 +728,7 @@ func_get_detail(char *funcname, funcname); elog(NOTICE, "that satisfies the given argument types. you will have to"); elog(NOTICE, "retype your query using explicit typecasts."); - func_error(funcname, nargs, oid_array); + func_error(NULL, funcname, nargs, oid_array); } else { @@ -758,7 +758,7 @@ func_get_detail(char *funcname, elog(ERROR, "no such attribute or function \"%s\"", funcname); } - func_error(funcname, nargs, oid_array); + func_error(NULL, funcname, nargs, oid_array); } else { @@ -1276,7 +1276,7 @@ ParseComplexProjection(ParseState *pstate, * argument types */ void -func_error(char *funcname, int nargs, Oid *argtypes) +func_error(char *caller, char *funcname, int nargs, Oid *argtypes) { char p[(NAMEDATALEN + 2) * MAXFMGRARGS], *ptr; @@ -1301,5 +1301,9 @@ func_error(char *funcname, int nargs, Oid *argtypes) ptr += strlen(ptr); } - elog(ERROR, "function %s(%s) does not exist", funcname, p); + if(caller == NULL) { + elog(ERROR, "function %s(%s) does not exist", funcname, p); + } else { + elog(ERROR, "%s: function %s(%s) does not exist", caller, funcname, p); + } } |