diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2010-08-26 18:54:59 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2010-08-26 18:54:59 +0000 |
| commit | dcfaed3a0f2f3aacc070a38adb96ef1acff04793 (patch) | |
| tree | 64cf825b0443450d29acebf729089f8861c5e463 | |
| parent | fbd7353bdcc41357820ab05faf67c6454b4577c9 (diff) | |
| download | postgresql-dcfaed3a0f2f3aacc070a38adb96ef1acff04793.tar.gz postgresql-dcfaed3a0f2f3aacc070a38adb96ef1acff04793.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 6c287f92d0a..58bcdddb163 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.226.2.3 2010/02/18 18:42:04 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/executor/execQual.c,v 1.226.2.4 2010/08/26 18:54:59 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -1725,6 +1725,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. */ |