Put back blessing of record-function tupledesc, which I removed in a

tglsfdc · tglsfdc · commit 0453a997af76 · 2005-04-14T22:09:40.000Z
fit of over-optimization.
diff --git a/src/backend/executor/nodeFunctionscan.c b/src/backend/executor/nodeFunctionscan.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/executor/nodeFunctionscan.c,v 1.32 2005/03/31 22:46:08 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/executor/nodeFunctionscan.c,v 1.33 2005/04/14 22:09:40 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -211,6 +211,13 @@ ExecInitFunctionScan(FunctionScan *node, EState *estate)
 		elog(ERROR, "function in FROM has unsupported return type");
 	}
 
+	/*
+	 * For RECORD results, make sure a typmod has been assigned.  (The
+	 * function should do this for itself, but let's cover things in case
+	 * it doesn't.)
+	 */
+	BlessTupleDesc(tupdesc);
+
 	scanstate->tupdesc = tupdesc;
 	ExecSetSlotDescriptor(scanstate->ss.ss_ScanTupleSlot,
 						  tupdesc, false);

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/executor/nodeFunctionscan.c,v 1.32 2005/03/31 22:46:08 tgl Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/executor/nodeFunctionscan.c,v 1.33 2005/04/14 22:09:40 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -211,6 +211,13 @@ ExecInitFunctionScan(FunctionScan node, EState estate)`
`211`	`211`	`elog(ERROR, "function in FROM has unsupported return type");`
`212`	`212`	`}`
`213`	`213`
	`214`	`+ /*`
	`215`	`+ * For RECORD results, make sure a typmod has been assigned. (The`
	`216`	`+ * function should do this for itself, but let's cover things in case`
	`217`	`+ * it doesn't.)`
	`218`	`+ */`
	`219`	`+ BlessTupleDesc(tupdesc);`
	`220`	`+`
`214`	`221`	`scanstate->tupdesc = tupdesc;`
`215`	`222`	`ExecSetSlotDescriptor(scanstate->ss.ss_ScanTupleSlot,`
`216`	`223`	`tupdesc, false);`