diff options
Diffstat (limited to 'src/backend/access/common/tupconvert.c')
| -rw-r--r-- | src/backend/access/common/tupconvert.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/src/backend/access/common/tupconvert.c b/src/backend/access/common/tupconvert.c index a4012525d80..392a49b522d 100644 --- a/src/backend/access/common/tupconvert.c +++ b/src/backend/access/common/tupconvert.c @@ -138,13 +138,14 @@ convert_tuples_by_position(TupleDesc indesc, nincols, noutcols))); /* - * Check to see if the map is one-to-one, in which case we need not do - * the tuple conversion. That's not enough though if either source or - * destination (tuples) contains OIDs; we'd need conversion in that case - * to inject the right OID into the tuple datum. + * Check to see if the map is one-to-one, in which case we need not do a + * tuple conversion. We must also insist that both tupdescs either + * specify or don't specify an OID column, else we need a conversion to + * add/remove space for that. (For some callers, presence or absence of + * an OID column perhaps would not really matter, but let's be safe.) */ if (indesc->natts == outdesc->natts && - !indesc->tdhasoid && !outdesc->tdhasoid) + indesc->tdhasoid == outdesc->tdhasoid) { for (i = 0; i < n; i++) { @@ -215,13 +216,14 @@ convert_tuples_by_name(TupleDesc indesc, attrMap = convert_tuples_by_name_map(indesc, outdesc, msg); /* - * Check to see if the map is one-to-one, in which case we need not do - * the tuple conversion. That's not enough though if either source or - * destination (tuples) contains OIDs; we'd need conversion in that case - * to inject the right OID into the tuple datum. + * Check to see if the map is one-to-one, in which case we need not do a + * tuple conversion. We must also insist that both tupdescs either + * specify or don't specify an OID column, else we need a conversion to + * add/remove space for that. (For some callers, presence or absence of + * an OID column perhaps would not really matter, but let's be safe.) */ if (indesc->natts == outdesc->natts && - !indesc->tdhasoid && !outdesc->tdhasoid) + indesc->tdhasoid == outdesc->tdhasoid) { same = true; for (i = 0; i < n; i++) |