diff options
| -rw-r--r-- | src/backend/executor/execQual.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/backend/executor/execQual.c b/src/backend/executor/execQual.c index 674421f5be6..5dae37d5d60 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.250.2.4 2010/02/18 18:41:55 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/executor/execQual.c,v 1.250.2.5 2010/08/26 18:54:52 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -2097,6 +2097,16 @@ ExecMakeTableFunctionResult(ExprState *funcexpr, td = DatumGetHeapTupleHeader(result); /* + * Verify all returned rows have same subtype; necessary in + * case the type is RECORD. + */ + if (HeapTupleHeaderGetTypeId(td) != tupdesc->tdtypeid || + HeapTupleHeaderGetTypMod(td) != tupdesc->tdtypmod) + ereport(ERROR, + (errcode(ERRCODE_DATATYPE_MISMATCH), + errmsg("rows returned by function are not all of the same row type"))); + + /* * tuplestore_puttuple needs a HeapTuple not a bare * HeapTupleHeader, but it doesn't need all the fields. */ |