rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Replace cryptic 'Unknown kind of return type' messages with something 

hopefully a little more useful.
This commit is contained in:
Tom Lane 2003-06-15 17:59:10 +00:00
parent 996fdb9af1
commit 3fb6f1347f
6 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
contrib/dblink/dblink.c
View File

@ -327,10 +327,8 @@ dblink_fetch(PG_FUNCTION_ARGS)
tupdesc = TypeGetTupleDesc(functypeid, NIL);
else if (functyptype == 'p' && functypeid == RECORDOID)
tupdesc = pgresultGetTupleDesc(res);
else if (functyptype == 'b')
elog(ERROR, "dblink_fetch: invalid kind of return type specified for function");
else
elog(ERROR, "dblink_fetch: unknown kind of return type specified for function");
elog(ERROR, "dblink_fetch: return type must be a row type");
/* store needed metadata for subsequent calls */
slot = TupleDescGetSlot(tupdesc);
@ -506,10 +504,8 @@ dblink_record(PG_FUNCTION_ARGS)
tupdesc = TypeGetTupleDesc(functypeid, NIL);
else if (functyptype == 'p' && functypeid == RECORDOID)
tupdesc = pgresultGetTupleDesc(res);
else if (functyptype == 'b')
elog(ERROR, "Invalid kind of return type specified for function");
else
elog(ERROR, "Unknown kind of return type specified for function");
elog(ERROR, "dblink: return type must be a row type");
}
/* store needed metadata for subsequent calls */

4
contrib/tablefunc/tablefunc.c
View File

@ -445,10 +445,8 @@ crosstab(PG_FUNCTION_ARGS)
tupdesc = make_crosstab_tupledesc(spi_tupdesc, num_categories);
}
}
else if (functyptype == 'b')
elog(ERROR, "Invalid kind of return type specified for function");
else
elog(ERROR, "Unknown kind of return type specified for function");
elog(ERROR, "crosstab: return type must be a row type");
/*
* Check that return tupdesc is compatible with the one we got

7
src/backend/access/common/tupdesc.c
View File

@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.94 2002/11/13 00:39:46 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/access/common/tupdesc.c,v 1.95 2003/06/15 17:59:10 tgl Exp $
*
* NOTES
* some of the executor utility code such as "ExecTypeFromTL" should be
@ -697,7 +697,10 @@ TypeGetTupleDesc(Oid typeoid, List *colaliases)
else if (functyptype == 'p' && typeoid == RECORDOID)
elog(ERROR, "Unable to determine tuple description for function returning \"record\"");
else
elog(ERROR, "Unknown kind of return type specified for function");
{
/* crummy error message, but parser should have caught this */
elog(ERROR, "function in FROM has unsupported return type");
}
return tupdesc;
}

5
src/backend/catalog/pg_proc.c
View File

@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/catalog/pg_proc.c,v 1.96 2003/04/08 23:20:00 tgl Exp $
* $Header: /cvsroot/pgsql/src/backend/catalog/pg_proc.c,v 1.97 2003/06/15 17:59:10 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@ -483,7 +483,8 @@ checkretval(Oid rettype, char fn_typtype, List *queryTreeList)
*/
}
else
elog(ERROR, "Unknown kind of return type specified for function");
elog(ERROR, "return type %s is not supported for SQL functions",
format_type_be(rettype));
}

7
src/backend/executor/nodeFunctionscan.c
View File

@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/executor/nodeFunctionscan.c,v 1.17 2003/01/12 22:01:38 tgl Exp $
* $Header: /cvsroot/pgsql/src/backend/executor/nodeFunctionscan.c,v 1.18 2003/06/15 17:59:10 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@ -231,7 +231,10 @@ ExecInitFunctionScan(FunctionScan *node, EState *estate)
tupdesc = BuildDescForRelation(rte->coldeflist);
}
else
elog(ERROR, "Unknown kind of return type specified for function");
{
/* crummy error message, but parser should have caught this */
elog(ERROR, "function in FROM has unsupported return type");
}
scanstate->tupdesc = tupdesc;
ExecSetSlotDescriptor(scanstate->ss.ss_ScanTupleSlot,

8
src/backend/parser/parse_relation.c
View File

@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/parser/parse_relation.c,v 1.82 2003/06/11 22:13:22 momjian Exp $
* $Header: /cvsroot/pgsql/src/backend/parser/parse_relation.c,v 1.83 2003/06/15 17:59:10 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@ -992,7 +992,7 @@ addRangeTableEntryForFunction(ParseState *pstate,
}
}
else
elog(ERROR, "Unknown kind of return type specified for function %s",
elog(ERROR, "function %s() in FROM has unsupported return type",
funcname);
/*----------
@ -1382,7 +1382,7 @@ expandRTE(ParseState *pstate, RangeTblEntry *rte,
}
}
else
elog(ERROR, "Unknown kind of return type specified for function");
elog(ERROR, "function in FROM has unsupported return type");
}
break;
case RTE_JOIN:
@ -1636,7 +1636,7 @@ get_rte_attribute_type(RangeTblEntry *rte, AttrNumber attnum,
*vartypmod = -1;
}
else
elog(ERROR, "Unknown kind of return type specified for function");
elog(ERROR, "function in FROM has unsupported return type");
}
break;
case RTE_JOIN: