diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2005-04-30 20:04:46 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2005-04-30 20:04:46 +0000 |
| commit | 50433d6533926eed381953a2299f1034100b4242 (patch) | |
| tree | 006e6b62329440e188119b71ac146a0c51adf7f1 /src | |
| parent | 757956ec47589e1c2c97660f90c89ea0e02a13f7 (diff) | |
| download | postgresql-50433d6533926eed381953a2299f1034100b4242.tar.gz postgresql-50433d6533926eed381953a2299f1034100b4242.zip | |
Make record_out and record_send extract type information from the passed
record object itself, rather than relying on a second OID argument to be
correct. This patch just changes the function behavior and not the
catalogs, so it's OK to back-patch to 8.0. Will remove the now-redundant
second argument in pg_proc in a separate patch in HEAD only.
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/utils/adt/rowtypes.c | 36 |
1 files changed, 9 insertions, 27 deletions
diff --git a/src/backend/utils/adt/rowtypes.c b/src/backend/utils/adt/rowtypes.c index 6c9eabdc8e0..603072886e2 100644 --- a/src/backend/utils/adt/rowtypes.c +++ b/src/backend/utils/adt/rowtypes.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/rowtypes.c,v 1.8.4.1 2005/04/18 17:11:15 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/rowtypes.c,v 1.8.4.2 2005/04/30 20:04:46 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -268,7 +268,7 @@ Datum record_out(PG_FUNCTION_ARGS) { HeapTupleHeader rec = PG_GETARG_HEAPTUPLEHEADER(0); - Oid tupType = PG_GETARG_OID(1); + Oid tupType; int32 tupTypmod; TupleDesc tupdesc; HeapTupleData tuple; @@ -280,18 +280,9 @@ record_out(PG_FUNCTION_ARGS) char *nulls; StringInfoData buf; - /* - * Use the passed type unless it's RECORD; in that case, we'd better - * get the type info out of the datum itself. Note that for RECORD, - * what we'll probably actually get is RECORD's typelem, ie, zero. - */ - if (tupType == InvalidOid || tupType == RECORDOID) - { - tupType = HeapTupleHeaderGetTypeId(rec); - tupTypmod = HeapTupleHeaderGetTypMod(rec); - } - else - tupTypmod = -1; + /* Extract type info from the tuple itself */ + tupType = HeapTupleHeaderGetTypeId(rec); + tupTypmod = HeapTupleHeaderGetTypMod(rec); tupdesc = lookup_rowtype_tupdesc(tupType, tupTypmod); ncolumns = tupdesc->natts; @@ -613,7 +604,7 @@ Datum record_send(PG_FUNCTION_ARGS) { HeapTupleHeader rec = PG_GETARG_HEAPTUPLEHEADER(0); - Oid tupType = PG_GETARG_OID(1); + Oid tupType; int32 tupTypmod; TupleDesc tupdesc; HeapTupleData tuple; @@ -625,18 +616,9 @@ record_send(PG_FUNCTION_ARGS) char *nulls; StringInfoData buf; - /* - * Use the passed type unless it's RECORD; in that case, we'd better - * get the type info out of the datum itself. Note that for RECORD, - * what we'll probably actually get is RECORD's typelem, ie, zero. - */ - if (tupType == InvalidOid || tupType == RECORDOID) - { - tupType = HeapTupleHeaderGetTypeId(rec); - tupTypmod = HeapTupleHeaderGetTypMod(rec); - } - else - tupTypmod = -1; + /* Extract type info from the tuple itself */ + tupType = HeapTupleHeaderGetTypeId(rec); + tupTypmod = HeapTupleHeaderGetTypMod(rec); tupdesc = lookup_rowtype_tupdesc(tupType, tupTypmod); ncolumns = tupdesc->natts; |