postgres.git / summary / log / commit / refs

commit    4f142baf3710814d3fa268020cc7f349ca3c69ea
Author:   Tom Lane <tgl@sss.pgh.pa.us>
Date:     Sun May 29 17:11:07 2005 +0000
First released in: 8.1.0, 7.3.11, 7.4.9, 8.0.4

    expandRTE and get_rte_attribute_type mistakenly always imputed typmod -1
    to columns of an RTE that was a function returning RECORD with a column
    definition list.  Apparently no one has tried to use non-default typmod
    with a function returning RECORD before.


 src/backend/parser/parse_relation.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/backend/parser/parse_relation.c b/src/backend/parser/parse_relation.c
index 65c386a937c..40417e14737 100644
--- a/src/backend/parser/parse_relation.c
+++ b/src/backend/parser/parse_relation.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_relation.c,v 1.79 2002/09/04 20:31:24 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/parser/parse_relation.c,v 1.79.2.1 2005/05/29 17:11:07 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1372,7 +1372,7 @@ expandRTE(ParseState *pstate, RangeTblEntry *rte,
 							varnode = makeVar(rtindex,
 											  attnum,
 											  atttypid,
-											  -1,
+											  colDef->typename->typmod,
 											  sublevels_up);
 
 							*colvars = lappend(*colvars, varnode);
@@ -1631,7 +1631,7 @@ get_rte_attribute_type(RangeTblEntry *rte, AttrNumber attnum,
 					ColumnDef  *colDef = nth(attnum - 1, coldeflist);
 
 					*vartype = typenameTypeId(colDef->typename);
-					*vartypmod = -1;
+					*vartypmod = colDef->typename->typmod;
 				}
 				else
 					elog(ERROR, "Unknown kind of return type specified for function");


[parent: 5454eb04567c]