aboutsummaryrefslogtreecommitdiff
path: root/src/backend/optimizer/plan/planner.c
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>1998-07-20 21:18:35 +0000
committerBruce Momjian <bruce@momjian.us>1998-07-20 21:18:35 +0000
commit7702d7aa4b7ac61cad6538ce62de395cd04dfbe9 (patch)
tree4681bc16859be1fec4d4be7b5118840bab5353aa /src/backend/optimizer/plan/planner.c
parent1d00134be481c14422d7aca355e861f008ee45d8 (diff)
downloadpostgresql-7702d7aa4b7ac61cad6538ce62de395cd04dfbe9.tar.gz
postgresql-7702d7aa4b7ac61cad6538ce62de395cd04dfbe9.zip
target list fixes.
Diffstat (limited to 'src/backend/optimizer/plan/planner.c')
-rw-r--r--src/backend/optimizer/plan/planner.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.c
index 51a93517c17..9628423c8e8 100644
--- a/src/backend/optimizer/plan/planner.c
+++ b/src/backend/optimizer/plan/planner.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planner.c,v 1.28 1998/07/19 05:49:14 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/optimizer/plan/planner.c,v 1.29 1998/07/20 21:18:32 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -446,7 +446,7 @@ pg_checkretval(Oid rettype, QueryTreeList *queryTreeList)
if (typeTypeRelid(typ) == InvalidOid)
{
- if (exec_tlist_length(tlist) > 1)
+ if (ExecTargetListLength(tlist) > 1)
elog(ERROR, "function declared to return %s returns multiple values in final retrieve", typeTypeName(typ));
resnode = (Resdom *) ((TargetEntry *) lfirst(tlist))->resdom;
@@ -464,7 +464,7 @@ pg_checkretval(Oid rettype, QueryTreeList *queryTreeList)
* is 'retrieve (x = func2())', where func2 has the same return type
* as the function that's calling it.
*/
- if (exec_tlist_length(tlist) == 1)
+ if (ExecTargetListLength(tlist) == 1)
{
resnode = (Resdom *) ((TargetEntry *) lfirst(tlist))->resdom;
if (resnode->restype == rettype)
@@ -485,7 +485,7 @@ pg_checkretval(Oid rettype, QueryTreeList *queryTreeList)
relid = reln->rd_id;
relnatts = reln->rd_rel->relnatts;
- if (exec_tlist_length(tlist) != relnatts)
+ if (ExecTargetListLength(tlist) != relnatts)
elog(ERROR, "function declared to return type %s does not retrieve (%s.*)", typeTypeName(typ), typeTypeName(typ));
/* expect attributes 1 .. n in order */