diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2010-08-26 18:55:06 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2010-08-26 18:55:06 +0000 |
| commit | 89af2fe79798bd615c69a9694bf2e505fa4e0541 (patch) | |
| tree | 7a94eb4418d0127de20bdf0b1c3916456090e80a | |
| parent | b64f3bcf726ab945ff9431322f8ebbea51366eef (diff) | |
| download | postgresql-89af2fe79798bd615c69a9694bf2e505fa4e0541.tar.gz postgresql-89af2fe79798bd615c69a9694bf2e505fa4e0541.zip | |
Fix ExecMakeTableFunctionResult to verify that all rows returned by a SRF
returning "record" actually do have the same rowtype. This is needed because
the parser can't realistically enforce that they will all have the same typmod,
as seen in a recent example from David Wheeler.
Back-patch to 8.0, which is as far back as we have the notion of RECORD
subtypes being distinguished by typmod. Wheeler's example depends on
8.4-and-up features, but I suspect there may be ways to provoke similar
failures before 8.4.
| -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 fed6176cbe5..4b177d25329 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.199.2.4 2009/12/29 17:41:25 heikki Exp $ + * $PostgreSQL: pgsql/src/backend/executor/execQual.c,v 1.199.2.5 2010/08/26 18:55:06 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -1633,6 +1633,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. */ |