diff options
| author | Bruce Momjian <bruce@momjian.us> | 1998-07-20 21:18:35 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 1998-07-20 21:18:35 +0000 |
| commit | 7702d7aa4b7ac61cad6538ce62de395cd04dfbe9 (patch) | |
| tree | 4681bc16859be1fec4d4be7b5118840bab5353aa /src/backend | |
| parent | 1d00134be481c14422d7aca355e861f008ee45d8 (diff) | |
| download | postgresql-7702d7aa4b7ac61cad6538ce62de395cd04dfbe9.tar.gz postgresql-7702d7aa4b7ac61cad6538ce62de395cd04dfbe9.zip | |
target list fixes.
Diffstat (limited to 'src/backend')
| -rw-r--r-- | src/backend/optimizer/plan/planner.c | 8 | ||||
| -rw-r--r-- | src/backend/optimizer/util/tlist.c | 22 |
2 files changed, 5 insertions, 25 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 */ diff --git a/src/backend/optimizer/util/tlist.c b/src/backend/optimizer/util/tlist.c index ed39fd43f20..d7a74f31845 100644 --- a/src/backend/optimizer/util/tlist.c +++ b/src/backend/optimizer/util/tlist.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/optimizer/util/tlist.c,v 1.15 1998/07/20 19:53:48 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/optimizer/util/tlist.c,v 1.16 1998/07/20 21:18:34 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -589,23 +589,3 @@ AddGroupAttrToTlist(List *tlist, List *grpCl) } #endif - -/* was ExecTargetListLength() in execQual.c, - moved here to reduce dependencies on the executor module */ -int -exec_tlist_length(List *targetlist) -{ - int len; - List *tl; - TargetEntry *curTle; - - len = 0; - foreach(tl, targetlist) - { - curTle = lfirst(tl); - - if (curTle->resdom != NULL) - len++; - } - return len; -} |