expandRTE and get_rte_attribute_type mistakenly always imputed typmod -1

tglsfdc · tglsfdc · commit bbc048319f01 · 2005-05-29T17:10:23.000Z
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.
diff --git a/src/backend/parser/parse_relation.c b/src/backend/parser/parse_relation.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/parser/parse_relation.c,v 1.107 2005/04/28 21:47:14 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/parser/parse_relation.c,v 1.108 2005/05/29 17:10:23 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1333,7 +1333,7 @@ expandRTE(List *rtable, int rtindex, int sublevels_up,
 							varnode = makeVar(rtindex,
 											  attnum,
 											  atttypid,
-											  -1,
+											  colDef->typename->typmod,
 											  sublevels_up);
 
 							*colvars = lappend(*colvars, varnode);
@@ -1678,7 +1678,7 @@ get_rte_attribute_type(RangeTblEntry *rte, AttrNumber attnum,
 					ColumnDef  *colDef = list_nth(rte->coldeflist, attnum - 1);
 
 					*vartype = typenameTypeId(colDef->typename);
-					*vartypmod = -1;
+					*vartypmod = colDef->typename->typmod;
 				}
 				else
 				{

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/backend/parser/parse_relation.c,v 1.107 2005/04/28 21:47:14 tgl Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/parser/parse_relation.c,v 1.108 2005/05/29 17:10:23 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -1333,7 +1333,7 @@ expandRTE(List *rtable, int rtindex, int sublevels_up,`
`1333`	`1333`	`varnode = makeVar(rtindex,`
`1334`	`1334`	`attnum,`
`1335`	`1335`	`atttypid,`
`1336`		`- -1,`
	`1336`	`+ colDef->typename->typmod,`
`1337`	`1337`	`sublevels_up);`
`1338`	`1338`
`1339`	`1339`	`colvars = lappend(colvars, varnode);`
`@@ -1678,7 +1678,7 @@ get_rte_attribute_type(RangeTblEntry *rte, AttrNumber attnum,`
`1678`	`1678`	`ColumnDef *colDef = list_nth(rte->coldeflist, attnum - 1);`
`1679`	`1679`
`1680`	`1680`	`*vartype = typenameTypeId(colDef->typename);`
`1681`		`- *vartypmod = -1;`
	`1681`	`+ *vartypmod = colDef->typename->typmod;`
`1682`	`1682`	`}`
`1683`	`1683`	`else`
`1684`	`1684`	`{`