aboutsummaryrefslogtreecommitdiff
path: root/src/backend/optimizer/util/tlist.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/backend/optimizer/util/tlist.c')
-rw-r--r--src/backend/optimizer/util/tlist.c22
1 files changed, 19 insertions, 3 deletions
diff --git a/src/backend/optimizer/util/tlist.c b/src/backend/optimizer/util/tlist.c
index dcee4f8c31a..4878ebb0275 100644
--- a/src/backend/optimizer/util/tlist.c
+++ b/src/backend/optimizer/util/tlist.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/optimizer/util/tlist.c,v 1.64 2004/05/30 23:40:31 neilc Exp $
+ * $PostgreSQL: pgsql/src/backend/optimizer/util/tlist.c,v 1.65 2004/06/05 01:55:05 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -17,6 +17,7 @@
#include "nodes/makefuncs.h"
#include "optimizer/tlist.h"
#include "optimizer/var.h"
+#include "parser/parse_expr.h"
/*****************************************************************************
@@ -83,13 +84,28 @@ tlist_member(Node *node, List *targetlist)
* create_tl_element
* Creates a target list entry node and its associated (resdom var) pair
* with its resdom number equal to 'resdomno'.
+ *
+ * Note: the argument is almost always a Var, but occasionally not.
*/
TargetEntry *
create_tl_element(Var *var, int resdomno)
{
+ Oid vartype;
+ int32 vartypmod;
+
+ if (IsA(var, Var))
+ {
+ vartype = var->vartype;
+ vartypmod = var->vartypmod;
+ }
+ else
+ {
+ vartype = exprType((Node *) var);
+ vartypmod = exprTypmod((Node *) var);
+ }
return makeTargetEntry(makeResdom(resdomno,
- var->vartype,
- var->vartypmod,
+ vartype,
+ vartypmod,
NULL,
false),
(Expr *) var);