Preserve tuple OIDs during ATRewriteTable. Per gripe from Duncan Crombie.

diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c
index 683420072f1a15b4657e2f747e9fd9b366f9f053..23f8a39d57a07ed6a97d9977c223417a5f082615 100644 (file)
--- a/src/backend/commands/tablecmds.c
+++ b/src/backend/commands/tablecmds.c
@@ -2509,8 +2509,12 @@ ATRewriteTable(AlteredTableInfo *tab, Oid OIDNewHeap)
                {
                        if (newrel)
                        {
+                               Oid             tupOid = InvalidOid;
+
                                /* Extract data from old tuple */
                                heap_deform_tuple(tuple, oldTupDesc, values, isnull);
+                               if (oldTupDesc->tdhasoid)
+                                       tupOid = HeapTupleGetOid(tuple);
 
                                /* Set dropped attributes to null in new tuple */
                                foreach (lc, dropped_attrs)
@@ -2539,6 +2543,10 @@ ATRewriteTable(AlteredTableInfo *tab, Oid OIDNewHeap)
                                 * be reset shortly.
                                 */
                                tuple = heap_form_tuple(newTupDesc, values, isnull);
+
+                               /* Preserve OID, if any */
+                               if (newTupDesc->tdhasoid)
+                                       HeapTupleSetOid(tuple, tupOid);
                        }
 
                        /* Now check any constraints on the possibly-changed tuple */