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.

diff --git a/src/backend/parser/parse_relation.c b/src/backend/parser/parse_relation.c
index fe1fbab71e64e53a733067bcdc8e4133f5ca1bc3..799b13fccb2ad17e73bc7a1c48741febb4dd53cd 100644 (file)
--- a/src/backend/parser/parse_relation.c
+++ b/src/backend/parser/parse_relation.c
@@ -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
                                {