From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Thu, 14 Apr 2005 22:09:40 +0000 (+0000)
Subject: Put back blessing of record-function tupledesc, which I removed in a
X-Git-Tag: REL9_0_0~10416
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=0453a997af76a36530200dbf8403e70849ff4c0b;p=pg-rex%2Fsyncrep.git

Put back blessing of record-function tupledesc, which I removed in a
fit of over-optimization.
---

diff --git a/src/backend/executor/nodeFunctionscan.c b/src/backend/executor/nodeFunctionscan.c
index 4cbbb5a65f..f8f13f1c78 100644
--- 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);