func_error() changed so that if caller is passed with NULL value, its

scrappy · scrappy · commit 7b6cbd53f793 · 1998-02-05T04:08:44.000Z
output at least doesn't appear that its missing something.

wasn't particularly confident with removing 'caller' altogether :(
diff --git 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);
+  }
 }
diff --git a/src/include/parser/parse_func.h b/src/include/parser/parse_func.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: parse_func.h,v 1.6 1998/02/05 03:40:10 scrappy Exp $
+ * $Id: parse_func.h,v 1.7 1998/02/05 04:08:44 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -47,7 +47,7 @@ extern Node *ParseNestedFuncOrColumn(ParseState *pstate, Attr *attr,
 extern Node *ParseFuncOrColumn(ParseState *pstate, char *funcname, List *fargs,
 	int *curr_resno, int precedence);
 
-extern void func_error(char *funcname, int nargs, Oid *argtypes);
+extern void func_error(char *caller, char *funcname, int nargs, Oid *argtypes);
 
 #endif							/* PARSE_FUNC_H */
 

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/parser/parse_func.c,v 1.11 1998/02/05 03:35:48 scrappy Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/parser/parse_func.c,v 1.12 1998/02/05 04:08:42 scrappy Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -728,7 +728,7 @@ func_get_detail(char *funcname,`
`728`	`728`	`funcname);`
`729`	`729`	`elog(NOTICE, "that satisfies the given argument types. you will have to");`
`730`	`730`	`elog(NOTICE, "retype your query using explicit typecasts.");`
`731`		`- func_error(funcname, nargs, oid_array);`
	`731`	`+ func_error(NULL, funcname, nargs, oid_array);`
`732`	`732`	`}`
`733`	`733`	`else`
`734`	`734`	`{`
`@@ -758,7 +758,7 @@ func_get_detail(char *funcname,`
`758`	`758`	`elog(ERROR, "no such attribute or function \"%s\"",`
`759`	`759`	`funcname);`
`760`	`760`	`}`
`761`		`- func_error(funcname, nargs, oid_array);`
	`761`	`+ func_error(NULL, funcname, nargs, oid_array);`
`762`	`762`	`}`
`763`	`763`	`else`
`764`	`764`	`{`
`@@ -1276,7 +1276,7 @@ ParseComplexProjection(ParseState *pstate,`
`1276`	`1276`	`* argument types`
`1277`	`1277`	`*/`
`1278`	`1278`	`void`
`1279`		`-func_error(char funcname, int nargs, Oid argtypes)`
	`1279`	`+func_error(char caller, char funcname, int nargs, Oid *argtypes)`
`1280`	`1280`	`{`
`1281`	`1281`	`char p[(NAMEDATALEN + 2) * MAXFMGRARGS],`
`1282`	`1282`	`*ptr;`
`@@ -1301,5 +1301,9 @@ func_error(char funcname, int nargs, Oid argtypes)`
`1301`	`1301`	`ptr += strlen(ptr);`
`1302`	`1302`	`}`
`1303`	`1303`
`1304`		`- elog(ERROR, "function %s(%s) does not exist", funcname, p);`
	`1304`	`+ if(caller == NULL) {`
	`1305`	`+ elog(ERROR, "function %s(%s) does not exist", funcname, p);`
	`1306`	`+ } else {`
	`1307`	`+ elog(ERROR, "%s: function %s(%s) does not exist", caller, funcname, p);`
	`1308`	`+ }`
`1305`	`1309`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`*`
`7`	`7`	`* Copyright (c) 1994, Regents of the University of California`
`8`	`8`	`*`
`9`		`- * $Id: parse_func.h,v 1.6 1998/02/05 03:40:10 scrappy Exp $`
	`9`	`+ * $Id: parse_func.h,v 1.7 1998/02/05 04:08:44 scrappy Exp $`
`10`	`10`	`*`
`11`	`11`	`*-------------------------------------------------------------------------`
`12`	`12`	`*/`
`@@ -47,7 +47,7 @@ extern Node ParseNestedFuncOrColumn(ParseState pstate, Attr *attr,`
`47`	`47`	`extern Node ParseFuncOrColumn(ParseState pstate, char funcname, List fargs,`
`48`	`48`	`int *curr_resno, int precedence);`
`49`	`49`
`50`		`-extern void func_error(char funcname, int nargs, Oid argtypes);`
	`50`	`+extern void func_error(char caller, char funcname, int nargs, Oid *argtypes);`
`51`	`51`
`52`	`52`	`#endif /* PARSE_FUNC_H */`
`53`	`53`