Horton

Re: pgsql: Remove WITH OIDS support, change oid catalog column visibility.

Peter Eisentraut <peter.eisentraut@2ndquadrant.com>

View thread View on postgr.es
From: Peter Eisentraut <peter.eisentraut@2ndquadrant.com>
To: Andres Freund <andres@anarazel.de>, pgsql-committers@lists.postgresql.org
Date: 2019-02-16T10:14:21Z
Lists: pgsql-hackers 
On 2018-11-21 01:07, Andres Freund wrote:
> Remove WITH OIDS support, change oid catalog column visibility.

I think you may have accidentally duplicated a line in this patch:

@@ -1602,20 +1602,9 @@ ExecFetchSlotHeapTupleDatum(TupleTableSlot *slot)
 void
 ExecInitResultTypeTL(PlanState *planstate)
 {
-   bool        hasoid;
-   TupleDesc   tupDesc;
-
-   if (ExecContextForcesOids(planstate, &hasoid))
-   {
-       /* context forces OID choice; hasoid is now set correctly */
-   }
-   else
-   {
-       /* given free choice, don't leave space for OIDs in result tuples */
-       hasoid = false;
-   }
+   TupleDesc   tupDesc = ExecTypeFromTL(planstate->plan->targetlist);

-   tupDesc = ExecTypeFromTL(planstate->plan->targetlist, hasoid);
+   tupDesc = ExecTypeFromTL(planstate->plan->targetlist);
    planstate->ps_ResultTupleDesc = tupDesc;
 }

-- 
Peter Eisentraut              http://www.2ndQuadrant.com/
PostgreSQL Development, 24x7 Support, Remote DBA, Training & Services

Commits

  1. Remove line duplicated during conflict resolution.

  2. Re-add default_with_oids GUC to avoid breaking old dump files.

  3. Remove WITH OIDS support, change oid catalog column visibility.