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

On 2019-02-16 11:14:21 +0100, Peter Eisentraut wrote:
> 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;
>  }

Indeed! Thanks for noticing. Fixed.