|
7 | 7 | *
|
8 | 8 | *
|
9 | 9 | * IDENTIFICATION
|
10 |
| - * $Header: /cvsroot/pgsql/src/backend/parser/parse_func.c,v 1.51 1999/08/05 02:33:54 tgl Exp $ |
| 10 | + * $Header: /cvsroot/pgsql/src/backend/parser/parse_func.c,v 1.52 1999/08/16 02:08:59 tgl Exp $ |
11 | 11 | *
|
12 | 12 | *-------------------------------------------------------------------------
|
13 | 13 | */
|
@@ -52,7 +52,6 @@ func_get_detail(char *funcname,
|
52 | 52 | Oid *rettype, /* return value */
|
53 | 53 | bool *retset, /* return value */
|
54 | 54 | Oid **true_typeids);
|
55 |
| -static Oid funcid_get_rettype(Oid funcid); |
56 | 55 | static Oid **gen_cross_product(InhPaths *arginh, int nargs);
|
57 | 56 | static void make_arguments(ParseState *pstate,
|
58 | 57 | int nargs,
|
@@ -629,25 +628,6 @@ ParseFuncOrColumn(ParseState *pstate, char *funcname, List *fargs,
|
629 | 628 | return retval;
|
630 | 629 | }
|
631 | 630 |
|
632 |
| -static Oid |
633 |
| -funcid_get_rettype(Oid funcid) |
634 |
| -{ |
635 |
| - HeapTuple func_tuple = NULL; |
636 |
| - Oid funcrettype = InvalidOid; |
637 |
| - |
638 |
| - func_tuple = SearchSysCacheTuple(PROOID, |
639 |
| - ObjectIdGetDatum(funcid), |
640 |
| - 0, 0, 0); |
641 |
| - |
642 |
| - if (!HeapTupleIsValid(func_tuple)) |
643 |
| - elog(ERROR, "Function OID %u does not exist", funcid); |
644 |
| - |
645 |
| - funcrettype = (Oid) |
646 |
| - ((Form_pg_proc) GETSTRUCT(func_tuple))->prorettype; |
647 |
| - |
648 |
| - return funcrettype; |
649 |
| -} |
650 |
| - |
651 | 631 |
|
652 | 632 | /* func_get_candidates()
|
653 | 633 | * get a list of all argument type vectors for which a function named
|
@@ -1378,7 +1358,7 @@ ParseComplexProjection(ParseState *pstate,
|
1378 | 1358 |
|
1379 | 1359 | iter = (Iter *) first_arg;
|
1380 | 1360 | func = (Func *) ((Expr *) iter->iterexpr)->oper;
|
1381 |
| - argtype = funcid_get_rettype(func->funcid); |
| 1361 | + argtype = get_func_rettype(func->funcid); |
1382 | 1362 | argrelid = typeidTypeRelid(argtype);
|
1383 | 1363 | if (argrelid &&
|
1384 | 1364 | ((attnum = get_attnum(argrelid, funcname))
|
@@ -1435,7 +1415,7 @@ ParseComplexProjection(ParseState *pstate,
|
1435 | 1415 | break;
|
1436 | 1416 |
|
1437 | 1417 | funcnode = (Func *) expr->oper;
|
1438 |
| - argtype = funcid_get_rettype(funcnode->funcid); |
| 1418 | + argtype = get_func_rettype(funcnode->funcid); |
1439 | 1419 | argrelid = typeidTypeRelid(argtype);
|
1440 | 1420 |
|
1441 | 1421 | /*
|
|
0 commit comments