postgrespro
diff --git a/‎src/backend/executor/execUtils.c
Lines changed: 1 addition & 1 deletion b/‎src/backend/executor/execUtils.c
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/backend/executor/nodeModifyTable.c
Lines changed: 12 additions & 14 deletions b/‎src/backend/executor/nodeModifyTable.c
Lines changed: 12 additions & 14 deletions
@@ -1333,7 +1333,7 @@ ExecGetExtraUpdatedCols(ResultRelInfo *relinfo, EState *estate)
 	{
 		ListCell   *lc;
 
-		/* In some code paths we can reach here before initializing the info */
+		/* Compute the info if we didn't already */
 		if (relinfo->ri_GeneratedExprs == NULL)
 			ExecInitStoredGenerated(relinfo, estate, CMD_UPDATE);
 		foreach(lc, estate->es_resultrelinfo_extra)
 
@@ -1813,6 +1813,15 @@ ExecUpdate(ModifyTableState *mtstate,
 		bool		partition_constraint_failed;
 		bool		update_indexes;
 
+		/*
+		 * If we generate a new candidate tuple after EvalPlanQual testing, we
+		 * must loop back here to try again.  (We don't need to redo triggers,
+		 * however.  If there are any BEFORE triggers then trigger.c will have
+		 * done table_tuple_lock to lock the correct tuple, so there's no need
+		 * to do them again.)
+		 */
+lreplace:
+
 		/*
 		 * Constraints and GENERATED expressions might reference the tableoid
 		 * column, so (re-)initialize tts_tableOid before evaluating them.
@@ -1827,17 +1836,6 @@ ExecUpdate(ModifyTableState *mtstate,
 			ExecComputeStoredGenerated(resultRelInfo, estate, slot,
 									   CMD_UPDATE);
 
-		/*
-		 * Check any RLS UPDATE WITH CHECK policies
-		 *
-		 * If we generate a new candidate tuple after EvalPlanQual testing, we
-		 * must loop back here and recheck any RLS policies and constraints.
-		 * (We don't need to redo triggers, however.  If there are any BEFORE
-		 * triggers then trigger.c will have done table_tuple_lock to lock the
-		 * correct tuple, so there's no need to do them again.)
-		 */
-lreplace:;
-
 		/* ensure slot is independent, consider e.g. EPQ */
 		ExecMaterializeSlot(slot);
 
@@ -1852,6 +1850,7 @@ lreplace:;
 			resultRelationDesc->rd_rel->relispartition &&
 			!ExecPartitionCheck(resultRelInfo, slot, estate, false);
 
+		/* Check any RLS UPDATE WITH CHECK policies */
 		if (!partition_constraint_failed &&
 			resultRelInfo->ri_WithCheckOptions != NIL)
 		{
@@ -2996,9 +2995,8 @@ ExecInitModifyTable(ModifyTable *node, EState *estate, int eflags)
 
 		/*
 		 * For INSERT and UPDATE, prepare to evaluate any generated columns.
-		 * We must do this now, even if we never insert or update any rows,
-		 * because we have to fill resultRelInfo->ri_extraUpdatedCols for
-		 * possible use by the trigger machinery.
+		 * (This is probably not necessary any longer, but we'll refrain from
+		 * changing it in back branches, in case extension code expects it.)
 		 */
 		if (operation == CMD_INSERT || operation == CMD_UPDATE)
 			ExecInitStoredGenerated(resultRelInfo, estate, operation);
Original file line number	Diff line number	Diff line change
`@@ -1333,7 +1333,7 @@ ExecGetExtraUpdatedCols(ResultRelInfo relinfo, EState estate)`
`1333`	`1333`	`{`
`1334`	`1334`	`ListCell *lc;`
`1335`	`1335`
`1336`		`- /* In some code paths we can reach here before initializing the info */`
	`1336`	`+ /* Compute the info if we didn't already */`
`1337`	`1337`	`if (relinfo->ri_GeneratedExprs == NULL)`
`1338`	`1338`	`ExecInitStoredGenerated(relinfo, estate, CMD_UPDATE);`
`1339`	`1339`	`foreach(lc, estate->es_resultrelinfo_extra)`