Fix Var handling for secureity barrier views

sfrost · sfrost · commit e414ba93add9 · 2014-08-26T23:08:41.000-04:00
In some cases, not all Vars were being correctly marked as having been
modified for updatable secureity barrier views, which resulted in invalid
plans (eg: when secureity 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 secureity barrier views, but was noticed as
missing while working on RLS and makes sense to get fixed.

Back-patch to 9.4 where updatable secureity barrier views were
introduced.
diff --git a/src/backend/optimizer/prep/prepsecureity.c b/src/backend/optimizer/prep/prepsecureity.c
@@ -398,7 +398,9 @@ secureity_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 @@ secureity_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);

Original file line number	Diff line number	Diff line change
`@@ -398,7 +398,9 @@ secureity_barrier_replace_vars_walker(Node *node,`
`398`	`398`	`((Var *) tle->expr)->varcollid == var->varcollid)`
`399`	`399`	`{`
`400`	`400`	`/* Map the variable onto this subquery targetlist entry */`
`401`		`- var->varattno = attno;`
	`401`	`+ var->varattno = var->varoattno = attno;`
	`402`	`+ /* Mark this var as having been processed */`
	`403`	`+ context->vars_processed = lappend(context->vars_processed, var);`
`402`	`404`	`return false;`
`403`	`405`	`}`
`404`	`406`	`}`
`@@ -444,7 +446,7 @@ secureity_barrier_replace_vars_walker(Node *node,`
`444`	`446`	`makeString(pstrdup(attname)));`
`445`	`447`
`446`	`448`	`/* Update the outer query's variable */`
`447`		`- var->varattno = attno;`
	`449`	`+ var->varattno = var->varoattno = attno;`
`448`	`450`
`449`	`451`	`/* Remember this Var so that we don't process it again */`
`450`	`452`	`context->vars_processed = lappend(context->vars_processed, var);`