From 07908c9c370ee0715f8e1dfe0c17fbba335003c6 Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Wed, 19 Oct 2005 18:18:33 +0000
Subject: [PATCH] Ensure that the Datum generated from a whole-row Var contains
valid type ID information even when it's a record type. This is needed to
handle whole-row Vars referencing subquery outputs. Per example from Richard
Huxton.
---
src/backend/access/common/heaptuple.c | 10 +++++++++-
src/backend/executor/execQual.c | 4 ++--
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/backend/access/common/heaptuple.c b/src/backend/access/common/heaptuple.c
index 2ba59ab5e9e..fc0a85d2ddd 100644
--- a/src/backend/access/common/heaptuple.c
+++ b/src/backend/access/common/heaptuple.c
@@ -16,7 +16,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/access/common/heaptuple.c,v 1.100 2005/10/15 02:49:08 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/access/common/heaptuple.c,v 1.101 2005/10/19 18:18:32 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -27,6 +27,7 @@
#include "access/tuptoaster.h"
#include "catalog/pg_type.h"
#include "executor/tuptable.h"
+#include "utils/typcache.h"
/* ----------------------------------------------------------------
@@ -603,11 +604,18 @@ heap_getsysattr(HeapTuple tup, int attnum, TupleDesc tupleDesc, bool *isnull)
*
* We have to make a copy of the tuple so we can safely insert the
* Datum overhead fields, which are not set in on-disk tuples.
+ *
+ * It's possible that the passed tupleDesc is a record type that
+ * hasn't been "blessed" yet, so cover that case.
*/
case InvalidAttrNumber:
{
HeapTupleHeader dtup;
+ if (tupleDesc->tdtypeid == RECORDOID &&
+ tupleDesc->tdtypmod < 0)
+ assign_record_type_typmod(tupleDesc);
+
dtup = (HeapTupleHeader) palloc(tup->t_len);
memcpy((char *) dtup, (char *) tup->t_data, tup->t_len);
diff --git a/src/backend/executor/execQual.c b/src/backend/executor/execQual.c
index d535e6453d5..5a270469061 100644
--- a/src/backend/executor/execQual.c
+++ b/src/backend/executor/execQual.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/executor/execQual.c,v 1.181 2005/10/15 02:49:16 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/executor/execQual.c,v 1.182 2005/10/19 18:18:33 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -3180,7 +3180,7 @@ ExecInitExpr(Expr *node, PlanState *parent)
{
/* generic record, use runtime type assignment */
rstate->tupdesc = ExecTypeFromExprList(rowexpr->args);
- rstate->tupdesc = BlessTupleDesc(rstate->tupdesc);
+ BlessTupleDesc(rstate->tupdesc);
}
else
{
--
GitLab