From e414ba93add966dfe03e22994764e718ed89ee98 Mon Sep 17 00:00:00 2001 From: Stephen Frost Date: Tue, 26 Aug 2014 23:08:41 -0400 Subject: [PATCH] Fix Var handling for security barrier views In some cases, not all Vars were being correctly marked as having been modified for updatable security barrier views, which resulted in invalid plans (eg: when security barrier views were created over top of inheiritance structures). In passing, be sure to update both varattno and varonattno, as _equalVar won't consider the Vars identical otherwise. This isn't known to cause any issues with updatable security barrier views, but was noticed as missing while working on RLS and makes sense to get fixed. Back-patch to 9.4 where updatable security barrier views were introduced. --- src/backend/optimizer/prep/prepsecurity.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/backend/optimizer/prep/prepsecurity.c b/src/backend/optimizer/prep/prepsecurity.c index dd7f9003a2..2420f97a21 100644 --- a/src/backend/optimizer/prep/prepsecurity.c +++ b/src/backend/optimizer/prep/prepsecurity.c @@ -398,7 +398,9 @@ security_barrier_replace_vars_walker(Node *node, ((Var *) tle->expr)->varcollid == var->varcollid) { /* Map the variable onto this subquery targetlist entry */ - var->varattno = attno; + var->varattno = var->varoattno = attno; + /* Mark this var as having been processed */ + context->vars_processed = lappend(context->vars_processed, var); return false; } } @@ -444,7 +446,7 @@ security_barrier_replace_vars_walker(Node *node, makeString(pstrdup(attname))); /* Update the outer query's variable */ - var->varattno = attno; + var->varattno = var->varoattno = attno; /* Remember this Var so that we don't process it again */ context->vars_processed = lappend(context->vars_processed, var);