diff options
| author | Andrew Dunstan <andrew@dunslane.net> | 2008-11-05 19:15:15 +0000 |
|---|---|---|
| committer | Andrew Dunstan <andrew@dunslane.net> | 2008-11-05 19:15:15 +0000 |
| commit | 0db527c05b491570361d1c646c88b48a9ef5772d (patch) | |
| tree | d5b8846d75a9b6878643cf6a1e70b978aa7358c2 /src/backend/utils/adt/trigfuncs.c | |
| parent | b65ebc7e8b7268c062338575f4b98ba4474742d2 (diff) | |
| download | postgresql-0db527c05b491570361d1c646c88b48a9ef5772d.tar.gz postgresql-0db527c05b491570361d1c646c88b48a9ef5772d.zip | |
change fix for suppress_redundant_updates_trigger() where relation has Oids, to only apply if present Oid is invalid, per second thought from TGL
Diffstat (limited to 'src/backend/utils/adt/trigfuncs.c')
| -rw-r--r-- | src/backend/utils/adt/trigfuncs.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/backend/utils/adt/trigfuncs.c b/src/backend/utils/adt/trigfuncs.c index b13bdc36e14..50516ee3376 100644 --- a/src/backend/utils/adt/trigfuncs.c +++ b/src/backend/utils/adt/trigfuncs.c @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/backend/utils/adt/trigfuncs.c,v 1.3 2008/11/05 18:49:27 adunstan Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/trigfuncs.c,v 1.4 2008/11/05 19:15:15 adunstan Exp $ * *------------------------------------------------------------------------- */ @@ -62,11 +62,10 @@ suppress_redundant_updates_trigger(PG_FUNCTION_ARGS) newheader = newtuple->t_data; oldheader = oldtuple->t_data; - if (oldheader->t_infomask & HEAP_HASOID) - { - Oid oldoid = HeapTupleHeaderGetOid(oldheader); - HeapTupleHeaderSetOid(newheader, oldoid); - } + if (trigdata->tg_relation->rd_rel->relhasoids && + !OidIsValid(HeapTupleHeaderGetOid(newheader))) + HeapTupleHeaderSetOid(newheader, HeapTupleHeaderGetOid(oldheader)); + /* if the tuple payload is the same ... */ if (newtuple->t_len == oldtuple->t_len && |